huitui

root/target/linux/bcm27xx/patches-5.4/990-xhci-quirks-add-link-TRB-quirk-VL805.patch

@@ -57,11 +57,22 @@ diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
 index 2033bb8683033..90ccc71231c1a 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
+<<<<<<< HEAD
 @@ -1874,6 +1874,7 @@ struct xhci_hcd {
+=======
+@@ -1874,7 +1874,8 @@ struct xhci_hcd {
+>>>>>>> parent of 602cd0b... fixomr
  #define XHCI_RESET_PLL_ON_DISCONNECT	BIT_ULL(34)
  #define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35)
  #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(36)
 +#define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(37)
+<<<<<<< HEAD
  
  	unsigned int		num_active_eps;
  	unsigned int		limit_active_eps;
+=======
+ #define XHCI_DISABLE_SPARSE	BIT_ULL(38)
+ 
+ 	unsigned int		num_active_eps;
+ 	unsigned int		limit_active_eps;
+>>>>>>> parent of 602cd0b... fixomr

root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch

@@ -3288,6 +3288,7 @@ diff -aurN linux-5.4.64/net/ipv4/syncookies.c linux-5.4.64.mptcp/net/ipv4/syncoo
  	 * the ACK carries the same options again (see RFC1122 4.2.3.8)
  	 */
 @@ -387,15 +421,15 @@
+<<<<<<< HEAD
  	/* Try to redo what tcp_v4_send_synack did. */
  	req->rsk_window_clamp = tp->window_clamp ? :dst_metric(&rt->dst, RTAX_WINDOW);
  
@@ -3296,6 +3297,16 @@ diff -aurN linux-5.4.64/net/ipv4/syncookies.c linux-5.4.64.mptcp/net/ipv4/syncoo
 -				  ireq->wscale_ok, &rcv_wscale,
 -				  dst_metric(&rt->dst, RTAX_INITRWND));
 +	tp->ops->select_initial_window(sk, tcp_full_space(sk), req->mss,
+=======
+ 	    (req->rsk_window_clamp > full_space || req->rsk_window_clamp == 0))
+ 		req->rsk_window_clamp = full_space;
+ 
+-	tcp_select_initial_window(sk, full_space, req->mss,
+-				  &req->rsk_rcv_wnd, &req->rsk_window_clamp,
+-				  ireq->wscale_ok, &rcv_wscale,
+-				  dst_metric(&rt->dst, RTAX_INITRWND));
++	tp->ops->select_initial_window(sk, full_space, req->mss,
+>>>>>>> parent of 602cd0b... fixomr
 +				       &req->rsk_rcv_wnd, &req->rsk_window_clamp,
 +				       ireq->wscale_ok, &rcv_wscale,
 +				       dst_metric(&rt->dst, RTAX_INITRWND));
@@ -4028,6 +4039,7 @@ diff -aurN linux-5.4.64/net/ipv4/tcp.c linux-5.4.64.mptcp/net/ipv4/tcp.c
  #ifdef CONFIG_MMU
  	case TCP_ZEROCOPY_RECEIVE: {
  		struct tcp_zerocopy_receive zc;
+<<<<<<< HEAD
 @@ -3862,7 +4143,9 @@
  	if (sk->sk_state == TCP_SYN_SENT || sk->sk_state == TCP_SYN_RECV)
  		TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS);
@@ -4038,6 +4050,8 @@ diff -aurN linux-5.4.64/net/ipv4/tcp.c linux-5.4.64.mptcp/net/ipv4/tcp.c
  	tcp_clear_xmit_timers(sk);
  	if (req)
  		reqsk_fastopen_remove(sk, req, false);
+=======
+>>>>>>> parent of 602cd0b... fixomr
 @@ -3878,6 +4161,8 @@
  
  int tcp_abort(struct sock *sk, int err)
@@ -4592,12 +4606,22 @@ diff -aurN linux-5.4.64/net/ipv4/tcp_input.c linux-5.4.64.mptcp/net/ipv4/tcp_inp
  {
  	int eaten;
  	struct sk_buff *tail = skb_peek_tail(&sk->sk_receive_queue);
+<<<<<<< HEAD
 @@ -4774,7 +4838,7 @@
  	int avail = tp->rcv_nxt - tp->copied_seq;
  
  	if (avail < sk->sk_rcvlowat && !tcp_rmem_pressure(sk) &&
 -	    !sock_flag(sk, SOCK_DONE))
 +	    !sock_flag(sk, SOCK_DONE) && !mptcp(tp))
+=======
+@@ -4774,8 +4838,8 @@
+ 	int avail = tp->rcv_nxt - tp->copied_seq;
+ 
+ 	if (avail < sk->sk_rcvlowat && !tcp_rmem_pressure(sk) &&
+-	    !sock_flag(sk, SOCK_DONE) &&
++	    !sock_flag(sk, SOCK_DONE) && !mptcp(tp) &&
+ 	    tcp_receive_window(tp) > inet_csk(sk)->icsk_ack.rcv_mss)
+>>>>>>> parent of 602cd0b... fixomr
  		return;
  
  	sk->sk_data_ready(sk);
@@ -6714,6 +6738,7 @@ diff -aurN linux-5.4.64/net/ipv6/syncookies.c linux-5.4.64.mptcp/net/ipv6/syncoo
  		goto out_free;
  
 @@ -241,15 +259,15 @@
+<<<<<<< HEAD
  	}
  
  	req->rsk_window_clamp = tp->window_clamp ? :dst_metric(dst, RTAX_WINDOW);
