From: David S. Miller Date: Sat, 21 Apr 2018 20:31:52 +0000 (-0400) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~5227^2~415 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e0ada51db907ed2db5d46ad7ff86a8b5df68e59b;p=mirror_ubuntu-focal-kernel.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts were simple overlapping changes in microchip driver. Signed-off-by: David S. Miller --- e0ada51db907ed2db5d46ad7ff86a8b5df68e59b diff --cc drivers/net/phy/microchip.c index ef5e160fe9dc,a97ac8c12c4c..2d67937866a3 --- a/drivers/net/phy/microchip.c +++ b/drivers/net/phy/microchip.c @@@ -20,8 -20,7 +20,9 @@@ #include #include #include + #include +#include +#include #define DRIVER_AUTHOR "WOOJUNG HUH " #define DRIVER_DESC "Microchip LAN88XX PHY driver" diff --cc include/linux/microchipphy.h index 8e4015e7f8d3,8f9c90379732..8c40128af240 --- a/include/linux/microchipphy.h +++ b/include/linux/microchipphy.h @@@ -70,7 -70,12 +70,15 @@@ #define LAN88XX_MMD3_CHIP_ID (32877) #define LAN88XX_MMD3_CHIP_REV (32878) +/* Registers specific to the LAN7800/LAN7850 embedded phy */ +#define LAN78XX_PHY_LED_MODE_SELECT (0x1D) + + /* DSP registers */ + #define PHY_ARDENNES_MMD_DEV_3_PHY_CFG (0x806A) + #define PHY_ARDENNES_MMD_DEV_3_PHY_CFG_ZD_DLY_EN_ (0x2000) + #define LAN88XX_EXT_PAGE_ACCESS_TR (0x52B5) + #define LAN88XX_EXT_PAGE_TR_CR 16 + #define LAN88XX_EXT_PAGE_TR_LOW_DATA 17 + #define LAN88XX_EXT_PAGE_TR_HIGH_DATA 18 + #endif /* _MICROCHIPPHY_H */ diff --cc tools/testing/selftests/net/Makefile index 23e725f4305e,8f1e13d2e547..c3761c35f542 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@@ -5,10 -5,9 +5,10 @@@ CFLAGS = -Wall -Wl,--no-as-needed -O2 CFLAGS += -I../../../../usr/include/ TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh rtnetlink.sh - TEST_PROGS += fib_tests.sh fib-onlink-tests.sh pmtu.sh + TEST_PROGS += fib_tests.sh fib-onlink-tests.sh in_netns.sh pmtu.sh TEST_GEN_FILES = socket TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy +TEST_GEN_FILES += tcp_mmap TEST_GEN_PROGS = reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict