From c6fbdf1b83e1faba8fb5a62baf7d3ce4072dfc30 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sat, 26 Dec 2020 01:21:34 +0800 Subject: [PATCH] ipq40xx: refresh patches --- .../305-spi-nor-add-en25qh16.patch | 2 +- ...add-qualcomm-essedma-ethernet-driver.patch | 2 +- ...essedma-disable-default-vlan-tagging.patch | 34 ++----------------- .../patches-5.4/998-enable-ramoops.patch | 2 +- .../999-ipq40xx-unlock-cpu-frequency.patch | 2 +- 5 files changed, 6 insertions(+), 36 deletions(-) diff --git a/target/linux/ipq40xx/patches-5.4/305-spi-nor-add-en25qh16.patch b/target/linux/ipq40xx/patches-5.4/305-spi-nor-add-en25qh16.patch index 9ad103d79a..c35386f16a 100644 --- a/target/linux/ipq40xx/patches-5.4/305-spi-nor-add-en25qh16.patch +++ b/target/linux/ipq40xx/patches-5.4/305-spi-nor-add-en25qh16.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -2233,6 +2233,8 @@ static const struct flash_info spi_nor_i +@@ -2240,6 +2240,8 @@ static const struct flash_info spi_nor_i { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, SECT_4K) }, { "en25q80a", INFO(0x1c3014, 0, 64 * 1024, 16, SECT_4K | SPI_NOR_DUAL_READ) }, diff --git a/target/linux/ipq40xx/patches-5.4/710-net-add-qualcomm-essedma-ethernet-driver.patch b/target/linux/ipq40xx/patches-5.4/710-net-add-qualcomm-essedma-ethernet-driver.patch index b3d1c973e2..13e22047f5 100644 --- a/target/linux/ipq40xx/patches-5.4/710-net-add-qualcomm-essedma-ethernet-driver.patch +++ b/target/linux/ipq40xx/patches-5.4/710-net-add-qualcomm-essedma-ethernet-driver.patch @@ -37,7 +37,7 @@ Signed-off-by: Christian Lamparter obj-$(CONFIG_RMNET) += rmnet/ --- a/drivers/net/ethernet/qualcomm/essedma/edma.c +++ b/drivers/net/ethernet/qualcomm/essedma/edma.c -@@ -1499,7 +1499,7 @@ int edma_rx_flow_steer(struct net_device +@@ -1491,7 +1491,7 @@ int edma_rx_flow_steer(struct net_device int res; if (skb->protocol == htons(ETH_P_IPV6)) { diff --git a/target/linux/ipq40xx/patches-5.4/901-essedma-disable-default-vlan-tagging.patch b/target/linux/ipq40xx/patches-5.4/901-essedma-disable-default-vlan-tagging.patch index 0ea092c0c7..6916c08294 100644 --- a/target/linux/ipq40xx/patches-5.4/901-essedma-disable-default-vlan-tagging.patch +++ b/target/linux/ipq40xx/patches-5.4/901-essedma-disable-default-vlan-tagging.patch @@ -24,7 +24,7 @@ Signed-off-by: Chen Minqiang --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -647,8 +647,7 @@ +@@ -665,8 +665,7 @@ qcom,page-mode = <0>; qcom,rx_head_buf_size = <1540>; qcom,mdio_supported; @@ -34,7 +34,7 @@ Signed-off-by: Chen Minqiang interrupts = <0 65 IRQ_TYPE_EDGE_RISING 0 66 IRQ_TYPE_EDGE_RISING 0 67 IRQ_TYPE_EDGE_RISING -@@ -686,7 +685,7 @@ +@@ -704,7 +704,7 @@ gmac0: gmac0 { local-mac-address = [00 00 00 00 00 00]; @@ -43,33 +43,3 @@ Signed-off-by: Chen Minqiang }; gmac1: gmac1 { ---- a/drivers/net/ethernet/qualcomm/essedma/edma.c -+++ b/drivers/net/ethernet/qualcomm/essedma/edma.c -@@ -721,13 +721,11 @@ static u16 edma_rx_complete(struct edma_ - edma_receive_checksum(rd, skb); - - /* Process VLAN HW acceleration indication provided by HW */ -- if (unlikely(adapter->default_vlan_tag != rd->rrd4)) { -- vlan = rd->rrd4; -- if (likely(rd->rrd7 & EDMA_RRD_CVLAN)) -- __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan); -- else if (rd->rrd1 & EDMA_RRD_SVLAN) -- __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021AD), vlan); -- } -+ vlan = rd->rrd4; -+ if (likely(rd->rrd7 & EDMA_RRD_CVLAN)) -+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan); -+ else if (rd->rrd1 & EDMA_RRD_SVLAN) -+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021AD), vlan); - - /* Update rx statistics */ - adapter->stats.rx_packets++; -@@ -1408,8 +1406,6 @@ netdev_tx_t edma_xmit(struct sk_buff *sk - if (!adapter->edma_cinfo->is_single_phy) { - if (unlikely(skb_vlan_tag_present(skb))) - flags_transmit |= EDMA_VLAN_TX_TAG_INSERT_FLAG; -- else if (adapter->default_vlan_tag) -- flags_transmit |= EDMA_VLAN_TX_TAG_INSERT_DEFAULT_FLAG; - } - - /* Check and mark checksum offload */ diff --git a/target/linux/ipq40xx/patches-5.4/998-enable-ramoops.patch b/target/linux/ipq40xx/patches-5.4/998-enable-ramoops.patch index 48eb22c759..a22f4f0f7c 100644 --- a/target/linux/ipq40xx/patches-5.4/998-enable-ramoops.patch +++ b/target/linux/ipq40xx/patches-5.4/998-enable-ramoops.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -31,6 +31,15 @@ +@@ -32,6 +32,15 @@ reg = <0x87e80000 0x180000>; no-map; }; diff --git a/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch b/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch index 86e4ba12f2..cc5e195d12 100644 --- a/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch +++ b/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch @@ -10,7 +10,7 @@ Signed-off-by: William --- --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -114,20 +114,24 @@ +@@ -124,20 +124,24 @@ opp-48000000 { opp-hz = /bits/ 64 <48000000>;