diff --git a/include/kernel-version.mk b/include/kernel-version.mk index c6d03a36aa..85824fe1b4 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,12 +8,12 @@ endif LINUX_VERSION-4.9 = .232 LINUX_VERSION-4.14 = .193 -LINUX_VERSION-4.19 = .138 +LINUX_VERSION-4.19 = .139 LINUX_VERSION-5.4 = .57 LINUX_KERNEL_HASH-4.9.232 = 58f472e82345dc719a1d6d7bae01e5aa73387cd83308acd2c92371f7d5bc4f60 LINUX_KERNEL_HASH-4.14.193 = 0b0fb41d4430e1a42738b341cbfd2f41951aa5cd02acabbd53f076119c8b9f03 -LINUX_KERNEL_HASH-4.19.138 = d15c27d05f6c527269b75b30cc72972748e55720e7e00ad8abbaa4fe3b1d5e02 +LINUX_KERNEL_HASH-4.19.139 = 9c4ebf21fe949f80fbcfbbd6e7fe181040d325e89475e230ab53ef01f9d55605 LINUX_KERNEL_HASH-5.4.57 = 280d1bb8163c1f1c1a04e0ba2b85558cef2ab3c253c3fecd8fc680c3a6cd17ba remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index f5df4d459c..4062dc175d 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=180 -PKG_RELEASE:=3 +PKG_RELEASE:=5 include $(INCLUDE_DIR)/package.mk diff --git a/package/lean/luci-app-ssr-plus/root/etc/ssr/china_ssr.txt b/package/lean/luci-app-ssr-plus/root/etc/ssr/china_ssr.txt index e8079c796a..a1d03fd668 100644 --- a/package/lean/luci-app-ssr-plus/root/etc/ssr/china_ssr.txt +++ b/package/lean/luci-app-ssr-plus/root/etc/ssr/china_ssr.txt @@ -4069,6 +4069,11 @@ 103.153.138.0/23 103.153.146.0/23 103.153.160.0/23 +103.154.18.0/23 +103.154.30.0/23 +103.154.32.0/23 +103.154.40.0/23 +103.154.66.0/23 103.192.0.0/22 103.192.4.0/22 103.192.8.0/22 @@ -6117,6 +6122,7 @@ 153.101.0.0/16 153.118.0.0/15 154.8.128.0/17 +156.59.0.0/16 157.0.0.0/16 157.18.0.0/16 157.61.0.0/16 diff --git a/package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_list.conf b/package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_list.conf index 7f787ddbaa..09e5df1623 100644 --- a/package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_list.conf +++ b/package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_list.conf @@ -1820,8 +1820,6 @@ server=/compileheart.com/127.0.0.1#5335 ipset=/compileheart.com/gfwlist server=/compress.to/127.0.0.1#5335 ipset=/compress.to/gfwlist -server=/connect.facebook.net/127.0.0.1#5335 -ipset=/connect.facebook.net/gfwlist server=/conoha.jp/127.0.0.1#5335 ipset=/conoha.jp/gfwlist server=/contactmagazine.net/127.0.0.1#5335 @@ -2716,6 +2714,8 @@ server=/facebook.hu/127.0.0.1#5335 ipset=/facebook.hu/gfwlist server=/facebook.in/127.0.0.1#5335 ipset=/facebook.in/gfwlist +server=/facebook.net/127.0.0.1#5335 +ipset=/facebook.net/gfwlist server=/facebook.nl/127.0.0.1#5335 ipset=/facebook.nl/gfwlist server=/facebook.se/127.0.0.1#5335 @@ -3650,6 +3650,8 @@ server=/google.vu/127.0.0.1#5335 ipset=/google.vu/gfwlist server=/google.ws/127.0.0.1#5335 ipset=/google.ws/gfwlist +server=/googleanalytics.com/127.0.0.1#5335 +ipset=/googleanalytics.com/gfwlist server=/googleapis.com/127.0.0.1#5335 ipset=/googleapis.com/gfwlist server=/googleapps.com/127.0.0.1#5335 @@ -3702,6 +3704,8 @@ server=/googlesile.com/127.0.0.1#5335 ipset=/googlesile.com/gfwlist server=/googlesource.com/127.0.0.1#5335 ipset=/googlesource.com/gfwlist +server=/googlesyndication.com/127.0.0.1#5335 +ipset=/googlesyndication.com/gfwlist server=/googleusercontent.com/127.0.0.1#5335 ipset=/googleusercontent.com/gfwlist server=/googlevideo.com/127.0.0.1#5335 @@ -4486,6 +4490,8 @@ server=/inmediahk.net/127.0.0.1#5335 ipset=/inmediahk.net/gfwlist server=/innermongolia.org/127.0.0.1#5335 ipset=/innermongolia.org/gfwlist +server=/inoreader.com/127.0.0.1#5335 +ipset=/inoreader.com/gfwlist server=/inote.tw/127.0.0.1#5335 ipset=/inote.tw/gfwlist server=/insecam.org/127.0.0.1#5335 @@ -5714,6 +5720,8 @@ server=/my.pcloud.com/127.0.0.1#5335 ipset=/my.pcloud.com/gfwlist server=/my03.com/127.0.0.1#5335 ipset=/my03.com/gfwlist +server=/myactimes.com/127.0.0.1#5335 +ipset=/myactimes.com/gfwlist server=/myanniu.com/127.0.0.1#5335 ipset=/myanniu.com/gfwlist server=/myaudiocast.com/127.0.0.1#5335 @@ -6112,8 +6120,6 @@ server=/nwtca.org/127.0.0.1#5335 ipset=/nwtca.org/gfwlist server=/ny.stgloballink.com/127.0.0.1#5335 ipset=/ny.stgloballink.com/gfwlist -server=/ny.visiontimes.com/127.0.0.1#5335 -ipset=/ny.visiontimes.com/gfwlist server=/nyaa.eu/127.0.0.1#5335 ipset=/nyaa.eu/gfwlist server=/nyaa.si/127.0.0.1#5335 @@ -7478,6 +7484,8 @@ server=/skyvegas.com/127.0.0.1#5335 ipset=/skyvegas.com/gfwlist server=/skyxvpn.com/127.0.0.1#5335 ipset=/skyxvpn.com/gfwlist +server=/sl-reverse.com/127.0.0.1#5335 +ipset=/sl-reverse.com/gfwlist server=/slaytizle.com/127.0.0.1#5335 ipset=/slaytizle.com/gfwlist server=/sleazydream.com/127.0.0.1#5335 diff --git a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-switch b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-switch index b4338458c9..c73d975604 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-switch +++ b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-switch @@ -81,9 +81,8 @@ test_proxy() { local serverport=$(uci_get_by_name $1 server_port) ipset add ss_spec_wan_ac $servername 2>/dev/null ret1=$? - ret=$(tcping -q -c 3 -i 1 -t 2 -p $serverport $servername) - #echo "$(date "+%Y-%m-%d %H:%M:%S") test_proxy> name: $servername, ret1: $ret1, ret: $ret" >> /tmp/ssrplus.log - if [ "$ret" -gt "0" ]; then + tcping -q -c 3 -i 1 -t 2 -p $serverport $servername + if [ "$?" -gt "0" ]; then [ "$ret1" == "0" ] && ipset del ss_spec_wan_ac $servername 2>/dev/null return 1 fi diff --git a/package/lean/luci-app-turboacc/root/etc/init.d/turboacc b/package/lean/luci-app-turboacc/root/etc/init.d/turboacc index 8da72c9200..70bab74434 100755 --- a/package/lean/luci-app-turboacc/root/etc/init.d/turboacc +++ b/package/lean/luci-app-turboacc/root/etc/init.d/turboacc @@ -184,7 +184,6 @@ EOF } stop_dnscache() { - killall -9 "AdGuardHome" 2>"/dev/null" killall -9 "dnscache" 2>"/dev/null" kill -9 $(ps | grep dnscache-while.sh | grep -v "grep" | awk '{print $1}') 2>"/dev/null" rm -rf "/var/dnscache" "/var/run/dnscache" diff --git a/package/lean/shortcut-fe/Makefile b/package/lean/shortcut-fe/Makefile index 99017f3f59..f0abdf82f0 100644 --- a/package/lean/shortcut-fe/Makefile +++ b/package/lean/shortcut-fe/Makefile @@ -37,12 +37,12 @@ define KernelPackage/shortcut-fe/Description Shortcut is an in-Linux-kernel IP packet forwarding engine. endef -define KernelPackage/shortcut-fe/install - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/etc/init.d/shortcut-fe $(1)/etc/init.d - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) ./files/usr/bin/sfe_dump $(1)/usr/bin -endef +#define KernelPackage/shortcut-fe/install +# $(INSTALL_DIR) $(1)/etc/init.d +# $(INSTALL_BIN) ./files/etc/init.d/shortcut-fe $(1)/etc/init.d +# $(INSTALL_DIR) $(1)/usr/bin +# $(INSTALL_BIN) ./files/usr/bin/sfe_dump $(1)/usr/bin +#endef define KernelPackage/shortcut-fe-cm SECTION:=kernel diff --git a/target/linux/apm821xx/patches-4.19/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch b/target/linux/apm821xx/patches-4.19/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch index e5000c911f..950c810da3 100644 --- a/target/linux/apm821xx/patches-4.19/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch +++ b/target/linux/apm821xx/patches-4.19/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch @@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter #include "xhci.h" #include "xhci-trace.h" -@@ -268,6 +270,458 @@ static void xhci_pme_acpi_rtd3_enable(st +@@ -272,6 +274,458 @@ static void xhci_pme_acpi_rtd3_enable(st static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { } #endif /* CONFIG_ACPI */ @@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter /* called during probe() after chip reset completes */ static int xhci_pci_setup(struct usb_hcd *hcd) { -@@ -309,6 +763,22 @@ static int xhci_pci_probe(struct pci_dev +@@ -313,6 +767,22 @@ static int xhci_pci_probe(struct pci_dev struct hc_driver *driver; struct usb_hcd *hcd; @@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter driver = (struct hc_driver *)id->driver_data; /* Prevent runtime suspending between USB-2 and USB-3 initialization */ -@@ -367,6 +837,16 @@ static void xhci_pci_remove(struct pci_d +@@ -371,6 +841,16 @@ static void xhci_pci_remove(struct pci_d { struct xhci_hcd *xhci; diff --git a/target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch index 8ada844214..3f58377d4e 100644 --- a/target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch +++ b/target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch @@ -13,7 +13,7 @@ produce a noisy warning. --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -218,6 +218,7 @@ static void xhci_pci_quirks(struct devic +@@ -221,6 +221,7 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x0015) { xhci->quirks |= XHCI_RESET_ON_RESUME; xhci->quirks |= XHCI_ZERO_64B_REGS; diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c index 1c08e53f15..b0fbb78d82 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c @@ -203,11 +203,11 @@ static struct gpio_keys_button nbg6616_gpio_keys[] __initdata = { }, { .desc = "RFKILL button", - .type = EV_KEY, + .type = EV_SW, .code = KEY_RFKILL, .debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL, .gpio = NBG6716_GPIO_BTN_RFKILL, - .active_low = 1, + .active_low = 0, }, { .desc = "WPS button", diff --git a/target/linux/bcm27xx/patches-4.19/950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch b/target/linux/bcm27xx/patches-4.19/950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch index 4f7bde1885..3f59db2cbe 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch +++ b/target/linux/bcm27xx/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 -@@ -2477,6 +2477,11 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2473,6 +2473,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_; -@@ -2530,6 +2535,9 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2526,6 +2531,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); -@@ -2585,6 +2593,9 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2581,6 +2589,9 @@ static int lan78xx_reset(struct lan78xx_ buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_; } } diff --git a/target/linux/bcm27xx/patches-4.19/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch b/target/linux/bcm27xx/patches-4.19/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch index b5e688c3bf..7aa3c7e745 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch +++ b/target/linux/bcm27xx/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 -@@ -2659,6 +2659,22 @@ static int lan78xx_open(struct net_devic +@@ -2655,6 +2655,22 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); diff --git a/target/linux/bcm27xx/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/target/linux/bcm27xx/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch index bd9987d8ad..2b39efa03b 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch @@ -21,7 +21,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -440,6 +440,15 @@ static int msg_level = -1; +@@ -436,6 +436,15 @@ static int msg_level = -1; module_param(msg_level, int, 0); MODULE_PARM_DESC(msg_level, "Override default message level"); @@ -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); -@@ -3010,8 +3019,14 @@ static int lan78xx_bind(struct lan78xx_n +@@ -2940,8 +2949,14 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_RX_CSUM_ENABLE) dev->net->features |= NETIF_F_RXCSUM; diff --git a/target/linux/bcm27xx/patches-4.19/950-0128-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch b/target/linux/bcm27xx/patches-4.19/950-0128-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch index 2b1a3c1ab7..9685f43ee4 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0128-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch +++ b/target/linux/bcm27xx/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 -@@ -2191,6 +2191,22 @@ static int lan78xx_phy_init(struct lan78 +@@ -2187,6 +2187,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; -@@ -2668,22 +2684,6 @@ static int lan78xx_open(struct net_devic +@@ -2664,22 +2680,6 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); diff --git a/target/linux/bcm27xx/patches-4.19/950-0259-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/bcm27xx/patches-4.19/950-0259-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch index 33fde5fc6f..1929a882ee 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0259-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0259-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch @@ -16,7 +16,7 @@ See: https://github.com/raspberrypi/linux/issues/2447 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -449,6 +449,11 @@ static bool enable_tso; +@@ -445,6 +445,11 @@ static bool enable_tso; module_param(enable_tso, bool, 0644); MODULE_PARM_DESC(enable_tso, "Enables TCP segmentation offload"); @@ -28,17 +28,17 @@ 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); -@@ -3843,7 +3848,12 @@ static int lan78xx_probe(struct usb_inte - dev->pipe_intr = usb_rcvintpipe(dev->udev, - dev->ep_intr->desc.bEndpointAddress & - USB_ENDPOINT_NUMBER_MASK); -- period = dev->ep_intr->desc.bInterval; +@@ -3787,7 +3792,12 @@ static int lan78xx_probe(struct usb_inte + netdev->max_mtu = MAX_SINGLE_PACKET_SIZE; + netif_set_gso_max_size(netdev, MAX_SINGLE_PACKET_SIZE - MAX_HEADER); + +- period = ep_intr->desc.bInterval; + if (int_urb_interval_ms <= 0) -+ period = dev->ep_intr->desc.bInterval; ++ period = ep_intr->desc.bInterval; + else + period = int_urb_interval_ms * INT_URB_MICROFRAMES_PER_MS; -+ + netif_notice(dev, probe, netdev, "int urb period %d\n", period); - ++ maxp = usb_maxpacket(dev->udev, dev->pipe_intr, 0); buf = kmalloc(maxp, GFP_KERNEL); + if (buf) { diff --git a/target/linux/bcm27xx/patches-4.19/950-0316-lan78xx-EEE-support-is-now-a-PHY-property.patch b/target/linux/bcm27xx/patches-4.19/950-0316-lan78xx-EEE-support-is-now-a-PHY-property.patch index b37640dbed..b387136beb 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0316-lan78xx-EEE-support-is-now-a-PHY-property.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0316-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 -@@ -2196,7 +2196,7 @@ static int lan78xx_phy_init(struct lan78 +@@ -2192,7 +2192,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/bcm27xx/patches-4.19/950-0413-lan78xx-use-default-alignment-for-rx-buffers.patch b/target/linux/bcm27xx/patches-4.19/950-0413-lan78xx-use-default-alignment-for-rx-buffers.patch index 6b93888db9..9700c2c09f 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0413-lan78xx-use-default-alignment-for-rx-buffers.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0413-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 -@@ -3257,7 +3257,7 @@ static int rx_submit(struct lan78xx_net +@@ -3187,7 +3187,7 @@ static int rx_submit(struct lan78xx_net size_t size = dev->rx_urb_size; int ret = 0; diff --git a/target/linux/bcm27xx/patches-4.19/950-0476-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch b/target/linux/bcm27xx/patches-4.19/950-0476-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch index 69b0ffbf9e..694bf90a00 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0476-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0476-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch @@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -225,6 +225,10 @@ static void xhci_pci_quirks(struct devic +@@ -228,6 +228,10 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x3432) xhci->quirks |= XHCI_BROKEN_STREAMS; @@ -19,5 +19,5 @@ Signed-off-by: Phil Elwell + xhci->quirks |= XHCI_LPM_SUPPORT; + if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && - pdev->device == 0x1042) + pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) xhci->quirks |= XHCI_BROKEN_STREAMS; diff --git a/target/linux/bcm27xx/patches-4.19/950-0609-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch b/target/linux/bcm27xx/patches-4.19/950-0609-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch index 011a1eceba..29dc71d95f 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0609-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0609-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch @@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -226,8 +226,10 @@ static void xhci_pci_quirks(struct devic +@@ -229,8 +229,10 @@ static void xhci_pci_quirks(struct devic xhci->quirks |= XHCI_BROKEN_STREAMS; if (pdev->vendor == PCI_VENDOR_ID_VIA && @@ -34,7 +34,7 @@ Signed-off-by: Jonathan Bell + } if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && - pdev->device == 0x1042) + pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -520,7 +520,10 @@ void xhci_find_new_dequeue_state(struct diff --git a/target/linux/mediatek/patches-4.19/0001-eth-sync-from-mtk-lede.patch b/target/linux/mediatek/patches-4.19/0001-eth-sync-from-mtk-lede.patch index 814f66cc4e..0232bd203a 100644 --- a/target/linux/mediatek/patches-4.19/0001-eth-sync-from-mtk-lede.patch +++ b/target/linux/mediatek/patches-4.19/0001-eth-sync-from-mtk-lede.patch @@ -983,7 +983,7 @@ }; static const struct net_device_ops mtk_netdev_ops = { -@@ -2463,6 +2519,7 @@ static int mtk_probe(struct platform_dev +@@ -2465,6 +2521,7 @@ static int mtk_probe(struct platform_dev { struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct device_node *mac_np; @@ -991,7 +991,7 @@ struct mtk_eth *eth; int err; int i; -@@ -2471,7 +2528,8 @@ static int mtk_probe(struct platform_dev +@@ -2473,7 +2530,8 @@ static int mtk_probe(struct platform_dev if (!eth) return -ENOMEM; @@ -1001,7 +1001,7 @@ eth->dev = &pdev->dev; eth->base = devm_ioremap_resource(&pdev->dev, res); -@@ -2489,26 +2547,37 @@ static int mtk_probe(struct platform_dev +@@ -2491,26 +2549,37 @@ static int mtk_probe(struct platform_dev return PTR_ERR(eth->ethsys); } @@ -1048,7 +1048,7 @@ eth->irq[i] = platform_get_irq(pdev, i); if (eth->irq[i] < 0) { dev_err(&pdev->dev, "no IRQ%d resource found\n", i); -@@ -2552,15 +2621,22 @@ static int mtk_probe(struct platform_dev +@@ -2554,15 +2623,22 @@ static int mtk_probe(struct platform_dev goto err_deinit_hw; } @@ -1079,7 +1079,7 @@ err = mtk_mdio_init(eth); if (err) -@@ -2626,27 +2702,48 @@ static int mtk_remove(struct platform_de +@@ -2628,27 +2704,48 @@ static int mtk_remove(struct platform_de } static const struct mtk_soc_data mt2701_data = { diff --git a/target/linux/sunxi/image/cortex-a7.mk b/target/linux/sunxi/image/cortex-a7.mk index ad76fba63e..464a6ab704 100644 --- a/target/linux/sunxi/image/cortex-a7.mk +++ b/target/linux/sunxi/image/cortex-a7.mk @@ -60,6 +60,9 @@ TARGET_DEVICES += friendlyarm_nanopi-duo2 define Device/friendlyarm_nanopi-r1 DEVICE_VENDOR := FriendlyARM DEVICE_MODEL:=FriendlyARM NanoPi R1 + DEVICE_PACKAGES := kmod-rtc-sunxi kmod-usb2 kmod-usb-net-rtl8152 \ + kmod-brcmfmac kmod-leds-gpio kmod-ledtrig-heartbeat wpad-basic \ + brcmfmac-firmware-43430-sdio SOC := sun8i-h3 endef TARGET_DEVICES += friendlyarm_nanopi-r1