@@ -6722,6 +6747,16 @@ diff -aurN linux-5.4.64/net/ipv6/syncookies.c linux-5.4.64.mptcp/net/ipv6/syncoo
 -				  ireq->wscale_ok, &rcv_wscale,
 -				  dst_metric(dst, RTAX_INITRWND));
 +	tp->ops->select_initial_window(sk, tcp_full_space(sk), req->mss,
+=======
+ 	    (req->rsk_window_clamp > full_space || req->rsk_window_clamp == 0))
+ 		req->rsk_window_clamp = full_space;
+ 
+-	tcp_select_initial_window(sk, full_space, req->mss,
+-				  &req->rsk_rcv_wnd, &req->rsk_window_clamp,
+-				  ireq->wscale_ok, &rcv_wscale,
+-				  dst_metric(dst, RTAX_INITRWND));
++	tp->ops->select_initial_window(sk, full_space, req->mss,
+>>>>>>> parent of 602cd0b... fixomr
 +				       &req->rsk_rcv_wnd, &req->rsk_window_clamp,
 +				       ireq->wscale_ok, &rcv_wscale,
 +				       dst_metric(dst, RTAX_INITRWND));
@@ -23659,4 +23694,8 @@ diff -aurN linux-5.4.64/tools/include/uapi/linux/bpf.h linux-5.4.64.mptcp/tools/
 +	BPF_TCP_RST_WAIT,
  
  	BPF_TCP_MAX_STATES	/* Leave at the end! */
+<<<<<<< HEAD
  };
+=======
+ };
+>>>>>>> parent of 602cd0b... fixomr

root/target/linux/mediatek/mt7623/config-4.19

@@ -1,8 +1,12 @@
 # CONFIG_AIO is not set
 CONFIG_ALIGNMENT_TRAP=y
+<<<<<<< HEAD
 # CONFIG_ARCH_AXXIA is not set
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+=======
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
@@ -10,7 +14,10 @@ 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
+<<<<<<< HEAD
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
@@ -37,16 +44,24 @@ CONFIG_ARM=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+<<<<<<< HEAD
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y
 # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER is not set
+=======
+# CONFIG_ARM_ATAG_DTB_COMPAT is not set
+>>>>>>> parent of 602cd0b... fixomr
 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
+<<<<<<< HEAD
 CONFIG_ARM_LPAE=y
+=======
+# CONFIG_ARM_LPAE is not set
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_ARM_MEDIATEK_CPUFREQ=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_ARM_PATCH_PHYS_VIRT=y
@@ -55,17 +70,25 @@ CONFIG_ARM_THUMB=y
 CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_UNWIND=y
 CONFIG_ARM_VIRT_EXT=y
+<<<<<<< HEAD
 CONFIG_ASN1=y
 CONFIG_ASSOCIATIVE_ARRAY=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_ATAGS=y
 CONFIG_AUTO_ZRELADDR=y
 # CONFIG_BCM84881_PHY is not set
 CONFIG_BLK_MQ_PCI=y
