Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
commit
2e77acf140
@ -34,6 +34,7 @@ esac
|
||||
case "$DISTRIB_TARGET" in
|
||||
"bcm27xx"/*)
|
||||
cpu_temp="$(vcgencmd measure_temp | awk -F '=' '{print $2}' | awk -F "'" '{print $1}')°C" ;;
|
||||
"ipq40xx"/*|"ipq806x"/*|"mediatek"/*|"qualcommax"/*) ;;
|
||||
"x86"/*)
|
||||
if [ -n "$(uci -q get "wechatpush.config.server_host")" ]; then
|
||||
cpu_temp="$(/usr/share/wechatpush/wechatpush soc)°C"
|
||||
@ -49,11 +50,9 @@ case "$DISTRIB_TARGET" in
|
||||
;;
|
||||
esac
|
||||
|
||||
if grep -Eq "mediatek" "/etc/openwrt_release"; then
|
||||
echo -n "$cpu_arch x $cpu_cores"
|
||||
elif [ -z "$cpu_freq" ] && [ -n "$cpu_temp" ]; then
|
||||
if [ -z "$cpu_freq" ] && [ -n "$cpu_temp" ]; then
|
||||
echo -n "$cpu_arch x $cpu_cores ($cpu_temp)"
|
||||
elif [ -z "$cpu_temp" ] && [ -n "$cpu_freq" ] || grep -Eq "ipq" "/etc/openwrt_release"; then
|
||||
elif [ -z "$cpu_temp" ] && [ -n "$cpu_freq" ]; then
|
||||
echo -n "$cpu_arch x $cpu_cores ($cpu_freq)"
|
||||
elif [ -n "$cpu_temp" ] && [ -n "$cpu_freq" ]; then
|
||||
echo -n "$cpu_arch x $cpu_cores ($cpu_freq, ${cpu_temp})"
|
||||
|
||||
@ -19,6 +19,10 @@ wdev_tool() {
|
||||
ucode /usr/share/hostap/wdev.uc "$@"
|
||||
}
|
||||
|
||||
ubus_call() {
|
||||
flock /var/run/hostapd.lock ubus call "$@"
|
||||
}
|
||||
|
||||
drv_mac80211_init_device_config() {
|
||||
hostapd_common_add_device_config
|
||||
|
||||
@ -327,6 +331,11 @@ mac80211_hostapd_setup_base() {
|
||||
[ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
|
||||
vht_cap="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
|
||||
|
||||
[ "$vht_oper_chwidth" -lt 2 ] && {
|
||||
vht160=0
|
||||
short_gi_160=0
|
||||
}
|
||||
|
||||
mac80211_add_capabilities vht_capab $vht_cap \
|
||||
RXLDPC:0x10::$rxldpc \
|
||||
SHORT-GI-80:0x20::$short_gi_80 \
|
||||
@ -898,7 +907,7 @@ wpa_supplicant_set_config() {
|
||||
ubus wait_for wpa_supplicant
|
||||
}
|
||||
|
||||
local supplicant_res="$(ubus call wpa_supplicant config_set "$data")"
|
||||
local supplicant_res="$(ubus_call wpa_supplicant config_set "$data")"
|
||||
ret="$?"
|
||||
[ "$ret" != 0 -o -z "$supplicant_res" ] && wireless_setup_vif_failed WPA_SUPPLICANT_FAILED
|
||||
|
||||
@ -908,12 +917,12 @@ wpa_supplicant_set_config() {
|
||||
|
||||
hostapd_set_config() {
|
||||
[ -n "$hostapd_ctrl" ] || {
|
||||
ubus call hostapd config_set '{ "phy": "'"$phy"'", "config": "", "prev_config": "'"${hostapd_conf_file}.prev"'" }' > /dev/null
|
||||
ubus_call hostapd config_set '{ "phy": "'"$phy"'", "config": "", "prev_config": "'"${hostapd_conf_file}.prev"'" }' > /dev/null
|
||||
return 0;
|
||||
}
|
||||
|
||||
ubus wait_for hostapd
|
||||
local hostapd_res="$(ubus call hostapd config_set "{ \"phy\": \"$phy\", \"config\":\"${hostapd_conf_file}\", \"prev_config\": \"${hostapd_conf_file}.prev\"}")"
|
||||
local hostapd_res="$(ubus_call hostapd config_set "{ \"phy\": \"$phy\", \"config\":\"${hostapd_conf_file}\", \"prev_config\": \"${hostapd_conf_file}.prev\"}")"
|
||||
ret="$?"
|
||||
[ "$ret" != 0 -o -z "$hostapd_res" ] && {
|
||||
wireless_setup_failed HOSTAPD_START_FAILED
|
||||
@ -928,7 +937,7 @@ wpa_supplicant_start() {
|
||||
|
||||
[ -n "$wpa_supp_init" ] || return 0
|
||||
|
||||
ubus call wpa_supplicant config_set '{ "phy": "'"$phy"'" }' > /dev/null
|
||||
ubus_call wpa_supplicant config_set '{ "phy": "'"$phy"'" }' > /dev/null
|
||||
}
|
||||
|
||||
mac80211_setup_supplicant() {
|
||||
@ -1036,8 +1045,8 @@ mac80211_reset_config() {
|
||||
local phy="$1"
|
||||
|
||||
hostapd_conf_file="/var/run/hostapd-$phy.conf"
|
||||
ubus call hostapd config_set '{ "phy": "'"$phy"'", "config": "", "prev_config": "'"$hostapd_conf_file"'" }' > /dev/null
|
||||
ubus call wpa_supplicant config_set '{ "phy": "'"$phy"'", "config": [] }' > /dev/null
|
||||
ubus_call hostapd config_set '{ "phy": "'"$phy"'", "config": "", "prev_config": "'"$hostapd_conf_file"'" }' > /dev/null
|
||||
ubus_call wpa_supplicant config_set '{ "phy": "'"$phy"'", "config": [] }' > /dev/null
|
||||
wdev_tool "$phy" set_config '{}'
|
||||
}
|
||||
|
||||
|
||||
@ -2,9 +2,10 @@ let libubus = require("ubus");
|
||||
import { open, readfile } from "fs";
|
||||
import { wdev_create, wdev_remove, is_equal, vlist_new, phy_is_fullmac, phy_open } from "common";
|
||||
|
||||
let ubus = libubus.connect();
|
||||
let ubus = libubus.connect(null, 60);
|
||||
|
||||
hostapd.data.config = {};
|
||||
hostapd.data.pending_config = {};
|
||||
|
||||
hostapd.data.file_fields = {
|
||||
vlan_file: true,
|
||||
@ -122,17 +123,111 @@ function iface_config_macaddr_list(config)
|
||||
return macaddr_list;
|
||||
}
|
||||
|
||||
function iface_update_supplicant_macaddr(phy, config)
|
||||
function __iface_pending_next(pending, state, ret, data)
|
||||
{
|
||||
let macaddr_list = [];
|
||||
for (let i = 0; i < length(config.bss); i++)
|
||||
push(macaddr_list, config.bss[i].bssid);
|
||||
ubus.call("wpa_supplicant", "phy_set_macaddr_list", { phy: phy, macaddr: macaddr_list });
|
||||
let config = pending.config;
|
||||
let phydev = pending.phydev;
|
||||
let phy = pending.phy;
|
||||
|
||||
if (pending.defer)
|
||||
pending.defer.abort();
|
||||
delete pending.defer;
|
||||
switch (state) {
|
||||
case "init":
|
||||
let macaddr_list = [];
|
||||
for (let i = 0; i < length(config.bss); i++)
|
||||
push(macaddr_list, config.bss[i].bssid);
|
||||
pending.call("wpa_supplicant", "phy_set_macaddr_list", { phy: phy, macaddr: macaddr_list });
|
||||
return "create_bss";
|
||||
case "create_bss":
|
||||
let bss = config.bss[0];
|
||||
let err = wdev_create(phy, bss.ifname, { mode: "ap" });
|
||||
if (err) {
|
||||
hostapd.printf(`Failed to create ${bss.ifname} on phy ${phy}: ${err}`);
|
||||
return null;
|
||||
}
|
||||
|
||||
pending.call("wpa_supplicant", "phy_status", { phy: phy });
|
||||
return "check_phy";
|
||||
case "check_phy":
|
||||
let phy_status = data;
|
||||
if (phy_status && phy_status.state == "COMPLETED") {
|
||||
if (iface_add(phy, config, phy_status))
|
||||
return "done";
|
||||
|
||||
hostapd.printf(`Failed to bring up phy ${phy} ifname=${bss.ifname} with supplicant provided frequency`);
|
||||
}
|
||||
pending.call("wpa_supplicant", "phy_set_state", { phy: phy, stop: true });
|
||||
return "wpas_stopped";
|
||||
case "wpas_stopped":
|
||||
if (!iface_add(phy, config))
|
||||
hostapd.printf(`hostapd.add_iface failed for phy ${phy} ifname=${bss.ifname}`);
|
||||
pending.call("wpa_supplicant", "phy_set_state", { phy: phy, stop: false });
|
||||
return null;
|
||||
case "done":
|
||||
default:
|
||||
delete hostapd.data.pending_config[phy];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
function iface_pending_next(ret, data)
|
||||
{
|
||||
let pending = true;
|
||||
let cfg = this;
|
||||
|
||||
while (pending) {
|
||||
this.next_state = __iface_pending_next(cfg, this.next_state, ret, data);
|
||||
if (!this.next_state) {
|
||||
__iface_pending_next(cfg, "done");
|
||||
return;
|
||||
}
|
||||
pending = !this.defer;
|
||||
}
|
||||
}
|
||||
|
||||
function iface_pending_abort()
|
||||
{
|
||||
this.next_state = "done";
|
||||
this.next();
|
||||
}
|
||||
|
||||
function iface_pending_ubus_call(obj, method, arg)
|
||||
{
|
||||
let ubus = hostapd.data.ubus;
|
||||
let pending = this;
|
||||
this.defer = ubus.defer(obj, method, arg, (ret, data) => { delete pending.defer; pending.next(ret, data) });
|
||||
}
|
||||
|
||||
const iface_pending_proto = {
|
||||
next: iface_pending_next,
|
||||
call: iface_pending_ubus_call,
|
||||
abort: iface_pending_abort,
|
||||
};
|
||||
|
||||
function iface_pending_init(phydev, config)
|
||||
{
|
||||
let phy = phydev.name;
|
||||
|
||||
let pending = proto({
|
||||
next_state: "init",
|
||||
phydev: phydev,
|
||||
phy: phy,
|
||||
config: config,
|
||||
next: iface_pending_next,
|
||||
}, iface_pending_proto);
|
||||
|
||||
hostapd.data.pending_config[phy] = pending;
|
||||
pending.next();
|
||||
}
|
||||
|
||||
function iface_restart(phydev, config, old_config)
|
||||
{
|
||||
let phy = phydev.name;
|
||||
let pending = hostapd.data.pending_config[phy];
|
||||
|
||||
if (pending)
|
||||
pending.abort();
|
||||
|
||||
hostapd.remove_iface(phy);
|
||||
iface_remove(old_config);
|
||||
@ -150,26 +245,7 @@ function iface_restart(phydev, config, old_config)
|
||||
bss.bssid = phydev.macaddr_next();
|
||||
}
|
||||
|
||||
iface_update_supplicant_macaddr(phy, config);
|
||||
|
||||
let bss = config.bss[0];
|
||||
let err = wdev_create(phy, bss.ifname, { mode: "ap" });
|
||||
if (err)
|
||||
hostapd.printf(`Failed to create ${bss.ifname} on phy ${phy}: ${err}`);
|
||||
|
||||
let ubus = hostapd.data.ubus;
|
||||
let phy_status = ubus.call("wpa_supplicant", "phy_status", { phy: phy });
|
||||
if (phy_status && phy_status.state == "COMPLETED") {
|
||||
if (iface_add(phy, config, phy_status))
|
||||
return;
|
||||
|
||||
hostapd.printf(`Failed to bring up phy ${phy} ifname=${bss.ifname} with supplicant provided frequency`);
|
||||
}
|
||||
|
||||
ubus.call("wpa_supplicant", "phy_set_state", { phy: phy, stop: true });
|
||||
if (!iface_add(phy, config))
|
||||
hostapd.printf(`hostapd.add_iface failed for phy ${phy} ifname=${bss.ifname}`);
|
||||
ubus.call("wpa_supplicant", "phy_set_state", { phy: phy, stop: false });
|
||||
iface_pending_init(phydev, config);
|
||||
}
|
||||
|
||||
function array_to_obj(arr, key, start)
|
||||
@ -274,6 +350,9 @@ function iface_reload_config(phydev, config, old_config)
|
||||
if (is_equal(old_config.bss, config.bss))
|
||||
return true;
|
||||
|
||||
if (hostapd.data.pending_config[phy])
|
||||
return false;
|
||||
|
||||
if (!old_config.bss || !old_config.bss[0])
|
||||
return false;
|
||||
|
||||
|
||||
@ -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
|
||||
@ -107,6 +107,13 @@ define Package/uhttpd-mod-ubus/install
|
||||
$(INSTALL_DATA) ./files/ubus.default $(1)/etc/uci-defaults/00_uhttpd_ubus
|
||||
endef
|
||||
|
||||
define Package/uhttpd-mod-ubus/postinst
|
||||
#!/bin/sh
|
||||
if [ -z "$${IPKG_INSTROOT}" ]; then
|
||||
/etc/init.d/uhttpd reload
|
||||
fi
|
||||
endef
|
||||
|
||||
define Package/uhttpd-mod-ucode/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_ucode.so $(1)/usr/lib/
|
||||
|
||||
@ -1,17 +1,11 @@
|
||||
#!/bin/sh
|
||||
|
||||
commit=0
|
||||
|
||||
if [ -z "$(uci -q get uhttpd.main.ubus_prefix)" ]; then
|
||||
uci set uhttpd.main.ubus_prefix=/ubus
|
||||
commit=1
|
||||
fi
|
||||
|
||||
[ "$(uci -q get uhttpd.main.ubus_socket)" = "/var/run/ubus.sock" ] && {
|
||||
uci set uhttpd.main.ubus_socket='/var/run/ubus/ubus.sock'
|
||||
commit=1
|
||||
}
|
||||
|
||||
[ "$commit" = 1 ] && uci commit uhttpd && /etc/init.d/uhttpd reload
|
||||
|
||||
exit 0
|
||||
|
||||
@ -85,8 +85,8 @@ proto_qmi_setup() {
|
||||
echo "Waiting for SIM initialization"
|
||||
local uninitialized_timeout=0
|
||||
# timeout 3s for first call to avoid hanging uqmi
|
||||
uqmi -d "$device" --get-pin-status -t 3000 > /dev/null 2>&1
|
||||
while uqmi -s -d "$device" --get-pin-status | grep '"UIM uninitialized"' > /dev/null; do
|
||||
uqmi -d "$device" -t 3000 --get-pin-status > /dev/null 2>&1
|
||||
while uqmi -s -d "$device" -t 1000 --get-pin-status | grep '"UIM uninitialized"' > /dev/null; do
|
||||
[ -e "$device" ] || return 1
|
||||
if [ "$uninitialized_timeout" -lt "$timeout" -o "$timeout" = "0" ]; then
|
||||
let uninitialized_timeout++
|
||||
@ -102,7 +102,7 @@ proto_qmi_setup() {
|
||||
# Check if UIM application is stuck in illegal state
|
||||
local uim_state_timeout=0
|
||||
while true; do
|
||||
json_load "$(uqmi -s -d "$device" --uim-get-sim-state)"
|
||||
json_load "$(uqmi -s -d "$device" -t 1000 --uim-get-sim-state)"
|
||||
json_get_var card_application_state card_application_state
|
||||
|
||||
# SIM card is either completely absent or state is labeled as illegal
|
||||
@ -111,9 +111,9 @@ proto_qmi_setup() {
|
||||
echo "SIM in illegal state - Power-cycling SIM"
|
||||
|
||||
# Try to reset SIM application
|
||||
uqmi -d "$device" --uim-power-off --uim-slot 1
|
||||
uqmi -d "$device" -t 1000 --uim-power-off --uim-slot 1
|
||||
sleep 3
|
||||
uqmi -d "$device" --uim-power-on --uim-slot 1
|
||||
uqmi -d "$device" -t 1000 --uim-power-on --uim-slot 1
|
||||
|
||||
if [ "$uim_state_timeout" -lt "$timeout" ] || [ "$timeout" = "0" ]; then
|
||||
let uim_state_timeout++
|
||||
@ -130,10 +130,10 @@ proto_qmi_setup() {
|
||||
fi
|
||||
done
|
||||
|
||||
if uqmi -s -d "$device" --uim-get-sim-state | grep -q '"Not supported"\|"Invalid QMI command"' &&
|
||||
uqmi -s -d "$device" --get-pin-status | grep -q '"Not supported"\|"Invalid QMI command"' ; then
|
||||
if uqmi -s -d "$device" -t 1000 --uim-get-sim-state | grep -q '"Not supported"\|"Invalid QMI command"' &&
|
||||
uqmi -s -d "$device" -t 1000 --get-pin-status | grep -q '"Not supported"\|"Invalid QMI command"' ; then
|
||||
[ -n "$pincode" ] && {
|
||||
uqmi -s -d "$device" --verify-pin1 "$pincode" > /dev/null || uqmi -s -d "$device" --uim-verify-pin1 "$pincode" > /dev/null || {
|
||||
uqmi -s -d "$device" -t 1000 --verify-pin1 "$pincode" > /dev/null || uqmi -s -d "$device" -t 1000 --uim-verify-pin1 "$pincode" > /dev/null || {
|
||||
echo "Unable to verify PIN"
|
||||
proto_notify_error "$interface" PIN_FAILED
|
||||
proto_block_restart "$interface"
|
||||
@ -141,10 +141,10 @@ proto_qmi_setup() {
|
||||
}
|
||||
}
|
||||
else
|
||||
json_load "$(uqmi -s -d "$device" --get-pin-status)"
|
||||
json_load "$(uqmi -s -d "$device" -t 1000 --get-pin-status)"
|
||||
json_get_var pin1_status pin1_status
|
||||
if [ -z "$pin1_status" ]; then
|
||||
json_load "$(uqmi -s -d "$device" --uim-get-sim-state)"
|
||||
json_load "$(uqmi -s -d "$device" -t 1000 --uim-get-sim-state)"
|
||||
json_get_var pin1_status pin1_status
|
||||
fi
|
||||
json_get_var pin1_verify_tries pin1_verify_tries
|
||||
@ -167,7 +167,7 @@ proto_qmi_setup() {
|
||||
return 1
|
||||
}
|
||||
if [ -n "$pincode" ]; then
|
||||
uqmi -s -d "$device" --verify-pin1 "$pincode" > /dev/null 2>&1 || uqmi -s -d "$device" --uim-verify-pin1 "$pincode" > /dev/null 2>&1 || {
|
||||
uqmi -s -d "$device" -t 1000 --verify-pin1 "$pincode" > /dev/null 2>&1 || uqmi -s -d "$device" -t 1000 --uim-verify-pin1 "$pincode" > /dev/null 2>&1 || {
|
||||
echo "Unable to verify PIN"
|
||||
proto_notify_error "$interface" PIN_FAILED
|
||||
proto_block_restart "$interface"
|
||||
@ -194,7 +194,7 @@ proto_qmi_setup() {
|
||||
fi
|
||||
|
||||
if [ -n "$plmn" ]; then
|
||||
json_load "$(uqmi -s -d "$device" --get-plmn)"
|
||||
json_load "$(uqmi -s -d "$device" -t 1000 --get-plmn)"
|
||||
json_get_var plmn_mode mode
|
||||
json_get_vars mcc mnc || {
|
||||
mcc=0
|
||||
@ -218,16 +218,16 @@ proto_qmi_setup() {
|
||||
fi
|
||||
|
||||
# Cleanup current state if any
|
||||
uqmi -s -d "$device" --stop-network 0xffffffff --autoconnect > /dev/null 2>&1
|
||||
uqmi -s -d "$device" --set-ip-family ipv6 --stop-network 0xffffffff --autoconnect > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 1000 --stop-network 0xffffffff --autoconnect > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 1000 --set-ip-family ipv6 --stop-network 0xffffffff --autoconnect > /dev/null 2>&1
|
||||
|
||||
# Go online
|
||||
uqmi -s -d "$device" --set-device-operating-mode online > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 1000 --set-device-operating-mode online > /dev/null 2>&1
|
||||
|
||||
# Set IP format
|
||||
uqmi -s -d "$device" --set-data-format 802.3 > /dev/null 2>&1
|
||||
uqmi -s -d "$device" --wda-set-data-format 802.3 > /dev/null 2>&1
|
||||
dataformat="$(uqmi -s -d "$device" --wda-get-data-format)"
|
||||
uqmi -s -d "$device" -t 1000 --set-data-format 802.3 > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 1000 --wda-set-data-format 802.3 > /dev/null 2>&1
|
||||
dataformat="$(uqmi -s -d "$device" -t 1000 --wda-get-data-format)"
|
||||
|
||||
if [ "$dataformat" = '"raw-ip"' ]; then
|
||||
|
||||
@ -240,13 +240,13 @@ proto_qmi_setup() {
|
||||
echo "Y" > /sys/class/net/$ifname/qmi/raw_ip
|
||||
fi
|
||||
|
||||
uqmi -s -d "$device" --sync > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 1000 --sync > /dev/null 2>&1
|
||||
|
||||
uqmi -s -d "$device" --network-register > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 20000 --network-register > /dev/null 2>&1
|
||||
|
||||
# PLMN selection must happen after the call to network-register
|
||||
if [ -n "$mcc" -a -n "$mnc" ]; then
|
||||
uqmi -s -d "$device" --set-plmn --mcc "$mcc" --mnc "$mnc" > /dev/null 2>&1 || {
|
||||
uqmi -s -d "$device" -t 1000 --set-plmn --mcc "$mcc" --mnc "$mnc" > /dev/null 2>&1 || {
|
||||
echo "Unable to set PLMN"
|
||||
proto_notify_error "$interface" PLMN_FAILED
|
||||
proto_block_restart "$interface"
|
||||
@ -255,10 +255,10 @@ proto_qmi_setup() {
|
||||
fi
|
||||
|
||||
[ -n "$modes" ] && {
|
||||
uqmi -s -d "$device" --set-network-modes "$modes" > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 1000 --set-network-modes "$modes" > /dev/null 2>&1
|
||||
sleep 3
|
||||
# Scan network to not rely on registration-timeout after RAT change
|
||||
uqmi -s -d "$device" --network-scan > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 30000 --network-scan > /dev/null 2>&1
|
||||
}
|
||||
|
||||
echo "Waiting for network registration"
|
||||
@ -266,7 +266,7 @@ proto_qmi_setup() {
|
||||
local registration_timeout=0
|
||||
local registration_state=""
|
||||
while true; do
|
||||
registration_state=$(uqmi -s -d "$device" --get-serving-system 2>/dev/null | jsonfilter -e "@.registration" 2>/dev/null)
|
||||
registration_state=$(uqmi -s -d "$device" -t 1000 --get-serving-system 2>/dev/null | jsonfilter -e "@.registration" 2>/dev/null)
|
||||
|
||||
[ "$registration_state" = "registered" ] && break
|
||||
|
||||
@ -274,7 +274,7 @@ proto_qmi_setup() {
|
||||
if [ "$registration_timeout" -lt "$timeout" ] || [ "$timeout" = "0" ]; then
|
||||
[ "$registration_state" = "searching" ] || {
|
||||
echo "Device stopped network registration. Restart network registration"
|
||||
uqmi -s -d "$device" --network-register > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 20000 --network-register > /dev/null 2>&1
|
||||
}
|
||||
let registration_timeout++
|
||||
sleep 1
|
||||
@ -302,7 +302,7 @@ proto_qmi_setup() {
|
||||
# establish a non-LTE data session.
|
||||
profile_pdptype="$pdptype"
|
||||
[ "$profile_pdptype" = "ip" ] && profile_pdptype="ipv4"
|
||||
uqmi -s -d "$device" --modify-profile "3gpp,1" --apn "$apn" --pdp-type "$profile_pdptype" > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 1000 --modify-profile "3gpp,1" --apn "$apn" --pdp-type "$profile_pdptype" > /dev/null 2>&1
|
||||
|
||||
if [ "$pdptype" = "ip" ]; then
|
||||
[ -z "$autoconnect" ] && autoconnect=1
|
||||
@ -312,16 +312,16 @@ proto_qmi_setup() {
|
||||
fi
|
||||
|
||||
[ "$pdptype" = "ip" -o "$pdptype" = "ipv4v6" ] && {
|
||||
cid_4=$(uqmi -s -d "$device" --get-client-id wds)
|
||||
cid_4=$(uqmi -s -d "$device" -t 1000 --get-client-id wds)
|
||||
if ! [ "$cid_4" -eq "$cid_4" ] 2> /dev/null; then
|
||||
echo "Unable to obtain client ID"
|
||||
proto_notify_error "$interface" NO_CID
|
||||
return 1
|
||||
fi
|
||||
|
||||
uqmi -s -d "$device" --set-client-id wds,"$cid_4" --set-ip-family ipv4 > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_4" --set-ip-family ipv4 > /dev/null 2>&1
|
||||
|
||||
pdh_4=$(uqmi -s -d "$device" --set-client-id wds,"$cid_4" \
|
||||
pdh_4=$(uqmi -s -d "$device" -t 5000 --set-client-id wds,"$cid_4" \
|
||||
--start-network \
|
||||
${apn:+--apn $apn} \
|
||||
${profile:+--profile $profile} \
|
||||
@ -333,35 +333,35 @@ proto_qmi_setup() {
|
||||
# pdh_4 is a numeric value on success
|
||||
if ! [ "$pdh_4" -eq "$pdh_4" ] 2> /dev/null; then
|
||||
echo "Unable to connect IPv4"
|
||||
uqmi -s -d "$device" --set-client-id wds,"$cid_4" --release-client-id wds > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_4" --release-client-id wds > /dev/null 2>&1
|
||||
proto_notify_error "$interface" CALL_FAILED
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Check data connection state
|
||||
connstat=$(uqmi -s -d "$device" --set-client-id wds,"$cid_4" --get-data-status)
|
||||
connstat=$(uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_4" --get-data-status)
|
||||
[ "$connstat" == '"connected"' ] || {
|
||||
echo "No data link!"
|
||||
uqmi -s -d "$device" --set-client-id wds,"$cid_4" --release-client-id wds > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_4" --release-client-id wds > /dev/null 2>&1
|
||||
proto_notify_error "$interface" CALL_FAILED
|
||||
return 1
|
||||
}
|
||||
}
|
||||
|
||||
[ "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] && {
|
||||
cid_6=$(uqmi -s -d "$device" --get-client-id wds)
|
||||
cid_6=$(uqmi -s -d "$device" -t 1000 --get-client-id wds)
|
||||
if ! [ "$cid_6" -eq "$cid_6" ] 2> /dev/null; then
|
||||
echo "Unable to obtain client ID"
|
||||
proto_notify_error "$interface" NO_CID
|
||||
return 1
|
||||
fi
|
||||
|
||||
uqmi -s -d "$device" --set-client-id wds,"$cid_6" --set-ip-family ipv6 > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_6" --set-ip-family ipv6 > /dev/null 2>&1
|
||||
|
||||
: "${v6apn:=${apn}}"
|
||||
: "${v6profile:=${profile}}"
|
||||
|
||||
pdh_6=$(uqmi -s -d "$device" --set-client-id wds,"$cid_6" \
|
||||
pdh_6=$(uqmi -s -d "$device" -t 5000 --set-client-id wds,"$cid_6" \
|
||||
--start-network \
|
||||
${v6apn:+--apn $v6apn} \
|
||||
${v6profile:+--profile $v6profile} \
|
||||
@ -373,16 +373,16 @@ proto_qmi_setup() {
|
||||
# pdh_6 is a numeric value on success
|
||||
if ! [ "$pdh_6" -eq "$pdh_6" ] 2> /dev/null; then
|
||||
echo "Unable to connect IPv6"
|
||||
uqmi -s -d "$device" --set-client-id wds,"$cid_6" --release-client-id wds > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_6" --release-client-id wds > /dev/null 2>&1
|
||||
proto_notify_error "$interface" CALL_FAILED
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Check data connection state
|
||||
connstat=$(uqmi -s -d "$device" --set-client-id wds,"$cid_6" --set-ip-family ipv6 --get-data-status)
|
||||
connstat=$(uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_6" --set-ip-family ipv6 --get-data-status)
|
||||
[ "$connstat" == '"connected"' ] || {
|
||||
echo "No data link!"
|
||||
uqmi -s -d "$device" --set-client-id wds,"$cid_6" --release-client-id wds > /dev/null 2>&1
|
||||
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid_6" --release-client-id wds > /dev/null 2>&1
|
||||
proto_notify_error "$interface" CALL_FAILED
|
||||
return 1
|
||||
}
|
||||
@ -407,7 +407,7 @@ proto_qmi_setup() {
|
||||
|
||||
[ -n "$pdh_6" ] && {
|
||||
if [ -z "$dhcpv6" -o "$dhcpv6" = 0 ]; then
|
||||
json_load "$(uqmi -s -d $device --set-client-id wds,$cid_6 --get-current-settings)"
|
||||
json_load "$(uqmi -s -d $device -t 1000 --set-client-id wds,$cid_6 --get-current-settings)"
|
||||
json_select ipv6
|
||||
json_get_var ip_6 ip
|
||||
json_get_var gateway_6 gateway
|
||||
@ -449,7 +449,7 @@ proto_qmi_setup() {
|
||||
|
||||
[ -n "$pdh_4" ] && {
|
||||
if [ "$dhcp" = 0 ]; then
|
||||
json_load "$(uqmi -s -d $device --set-client-id wds,$cid_4 --get-current-settings)"
|
||||
json_load "$(uqmi -s -d $device -t 1000 --set-client-id wds,$cid_4 --get-current-settings)"
|
||||
json_select ipv4
|
||||
json_get_var ip_4 ip
|
||||
json_get_var gateway_4 gateway
|
||||
@ -492,16 +492,16 @@ qmi_wds_stop() {
|
||||
|
||||
[ -n "$cid" ] || return
|
||||
|
||||
uqmi -s -d "$device" --set-client-id wds,"$cid" \
|
||||
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid" \
|
||||
--stop-network 0xffffffff \
|
||||
--autoconnect > /dev/null 2>&1
|
||||
|
||||
[ -n "$pdh" ] && {
|
||||
uqmi -s -d "$device" --set-client-id wds,"$cid" \
|
||||
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid" \
|
||||
--stop-network "$pdh" > /dev/null 2>&1
|
||||
}
|
||||
|
||||
uqmi -s -d "$device" --set-client-id wds,"$cid" \
|
||||
uqmi -s -d "$device" -t 1000 --set-client-id wds,"$cid" \
|
||||
--release-client-id wds > /dev/null 2>&1
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
From 661edfc3dab943a67c8821353b63cc23057f7ce9 Mon Sep 17 00:00:00 2001
|
||||
From: David Bauer <mail@david-bauer.net>
|
||||
Date: Tue, 9 Jan 2024 20:48:46 +0100
|
||||
Subject: [PATCH] reset: ath79: read back reset register
|
||||
|
||||
Read back the reset register in order to flush the cache. This fixes
|
||||
spurious reboot hangs on TP-Link TL-WDR3600 and TL-WDR4300 with Zentel
|
||||
DRAM chips.
|
||||
|
||||
This issue was fixed in the past, but switching to the reset-driver
|
||||
specific implementation removed the old fix.
|
||||
|
||||
Link: https://github.com/freifunk-gluon/gluon/issues/2904
|
||||
Link: https://github.com/openwrt/openwrt/issues/13043
|
||||
Link: https://dev.archive.openwrt.org/ticket/17839
|
||||
Link: f8a7bfe1cb2c ("MIPS: ath79: fix system restart")
|
||||
|
||||
Signed-off-by: David Bauer <mail@david-bauer.net>
|
||||
---
|
||||
drivers/reset/reset-ath79.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/drivers/reset/reset-ath79.c
|
||||
+++ b/drivers/reset/reset-ath79.c
|
||||
@@ -37,6 +37,8 @@ static int ath79_reset_update(struct res
|
||||
else
|
||||
val &= ~BIT(id);
|
||||
writel(val, ath79_reset->base);
|
||||
+ /* Flush cache */
|
||||
+ readl(ath79_reset->base);
|
||||
spin_unlock_irqrestore(&ath79_reset->lock, flags);
|
||||
|
||||
return 0;
|
||||
@ -0,0 +1,33 @@
|
||||
From 661edfc3dab943a67c8821353b63cc23057f7ce9 Mon Sep 17 00:00:00 2001
|
||||
From: David Bauer <mail@david-bauer.net>
|
||||
Date: Tue, 9 Jan 2024 20:48:46 +0100
|
||||
Subject: [PATCH] reset: ath79: read back reset register
|
||||
|
||||
Read back the reset register in order to flush the cache. This fixes
|
||||
spurious reboot hangs on TP-Link TL-WDR3600 and TL-WDR4300 with Zentel
|
||||
DRAM chips.
|
||||
|
||||
This issue was fixed in the past, but switching to the reset-driver
|
||||
specific implementation removed the old fix.
|
||||
|
||||
Link: https://github.com/freifunk-gluon/gluon/issues/2904
|
||||
Link: https://github.com/openwrt/openwrt/issues/13043
|
||||
Link: https://dev.archive.openwrt.org/ticket/17839
|
||||
Link: f8a7bfe1cb2c ("MIPS: ath79: fix system restart")
|
||||
|
||||
Signed-off-by: David Bauer <mail@david-bauer.net>
|
||||
---
|
||||
drivers/reset/reset-ath79.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/drivers/reset/reset-ath79.c
|
||||
+++ b/drivers/reset/reset-ath79.c
|
||||
@@ -37,6 +37,8 @@ static int ath79_reset_update(struct res
|
||||
else
|
||||
val &= ~BIT(id);
|
||||
writel(val, ath79_reset->base);
|
||||
+ /* Flush cache */
|
||||
+ readl(ath79_reset->base);
|
||||
spin_unlock_irqrestore(&ath79_reset->lock, flags);
|
||||
|
||||
return 0;
|
||||
@ -42,9 +42,9 @@ case "$board" in
|
||||
[ "$PHYNBR" = "1" ] && echo "$addr" > /sys${DEVPATH}/macaddress
|
||||
;;
|
||||
bananapi,bpi-r3)
|
||||
addr=$(macaddr_add $(cat /sys/class/net/eth0/address) 2)
|
||||
[ "$PHYNBR" = "0" ] && macaddr_unsetbit $addr 6 > /sys${DEVPATH}/macaddress
|
||||
[ "$PHYNBR" = "1" ] && macaddr_setbit $addr 6 > /sys${DEVPATH}/macaddress
|
||||
addr=$(cat /sys/class/net/eth0/address)
|
||||
[ "$PHYNBR" = "0" ] && macaddr_add $addr 2 > /sys${DEVPATH}/macaddress
|
||||
[ "$PHYNBR" = "1" ] && macaddr_add $addr 3 > /sys${DEVPATH}/macaddress
|
||||
;;
|
||||
bananapi,bpi-r3-mini)
|
||||
addr=$(macaddr_generate_from_mmc_cid mmcblk0)
|
||||
|
||||
214
target/linux/ramips/dts/mt7628an_tplink_re365-v1.dts
Normal file
214
target/linux/ramips/dts/mt7628an_tplink_re365-v1.dts
Normal file
@ -0,0 +1,214 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
||||
|
||||
#include "mt7628an.dtsi"
|
||||
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/input/input.h>
|
||||
#include <dt-bindings/leds/common.h>
|
||||
|
||||
/ {
|
||||
model = "TP-Link RE365 v1";
|
||||
compatible = "tplink,re365-v1", "mediatek,mt7628an-soc";
|
||||
|
||||
aliases {
|
||||
led-boot = &led_power;
|
||||
led-failsafe = &led_power;
|
||||
led-running = &led_power;
|
||||
led-upgrade = &led_power;
|
||||
label-mac-device = ðernet;
|
||||
};
|
||||
|
||||
keys {
|
||||
compatible = "gpio-keys";
|
||||
|
||||
button-led {
|
||||
label = "led";
|
||||
gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
|
||||
linux,code = <KEY_LIGHTS_TOGGLE>;
|
||||
};
|
||||
|
||||
button-power {
|
||||
label = "power";
|
||||
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
|
||||
linux,code = <KEY_POWER>;
|
||||
};
|
||||
|
||||
button-reset {
|
||||
label = "reset";
|
||||
gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
|
||||
linux,code = <KEY_RESTART>;
|
||||
};
|
||||
|
||||
button-wps {
|
||||
label = "wps";
|
||||
gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
|
||||
linux,code = <KEY_WPS_BUTTON>;
|
||||
};
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
|
||||
led-lan {
|
||||
color = <LED_COLOR_ID_BLUE>;
|
||||
function = LED_FUNCTION_LAN;
|
||||
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
led_power: led-power {
|
||||
color = <LED_COLOR_ID_BLUE>;
|
||||
function = LED_FUNCTION_POWER;
|
||||
gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
|
||||
panic-indicator;
|
||||
};
|
||||
|
||||
led-rssi-bad {
|
||||
color = <LED_COLOR_ID_RED>;
|
||||
function = LED_FUNCTION_INDICATOR;
|
||||
gpios = <&gpio 43 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
|
||||
led-rssi-good {
|
||||
color = <LED_COLOR_ID_BLUE>;
|
||||
function = LED_FUNCTION_INDICATOR;
|
||||
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
|
||||
led-wlan2g {
|
||||
color = <LED_COLOR_ID_BLUE>;
|
||||
function = LED_FUNCTION_WLAN;
|
||||
function-enumerator = <2>;
|
||||
gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
|
||||
linux,default-trigger = "phy0tpt";
|
||||
};
|
||||
|
||||
led-wlan5g {
|
||||
color = <LED_COLOR_ID_BLUE>;
|
||||
function = LED_FUNCTION_WLAN;
|
||||
function-enumerator = <5>;
|
||||
gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
|
||||
linux,default-trigger = "phy1tpt";
|
||||
};
|
||||
};
|
||||
|
||||
virtual_flash {
|
||||
compatible = "mtd-concat";
|
||||
devices = <&fwconcat0>, <&fwconcat1>;
|
||||
|
||||
partitions {
|
||||
compatible = "fixed-partitions";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
partition@0 {
|
||||
compatible = "tplink,firmware";
|
||||
label = "firmware";
|
||||
reg = <0x0 0x0>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
ðernet {
|
||||
nvmem-cells = <&macaddr_config_10008 0>;
|
||||
nvmem-cell-names = "mac-address";
|
||||
};
|
||||
|
||||
&pcie {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pcie0 {
|
||||
mt76@0,0 {
|
||||
compatible = "mediatek,mt76";
|
||||
reg = <0x0000 0 0 0 0>;
|
||||
ieee80211-freq-limit = <5000000 6000000>;
|
||||
nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_10008 2>;
|
||||
nvmem-cell-names = "eeprom", "mac-address";
|
||||
};
|
||||
};
|
||||
|
||||
&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 0x20000>;
|
||||
read-only;
|
||||
};
|
||||
|
||||
fwconcat0: partition@20000 {
|
||||
label = "fwconcat0";
|
||||
reg = <0x20000 0x5e0000>;
|
||||
};
|
||||
|
||||
partition@600000 {
|
||||
label = "config";
|
||||
reg = <0x600000 0x50000>;
|
||||
read-only;
|
||||
|
||||
nvmem-layout {
|
||||
compatible = "fixed-layout";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
macaddr_config_10008: macaddr@10008 {
|
||||
compatible = "mac-base";
|
||||
reg = <0x10008 0x6>;
|
||||
#nvmem-cell-cells = <1>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
fwconcat1: partition@650000 {
|
||||
label = "fwconcat1";
|
||||
reg = <0x650000 0x1a0000>;
|
||||
};
|
||||
|
||||
partition@7f0000 {
|
||||
label = "radio";
|
||||
reg = <0x7f0000 0x10000>;
|
||||
read-only;
|
||||
|
||||
nvmem-layout {
|
||||
compatible = "fixed-layout";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
eeprom_radio_0: eeprom@0 {
|
||||
reg = <0x0 0x400>;
|
||||
};
|
||||
|
||||
eeprom_radio_8000: eeprom@8000 {
|
||||
reg = <0x8000 0x200>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&state_default {
|
||||
gpio {
|
||||
groups = "refclk", "wdt", "p0led_an", "p1led_an", "p2led_an", "p3led_an",
|
||||
"p4led_an";
|
||||
function = "gpio";
|
||||
};
|
||||
};
|
||||
|
||||
&wmac {
|
||||
status = "okay";
|
||||
|
||||
nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_10008 1>;
|
||||
nvmem-cell-names = "eeprom", "mac-address";
|
||||
};
|
||||
@ -670,6 +670,18 @@ define Device/tplink_re305-v3
|
||||
endef
|
||||
TARGET_DEVICES += tplink_re305-v3
|
||||
|
||||
define Device/tplink_re365-v1
|
||||
$(Device/tplink-safeloader)
|
||||
DEVICE_MODEL := RE365
|
||||
DEVICE_VARIANT := v1
|
||||
DEVICE_PACKAGES := kmod-mt76x2
|
||||
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata
|
||||
IMAGE_SIZE := 7680k
|
||||
KERNEL_SIZE := 6016k
|
||||
TPLINK_BOARD_ID := RE365
|
||||
endef
|
||||
TARGET_DEVICES += tplink_re365-v1
|
||||
|
||||
define Device/tplink_tl-mr3020-v3
|
||||
$(Device/tplink-v2)
|
||||
IMAGE_SIZE := 7808k
|
||||
|
||||
@ -91,6 +91,9 @@ tplink,tl-mr3020-v3|\
|
||||
tplink,tl-wa801nd-v5)
|
||||
ucidef_set_led_netdev "lan" "lan" "green:lan" "eth0"
|
||||
;;
|
||||
tplink,re365-v1)
|
||||
ucidef_set_led_netdev "lan" "lan" "blue:lan" "eth0"
|
||||
;;
|
||||
tplink,tl-mr3420-v5|\
|
||||
tplink,tl-wr840n-v4|\
|
||||
tplink,tl-wr842n-v5)
|
||||
|
||||
@ -27,6 +27,7 @@ ramips_setup_interfaces()
|
||||
tplink,re220-v2|\
|
||||
tplink,re305-v1|\
|
||||
tplink,re305-v3|\
|
||||
tplink,re365-v1|\
|
||||
tplink,tl-wr802n-v4|\
|
||||
tplink,tl-wa801nd-v5|\
|
||||
tplink,tl-wr902ac-v4|\
|
||||
|
||||
@ -66,10 +66,10 @@
|
||||
compatible = "realtek,rtl9300-leds";
|
||||
active-low;
|
||||
|
||||
led_set0 = <0x0000 0xffff 0x0a20 0x0b80>; // LED set 0: 1000Mbps, 10/100Mbps
|
||||
led_set0 = <0x0a20 0x0b80>; // LED set 0: 1000Mbps, 10/100Mbps
|
||||
led_set1 = <0x0a0b 0x0a28 0x0a82 0x0a0b>; // LED set 1: (10G, 5G, 2.5G) (2.5G, 1G)
|
||||
// (5G, 10/100) (10G, 5G, 2.5G)
|
||||
led_set2 = <0x0000 0xffff 0x0a20 0x0a01>; // LED set 2: 1000MBit, 10GBit
|
||||
led_set2 = <0x0a20 0x0a01>; // LED set 2: 1000MBit, 10GBit
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -271,7 +271,7 @@ int write_phy(u32 port, u32 page, u32 reg, u32 val)
|
||||
static int __init rtl83xx_mdio_probe(struct rtl838x_switch_priv *priv)
|
||||
{
|
||||
struct device *dev = priv->dev;
|
||||
struct device_node *dn, *phy_node, *mii_np = dev->of_node;
|
||||
struct device_node *dn, *phy_node, *led_node, *mii_np = dev->of_node;
|
||||
struct mii_bus *bus;
|
||||
int ret;
|
||||
u32 pn;
|
||||
@ -325,9 +325,12 @@ static int __init rtl83xx_mdio_probe(struct rtl838x_switch_priv *priv)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
led_node = of_find_compatible_node(NULL, NULL, "realtek,rtl9300-leds");
|
||||
|
||||
for_each_node_by_name(dn, "port") {
|
||||
phy_interface_t interface;
|
||||
u32 led_set;
|
||||
char led_set_str[16] = {0};
|
||||
|
||||
if (!of_device_is_available(dn))
|
||||
continue;
|
||||
@ -355,9 +358,18 @@ static int __init rtl83xx_mdio_probe(struct rtl838x_switch_priv *priv)
|
||||
if (interface == PHY_INTERFACE_MODE_10GBASER)
|
||||
priv->ports[pn].is10G = true;
|
||||
|
||||
if (of_property_read_u32(dn, "led-set", &led_set))
|
||||
led_set = 0;
|
||||
priv->ports[pn].led_set = led_set;
|
||||
priv->ports[pn].leds_on_this_port = 0;
|
||||
if (led_node) {
|
||||
if (of_property_read_u32(dn, "led-set", &led_set))
|
||||
led_set = 0;
|
||||
priv->ports[pn].led_set = led_set;
|
||||
sprintf(led_set_str, "led_set%d", led_set);
|
||||
priv->ports[pn].leds_on_this_port = of_property_count_u32_elems(led_node, led_set_str);
|
||||
if (priv->ports[pn].leds_on_this_port > 4) {
|
||||
dev_err(priv->dev, "led_set %d for port %d configuration is invalid\n", led_set, pn);
|
||||
return -ENODEV;
|
||||
}
|
||||
}
|
||||
|
||||
/* Check for the integrated SerDes of the RTL8380M first */
|
||||
if (of_property_read_bool(phy_node, "phy-is-integrated")
|
||||
|
||||
@ -137,9 +137,9 @@ static void rtl83xx_vlan_setup(struct rtl838x_switch_priv *priv)
|
||||
priv->r->vlan_set_tagged(i, &info);
|
||||
|
||||
/* reset PVIDs; defaults to 1 on reset */
|
||||
for (int i = 0; i <= priv->ds->num_ports; i++) {
|
||||
priv->r->vlan_port_pvid_set(i, PBVLAN_TYPE_INNER, 0);
|
||||
priv->r->vlan_port_pvid_set(i, PBVLAN_TYPE_OUTER, 0);
|
||||
for (int i = 0; i <= priv->cpu_port; i++) {
|
||||
priv->r->vlan_port_pvid_set(i, PBVLAN_TYPE_INNER, 1);
|
||||
priv->r->vlan_port_pvid_set(i, PBVLAN_TYPE_OUTER, 1);
|
||||
priv->r->vlan_port_pvidmode_set(i, PBVLAN_TYPE_INNER, PBVLAN_MODE_UNTAG_AND_PRITAG);
|
||||
priv->r->vlan_port_pvidmode_set(i, PBVLAN_TYPE_OUTER, PBVLAN_MODE_UNTAG_AND_PRITAG);
|
||||
}
|
||||
@ -870,6 +870,8 @@ static void rtl93xx_phylink_mac_config(struct dsa_switch *ds, int port,
|
||||
|
||||
if (state->duplex == DUPLEX_FULL)
|
||||
reg |= RTL930X_DUPLEX_MODE;
|
||||
else
|
||||
reg &= ~RTL930X_DUPLEX_MODE; /* Clear duplex bit otherwise */
|
||||
|
||||
if (priv->ports[port].phy_is_integrated)
|
||||
reg &= ~RTL930X_FORCE_EN; /* Clear MAC_FORCE_EN to allow SDS-MAC link */
|
||||
@ -1357,10 +1359,15 @@ static int rtl83xx_vlan_filtering(struct dsa_switch *ds, int port,
|
||||
* 2: Trap packet to CPU port
|
||||
* The Egress filter used 1 bit per state (0: DISABLED, 1: ENABLED)
|
||||
*/
|
||||
if (port != priv->cpu_port)
|
||||
if (port != priv->cpu_port) {
|
||||
priv->r->set_vlan_igr_filter(port, IGR_DROP);
|
||||
priv->r->set_vlan_egr_filter(port, EGR_ENABLE);
|
||||
}
|
||||
else {
|
||||
priv->r->set_vlan_igr_filter(port, IGR_TRAP);
|
||||
priv->r->set_vlan_egr_filter(port, EGR_DISABLE);
|
||||
}
|
||||
|
||||
priv->r->set_vlan_egr_filter(port, EGR_ENABLE);
|
||||
} else {
|
||||
/* Disable ingress and egress filtering */
|
||||
if (port != priv->cpu_port)
|
||||
@ -1425,6 +1432,8 @@ static int rtl83xx_vlan_add(struct dsa_switch *ds, int port,
|
||||
pr_debug("%s port %d, vid %d, flags %x\n",
|
||||
__func__, port, vlan->vid, vlan->flags);
|
||||
|
||||
if(!vlan->vid) return 0;
|
||||
|
||||
if (vlan->vid > 4095) {
|
||||
dev_err(priv->dev, "VLAN out of range: %d", vlan->vid);
|
||||
return -ENOTSUPP;
|
||||
|
||||
@ -635,6 +635,7 @@ struct rtl838x_port {
|
||||
bool is2G5;
|
||||
int sds_num;
|
||||
int led_set;
|
||||
int leds_on_this_port;
|
||||
const struct dsa_port *dp;
|
||||
};
|
||||
|
||||
|
||||
@ -24,6 +24,15 @@
|
||||
|
||||
#define RTL930X_LED_GLB_ACTIVE_LOW BIT(22)
|
||||
|
||||
#define RTL930X_LED_SETX_0_CTRL(x) (RTL930X_LED_SET0_0_CTRL - (x * 8))
|
||||
#define RTL930X_LED_SETX_1_CTRL(x) (RTL930X_LED_SETX_0_CTRL(x) - 4)
|
||||
|
||||
/* get register for given set and led in the set */
|
||||
#define RTL930X_LED_SETX_LEDY(x,y) (RTL930X_LED_SETX_0_CTRL(x) - 4 * (y / 2))
|
||||
|
||||
/* get shift for given led in any set */
|
||||
#define RTL930X_LED_SET_LEDX_SHIFT(x) (16 * (x % 2))
|
||||
|
||||
extern struct mutex smi_lock;
|
||||
extern struct rtl83xx_soc_info soc_info;
|
||||
|
||||
@ -249,9 +258,9 @@ static void rtl930x_vlan_fwd_on_inner(int port, bool is_set)
|
||||
{
|
||||
/* Always set all tag modes to fwd based on either inner or outer tag */
|
||||
if (is_set)
|
||||
sw_w32_mask(0, 0xf, RTL930X_VLAN_PORT_FWD + (port << 2));
|
||||
else
|
||||
sw_w32_mask(0xf, 0, RTL930X_VLAN_PORT_FWD + (port << 2));
|
||||
else
|
||||
sw_w32_mask(0, 0xf, RTL930X_VLAN_PORT_FWD + (port << 2));
|
||||
}
|
||||
|
||||
static void rtl930x_vlan_profile_setup(int profile)
|
||||
@ -2396,10 +2405,44 @@ static void rtl930x_led_init(struct rtl838x_switch_priv *priv)
|
||||
return;
|
||||
}
|
||||
|
||||
for (int set = 0; set < 4; set++) {
|
||||
char set_name[16] = {0};
|
||||
u32 set_config[4];
|
||||
int leds_in_this_set = 0;
|
||||
|
||||
/* Reset LED set configuration */
|
||||
sw_w32(0, RTL930X_LED_SETX_0_CTRL(set));
|
||||
sw_w32(0, RTL930X_LED_SETX_1_CTRL(set));
|
||||
|
||||
/**
|
||||
* Each led set has 4 number of leds, and each LED is configured with 16 bits
|
||||
* So each 32bit register holds configuration for 2 leds
|
||||
* And therefore each set requires 2 registers for configuring 4 LEDs
|
||||
*
|
||||
*/
|
||||
sprintf(set_name, "led_set%d", set);
|
||||
leds_in_this_set = of_property_count_u32_elems(node, set_name);
|
||||
|
||||
if (leds_in_this_set == 0 || leds_in_this_set > sizeof(set_config)) {
|
||||
pr_err("%s led_set configuration invalid skipping over this set\n", __func__);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (of_property_read_u32_array(node, set_name, set_config, leds_in_this_set)) {
|
||||
break;
|
||||
}
|
||||
|
||||
/* Write configuration as per number of LEDs */
|
||||
for (int i=0, led = leds_in_this_set-1; led >= 0; led--,i++) {
|
||||
sw_w32_mask(0xffff << RTL930X_LED_SET_LEDX_SHIFT(led),
|
||||
(0xffff & set_config[i]) << RTL930X_LED_SET_LEDX_SHIFT(led),
|
||||
RTL930X_LED_SETX_LEDY(set, led));
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < priv->cpu_port; i++) {
|
||||
int pos = (i << 1) % 32;
|
||||
u32 set;
|
||||
u32 v;
|
||||
|
||||
sw_w32_mask(0x3 << pos, 0, RTL930X_LED_PORT_FIB_SET_SEL_CTRL(i));
|
||||
sw_w32_mask(0x3 << pos, 0, RTL930X_LED_PORT_COPR_SET_SEL_CTRL(i));
|
||||
@ -2407,12 +2450,8 @@ static void rtl930x_led_init(struct rtl838x_switch_priv *priv)
|
||||
if (!priv->ports[i].phy)
|
||||
continue;
|
||||
|
||||
v = 0x1;
|
||||
if (priv->ports[i].is10G)
|
||||
v = 0x3;
|
||||
if (priv->ports[i].phy_is_integrated)
|
||||
v = 0x1;
|
||||
sw_w32_mask(0x3 << pos, v << pos, RTL930X_LED_PORT_NUM_CTRL(i));
|
||||
/* 0x0 = 1 led, 0x1 = 2 leds, 0x2 = 3 leds, 0x3 = 4 leds per port */
|
||||
sw_w32_mask(0x3 << pos, (priv->ports[i].leds_on_this_port -1) << pos, RTL930X_LED_PORT_NUM_CTRL(i));
|
||||
|
||||
pm |= BIT(i);
|
||||
|
||||
@ -2421,22 +2460,6 @@ static void rtl930x_led_init(struct rtl838x_switch_priv *priv)
|
||||
sw_w32_mask(0, set << pos, RTL930X_LED_PORT_FIB_SET_SEL_CTRL(i));
|
||||
}
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
const __be32 *led_set;
|
||||
char set_name[9];
|
||||
u32 setlen;
|
||||
u32 v;
|
||||
|
||||
sprintf(set_name, "led_set%d", i);
|
||||
led_set = of_get_property(node, set_name, &setlen);
|
||||
if (!led_set || setlen != 16)
|
||||
break;
|
||||
v = be32_to_cpup(led_set) << 16 | be32_to_cpup(led_set + 1);
|
||||
sw_w32(v, RTL930X_LED_SET0_0_CTRL - 4 - i * 8);
|
||||
v = be32_to_cpup(led_set + 2) << 16 | be32_to_cpup(led_set + 3);
|
||||
sw_w32(v, RTL930X_LED_SET0_0_CTRL - i * 8);
|
||||
}
|
||||
|
||||
/* Set LED mode to serial (0x1) */
|
||||
sw_w32_mask(0x3, 0x1, RTL930X_LED_GLB_CTRL);
|
||||
|
||||
|
||||
@ -827,9 +827,9 @@ static void rtl931x_vlan_fwd_on_inner(int port, bool is_set)
|
||||
{
|
||||
/* Always set all tag modes to fwd based on either inner or outer tag */
|
||||
if (is_set)
|
||||
sw_w32_mask(0, 0xf, RTL931X_VLAN_PORT_FWD + (port << 2));
|
||||
else
|
||||
sw_w32_mask(0xf, 0, RTL931X_VLAN_PORT_FWD + (port << 2));
|
||||
else
|
||||
sw_w32_mask(0, 0xf, RTL931X_VLAN_PORT_FWD + (port << 2));
|
||||
}
|
||||
|
||||
static void rtl931x_vlan_profile_setup(int profile)
|
||||
|
||||
@ -43,6 +43,9 @@ extern struct rtl83xx_soc_info soc_info;
|
||||
#define RX_EN 0x4
|
||||
#define TX_EN_93XX 0x20
|
||||
#define RX_EN_93XX 0x10
|
||||
#define RX_TRUNCATE_EN_93XX BIT(6)
|
||||
#define RX_TRUNCATE_EN_83XX BIT(4)
|
||||
#define TX_PAD_EN_838X BIT(5)
|
||||
#define TX_DO 0x2
|
||||
#define WRAP 0x2
|
||||
#define MAX_PORTS 57
|
||||
@ -727,8 +730,8 @@ static void rtl838x_hw_en_rxtx(struct rtl838x_eth_priv *priv)
|
||||
/* Disable Head of Line features for all RX rings */
|
||||
sw_w32(0xffffffff, priv->r->dma_if_rx_ring_size(0));
|
||||
|
||||
/* Truncate RX buffer to 0x640 (1600) bytes, pad TX */
|
||||
sw_w32(0x06400020, priv->r->dma_if_ctrl);
|
||||
/* Truncate RX buffer to DEFAULT_MTU bytes, pad TX */
|
||||
sw_w32((DEFAULT_MTU << 16) | RX_TRUNCATE_EN_83XX | TX_PAD_EN_838X, priv->r->dma_if_ctrl);
|
||||
|
||||
/* Enable RX done, RX overflow and TX done interrupts */
|
||||
sw_w32(0xfffff, priv->r->dma_if_intr_msk);
|
||||
@ -752,7 +755,7 @@ static void rtl838x_hw_en_rxtx(struct rtl838x_eth_priv *priv)
|
||||
static void rtl839x_hw_en_rxtx(struct rtl838x_eth_priv *priv)
|
||||
{
|
||||
/* Setup CPU-Port: RX Buffer */
|
||||
sw_w32(0x0000c808, priv->r->dma_if_ctrl);
|
||||
sw_w32((DEFAULT_MTU << 5) | RX_TRUNCATE_EN_83XX, priv->r->dma_if_ctrl);
|
||||
|
||||
/* Enable Notify, RX done, RX overflow and TX done interrupts */
|
||||
sw_w32(0x007fffff, priv->r->dma_if_intr_msk); /* Notify IRQ! */
|
||||
@ -775,8 +778,8 @@ static void rtl839x_hw_en_rxtx(struct rtl838x_eth_priv *priv)
|
||||
|
||||
static void rtl93xx_hw_en_rxtx(struct rtl838x_eth_priv *priv)
|
||||
{
|
||||
/* Setup CPU-Port: RX Buffer truncated at 1600 Bytes */
|
||||
sw_w32(0x06400040, priv->r->dma_if_ctrl);
|
||||
/* Setup CPU-Port: RX Buffer truncated at DEFAULT_MTU Bytes */
|
||||
sw_w32((DEFAULT_MTU << 16) | RX_TRUNCATE_EN_93XX, priv->r->dma_if_ctrl);
|
||||
|
||||
for (int i = 0; i < priv->rxrings; i++) {
|
||||
int pos = (i % 3) * 10;
|
||||
@ -2415,7 +2418,7 @@ static int __init rtl838x_eth_probe(struct platform_device *pdev)
|
||||
|
||||
dev->ethtool_ops = &rtl838x_ethtool_ops;
|
||||
dev->min_mtu = ETH_ZLEN;
|
||||
dev->max_mtu = 1536;
|
||||
dev->max_mtu = DEFAULT_MTU;
|
||||
dev->features = NETIF_F_RXCSUM | NETIF_F_HW_CSUM;
|
||||
dev->hw_features = NETIF_F_RXCSUM;
|
||||
|
||||
|
||||
@ -216,6 +216,9 @@
|
||||
/* Registers of the internal Serdes of the 8380 */
|
||||
#define RTL838X_SDS4_FIB_REG0 (0xF800)
|
||||
|
||||
/* Default MTU with jumbo frames support */
|
||||
#define DEFAULT_MTU 9000
|
||||
|
||||
inline int rtl838x_mac_port_ctrl(int p)
|
||||
{
|
||||
return RTL838X_MAC_PORT_CTRL + (p << 7);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user