From 5e293f847922568caad9ad92eebbcb10118f6fec Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 31 Mar 2017 14:50:43 +0100 Subject: [PATCH 1/2] kernel: Rerun `make oldconfig` on default kernel config ... and accept the defaults. Doing so enables some hw monitoring on Intel (which enables some I2C thing) and explicitly disables a few Mellanox options. Signed-off-by: Ian Campbell --- kernel/kernel_config | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/kernel/kernel_config b/kernel/kernel_config index 59a5a7046..a4a1ff667 100644 --- a/kernel/kernel_config +++ b/kernel/kernel_config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.10 Kernel Configuration +# Linux/x86 4.9.19 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1733,6 +1733,7 @@ CONFIG_NLMON=y # Distributed Switch Architecture drivers # CONFIG_ETHERNET=y +CONFIG_MDIO=y # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_ADAPTEC is not set # CONFIG_NET_VENDOR_AGERE is not set @@ -1764,9 +1765,11 @@ CONFIG_E1000=y CONFIG_E1000E=y CONFIG_E1000E_HWTS=y CONFIG_IGB=y +CONFIG_IGB_HWMON=y CONFIG_IGBVF=y CONFIG_IXGB=y CONFIG_IXGBE=y +CONFIG_IXGBE_HWMON=y CONFIG_IXGBEVF=y # CONFIG_I40E is not set # CONFIG_I40EVF is not set @@ -1775,6 +1778,10 @@ CONFIG_IXGBEVF=y # CONFIG_JME is not set # CONFIG_NET_VENDOR_MARVELL is not set CONFIG_NET_VENDOR_MELLANOX=y +# CONFIG_MLX4_EN is not set +# CONFIG_MLX4_CORE is not set +# CONFIG_MLX5_CORE is not set +# CONFIG_MLXSW_CORE is not set # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MYRI is not set # CONFIG_FEALNX is not set @@ -2016,6 +2023,7 @@ CONFIG_I2C_MUX=y # CONFIG_I2C_MUX_PCA9541 is not set # CONFIG_I2C_MUX_REG is not set CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=y # # I2C Hardware Bus support From 80b3f4597342a0910f8e09f8466169b28329f710 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 31 Mar 2017 14:57:16 +0100 Subject: [PATCH 2/2] kernel Enable support for RTL8139 NIC This is the default NIC provided by virt-install, I think it is also pretty common on other virtualisation platforms since both the drivers and the emulation are pretty widespread (IIRC Xen HVM guests used to get this by default, and may still do). Personally I'd probably try and remember to switch to virtio (or even e1000) in preference, but that's one more thing to do. Bump the image number. Signed-off-by: Ian Campbell --- kernel/Makefile | 2 +- kernel/kernel_config | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index f85f1b8a0..e41c69b97 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -31,7 +31,7 @@ IMAGE_MAJOR_VERSION=4.10.x DEPS=Dockerfile.4.10 Makefile kernel_config kernel_config.debug patches-4.10 else KERNEL_VERSION=4.9.19 -IMAGE_VERSION=$(KERNEL_VERSION)-0 +IMAGE_VERSION=$(KERNEL_VERSION)-1 IMAGE_MAJOR_VERSION=4.9.x DEPS=Dockerfile Makefile kernel_config kernel_config.debug patches-4.9 endif diff --git a/kernel/kernel_config b/kernel/kernel_config index a4a1ff667..ae1930bc9 100644 --- a/kernel/kernel_config +++ b/kernel/kernel_config @@ -1700,6 +1700,7 @@ CONFIG_FUSION_MAX_SGE=128 # CONFIG_FIREWIRE_NOSY is not set # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y +CONFIG_MII=y CONFIG_NET_CORE=y CONFIG_BONDING=y CONFIG_DUMMY=y @@ -1794,7 +1795,10 @@ CONFIG_NET_VENDOR_NETRONOME=y # CONFIG_NET_PACKET_ENGINE is not set # CONFIG_NET_VENDOR_QLOGIC is not set # CONFIG_NET_VENDOR_QUALCOMM is not set -# CONFIG_NET_VENDOR_REALTEK is not set +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_8139CP=y +# CONFIG_8139TOO is not set +# CONFIG_R8169 is not set # CONFIG_NET_VENDOR_RENESAS is not set # CONFIG_NET_VENDOR_RDC is not set # CONFIG_NET_VENDOR_ROCKER is not set