+<<<<<<< HEAD
+=======
+CONFIG_BOUNCE=y
+>>>>>>> parent of 602cd0b... fixomr
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_CLEANCACHE=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLONE_BACKWARDS=y
+<<<<<<< HEAD
 CONFIG_CLZ_TAB=y
 CONFIG_CMDLINE="earlyprintk console=ttyS0,115200 vmalloc=256M"
 CONFIG_CMDLINE_EXTEND=y
@@ -76,14 +99,29 @@ CONFIG_COMMON_CLK_MT2701_AUDSYS=y
 CONFIG_COMMON_CLK_MT2701_BDPSYS=y
 CONFIG_COMMON_CLK_MT2701_ETHSYS=y
 CONFIG_COMMON_CLK_MT2701_G3DSYS=y
+=======
+CONFIG_CMDLINE="earlyprintk console=ttyS0,115200 rootfstype=squashfs,jffs2"
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
+CONFIG_COMMON_CLK=y
+CONFIG_COMMON_CLK_MEDIATEK=y
+CONFIG_COMMON_CLK_MT2701=y
+# CONFIG_COMMON_CLK_MT2701_AUDSYS is not set
+CONFIG_COMMON_CLK_MT2701_BDPSYS=y
+CONFIG_COMMON_CLK_MT2701_ETHSYS=y
+# CONFIG_COMMON_CLK_MT2701_G3DSYS is not set
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_COMMON_CLK_MT2701_HIFSYS=y
 CONFIG_COMMON_CLK_MT2701_IMGSYS=y
 CONFIG_COMMON_CLK_MT2701_MMSYS=y
 CONFIG_COMMON_CLK_MT2701_VDECSYS=y
 # CONFIG_COMMON_CLK_MT7622 is not set
+<<<<<<< HEAD
 CONFIG_COMMON_CLK_MT7629=y
 # CONFIG_COMMON_CLK_MT7629_ETHSYS is not set
 # CONFIG_COMMON_CLK_MT7629_HIFSYS is not set
+=======
+# CONFIG_COMMON_CLK_MT7629 is not set
+>>>>>>> parent of 602cd0b... fixomr
 # CONFIG_COMMON_CLK_MT8135 is not set
 # CONFIG_COMMON_CLK_MT8173 is not set
 CONFIG_COREDUMP=y
@@ -118,7 +156,10 @@ CONFIG_CPU_SPECTRE=y
 CONFIG_CPU_THUMB_CAPABLE=y
 CONFIG_CPU_TLB_V7=y
 CONFIG_CPU_V7=y
+<<<<<<< HEAD
 CONFIG_CRASH_CORE=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_CRC16=y
 # CONFIG_CRC32_SARWATE is not set
 CONFIG_CRC32_SLICEBY8=y
@@ -126,18 +167,29 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_ACOMP2=y
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_AEAD2=y
+<<<<<<< HEAD
 CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_AKCIPHER2=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_DEFLATE=y
+<<<<<<< HEAD
+=======
+CONFIG_CRYPTO_DEV_MEDIATEK=y
+>>>>>>> parent of 602cd0b... fixomr
 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
+<<<<<<< HEAD
+=======
+CONFIG_CRYPTO_HW=y
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_CRYPTO_JITTERENTROPY=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_MANAGER=y
@@ -147,7 +199,10 @@ CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
+<<<<<<< HEAD
 CONFIG_CRYPTO_RSA=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
@@ -172,7 +227,11 @@ CONFIG_DEBUG_UART_PHYS=0x11004000
 CONFIG_DEBUG_UART_VIRT=0xf1004000
 CONFIG_DEBUG_UNCOMPRESS=y
 # CONFIG_DEBUG_USER is not set
+<<<<<<< HEAD
 CONFIG_DEFAULT_NETLINK=y
+=======
+CONFIG_DEFAULT_MPTCP_PM="fullmesh"
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_OF=y
@@ -220,7 +279,11 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_GPS is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y
+<<<<<<< HEAD
 # CONFIG_HARDEN_BRANCH_PREDICTOR is not set
+=======
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
@@ -233,7 +296,10 @@ CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
+<<<<<<< HEAD
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_HAVE_CLK=y
@@ -250,7 +316,10 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+<<<<<<< HEAD
 CONFIG_HAVE_GENERIC_GUP=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
@@ -263,20 +332,32 @@ CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_PROC_CPU=y
+<<<<<<< HEAD
 CONFIG_HAVE_RCU_TABLE_FREE=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 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
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+<<<<<<< HEAD
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_HUGETLBFS is not set
+=======
+CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
+CONFIG_HOTPLUG_CPU=y
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_HWMON=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_MTK=y
 CONFIG_HZ_FIXED=0
+<<<<<<< HEAD
 CONFIG_HZ_PERIODIC=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
@@ -285,11 +366,15 @@ CONFIG_ICPLUS_PHY=y
 CONFIG_IIO=y
 # CONFIG_IIO_BUFFER is not set
 # CONFIG_IIO_TRIGGER is not set
+<<<<<<< HEAD
 CONFIG_INITRAMFS_COMPRESSION=""
 # CONFIG_INITRAMFS_FORCE is not set
 CONFIG_INITRAMFS_ROOT_GID=1000
 CONFIG_INITRAMFS_ROOT_UID=1000
 CONFIG_INITRAMFS_SOURCE="/openwrt/trunk/build_dir/target-arm_cortex-a7_musl-1.1.14_eabi/root-mediatek /openwrt/trunk/target/linux/generic/image/initramfs-base-files.txt"
+=======
+CONFIG_INITRAMFS_SOURCE=""
+>>>>>>> parent of 602cd0b... fixomr
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
@@ -301,9 +386,12 @@ CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
 CONFIG_JBD2=y
 CONFIG_KALLSYMS=y
+<<<<<<< HEAD
 CONFIG_KEXEC=y
 CONFIG_KEXEC_CORE=y
 CONFIG_KEYS=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_LEDS_MT6323=y
 CONFIG_LIBFDT=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
@@ -315,7 +403,11 @@ CONFIG_LZO_DECOMPRESS=y
 # CONFIG_MACH_MT6589 is not set
 # CONFIG_MACH_MT6592 is not set
 CONFIG_MACH_MT7623=y
+<<<<<<< HEAD
 CONFIG_MACH_MT7629=y
+=======
+# CONFIG_MACH_MT7629 is not set
+>>>>>>> parent of 602cd0b... fixomr
 # CONFIG_MACH_MT8127 is not set
 # CONFIG_MACH_MT8135 is not set
 CONFIG_MAGIC_SYSRQ=y
@@ -340,12 +432,15 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_TIFM_SD is not set
 CONFIG_MODULES_USE_ELF_REL=y
+<<<<<<< HEAD
 CONFIG_MPILIB=y
 # CONFIG_MPTCP_BINDER is not set
 # CONFIG_MPTCP_FULLMESH is not set
 # CONFIG_MPTCP_NDIFFPORTS is not set
 # CONFIG_MPTCP_REDUNDANT is not set
 # CONFIG_MPTCP_ROUNDROBIN is not set
+=======
+>>>>>>> parent of 602cd0b... fixomr
 # CONFIG_MT753X_GSW is not set
 CONFIG_MTD_BLOCK2MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
@@ -373,7 +468,11 @@ CONFIG_MTK_EFUSE=y
 CONFIG_MTK_INFRACFG=y
 # CONFIG_MTK_IOMMU is not set
 # CONFIG_MTK_IOMMU_V1 is not set
+<<<<<<< HEAD
 CONFIG_MTK_PLATFORM="mt7623"
+=======
+CONFIG_MTK_PLATFORM=""
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_MTK_PMIC_WRAP=y
 CONFIG_MTK_SCPSYS=y
 CONFIG_MTK_THERMAL=y
@@ -382,7 +481,10 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEON=y
 CONFIG_NET_DSA=y
+<<<<<<< HEAD
 CONFIG_NET_DSA_LEGACY=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_NET_DSA_MT7530=y
 CONFIG_NET_DSA_TAG_MTK=y
 CONFIG_NET_FLOW_LIMIT=y
@@ -393,6 +495,12 @@ CONFIG_NET_VENDOR_MEDIATEK=y
 # CONFIG_NET_VENDOR_WIZNET is not set
 CONFIG_NLS=y
 CONFIG_NO_BOOTMEM=y
+<<<<<<< HEAD
+=======
+CONFIG_NO_HZ=y
+CONFIG_NO_HZ_COMMON=y
+CONFIG_NO_HZ_IDLE=y
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_NR_CPUS=4
 CONFIG_NVMEM=y
 CONFIG_OF=y
@@ -420,18 +528,27 @@ CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 # CONFIG_PCI_V3_SEMI is not set
 CONFIG_PERF_USE_VMALLOC=y
+<<<<<<< HEAD
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_PGTABLE_MAPPING=y
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=y
 CONFIG_PHYS_ADDR_T_64BIT=y
+=======
+CONFIG_PGTABLE_LEVELS=2
+CONFIG_PHYLIB=y
+CONFIG_PHYLINK=y
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_PHY_MTK_TPHY=y
 # CONFIG_PHY_MTK_XSPHY is not set
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_MT2701=y
 CONFIG_PINCTRL_MT6397=y
 CONFIG_PINCTRL_MT7623=y
+<<<<<<< HEAD
 CONFIG_PINCTRL_MT7629=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_PINCTRL_MTK=y
 CONFIG_PINCTRL_MTK_MOORE=y
 CONFIG_PLUGIN_HOSTCC="g++"
@@ -500,7 +617,10 @@ CONFIG_SPI_MEM=y
 CONFIG_SPI_MT65XX=y
 # CONFIG_SPI_MTK_SNFI is not set
 CONFIG_SPMI=y
+<<<<<<< HEAD
 # CONFIG_SPS30 is not set
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_SRCU=y
 CONFIG_STREAM_PARSER=y
 # CONFIG_STRIP_ASM_SYMS is not set
@@ -510,7 +630,10 @@ CONFIG_SWCONFIG=y
 CONFIG_SWPHY=y
 CONFIG_SWP_EMULATE=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+<<<<<<< HEAD
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_TASKS_RCU=y
 # CONFIG_TCP_CONG_NANQINLANG is not set
 CONFIG_THERMAL=y
@@ -542,8 +665,11 @@ CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WATCHDOG_CORE=y
+<<<<<<< HEAD
 # CONFIG_WIRELESS is not set
 # CONFIG_WLAN is not set
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_XPS=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_BCJ=y
@@ -551,5 +677,8 @@ CONFIG_ZBOOT_ROM_BSS=0
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
+<<<<<<< HEAD
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
+=======
+>>>>>>> parent of 602cd0b... fixomr

root/target/linux/mediatek/patches-5.4/0998-mt7623-add-missing-pause.patch

@@ -0,0 +1,32 @@
+From 0808ca98e67e914ac48cc8f11910509d3b04379c Mon Sep 17 00:00:00 2001
+From: Frank Wunderlich <frank-w@public-files.de>
+Date: Mon, 7 Sep 2020 09:05:17 +0200
+Subject: [PATCH] arm: dts: mt7623: add missing pause for switchport
+
+commit 36f0a5fc5284838c544218666c63ee8cfa46a9c3 upstream.
+
+port6 of mt7530 switch (= cpu port 0) on bananapi-r2 misses pause option
+which causes rx drops on running iperf.
+
+Fixes: f4ff257cd160 ("arm: dts: mt7623: add support for Bananapi R2 (BPI-R2) board")
+Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/r/20200907070517.51715-1-linux@fw-web.de
+Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
+index 2b760f90f38c..5375c6699843 100644
+--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
++++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
+@@ -192,6 +192,7 @@
+ 					fixed-link {
+ 						speed = <1000>;
+ 						full-duplex;
++						pause;
+ 					};
+ 				};
+ 			};

root/target/linux/mediatek/patches-5.4/0999-lan-to-wan.patch

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts	2020-04-19 11:02:56.505715879 +0200
 +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts	2020-04-19 11:03:53.620780390 +0200
 @@ -196,7 +196,7 @@
@@ -15,12 +16,21 @@
  
 -/* Disabled, is now handled by gmac1 (eth1/wan) via phy-handle!
 +/* Disabled, is now handled by gmac1 (eth1/lan) via phy-handle!
+=======
+--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts.anc	2020-11-16 15:48:00.852410183 +0100
++++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts	2020-11-16 15:49:23.878965822 +0100
+@@ -210,27 +210,27 @@
+ 
+>>>>>>> parent of 602cd0b... fixomr
  				port@0 {
  					reg = <0>;
 -					label = "wan";
 +					label = "lan";
  				};
+<<<<<<< HEAD
  */
+=======
+>>>>>>> parent of 602cd0b... fixomr
  
  				port@1 {
  					reg = <1>;