[kernel]: update kernel submodule and remove standalone igb driver

README.md

@@ -80,7 +80,7 @@ The SONiC installer contains all docker images needed. SONiC uses one image for
 For Broadcom ASIC, we build ONIE and EOS image. EOS image is used for Arista devices, ONIE image is used for all other Broadcom ASIC based devices. 
 
     make configure PLATFORM=broadcom
-    BLDENV=stretch make target/debs/linux-headers-4.9.0-3-common_4.9.30-2+deb9u5_all.deb target/debs/igb.ko
+    BLDENV=stretch make target/debs/linux-headers-4.9.0-3-common_4.9.30-2+deb9u5_all.deb
     # build ONIE image
     make target/sonic-broadcom.bin
  

build_debian.sh

@@ -151,9 +151,6 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
 pushd $FILESYSTEM_ROOT/usr/share/initramfs-tools/scripts/init-bottom && sudo patch -p1 < $OLDPWD/files/initramfs-tools/udev.patch; popd
 sudo chroot $FILESYSTEM_ROOT update-initramfs -u
 
-## Install latest intel igb driver
-sudo cp target/debs/igb.ko $FILESYSTEM_ROOT/lib/modules/${LINUX_KERNEL_VERSION}-amd64/kernel/drivers/net/ethernet/intel/igb/igb.ko
-
 ## Install latest intel ixgbe driver
 sudo cp target/debs/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-5-amd64/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
 

rules/igb.mk

@@ -1,9 +0,0 @@
-# initramfs-tools package
-
-IGB_DRIVER_VERSION = 5.3.5.10
-export IGB_DRIVER_VERSION
-
-IGB_DRIVER = igb.ko
-$(IGB_DRIVER)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
-$(IGB_DRIVER)_SRC_PATH = $(SRC_PATH)/igb
-SONIC_MAKE_DEBS += $(IGB_DRIVER)

slave.mk

@@ -455,7 +455,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
         $$(addprefix $(FILES_PATH)/,$$($$*_FILES)) \
         $(addprefix $(DEBS_PATH)/,$(INITRAMFS_TOOLS) \
                 $(LINUX_KERNEL) \
-                $(IGB_DRIVER) \
                 $(IXGBE_DRIVER) \
                 $(SONIC_DEVICE_DATA) \
                 $(PYTHON_CLICK) \

src/igb/Makefile

@@ -1,23 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-.SHELLFLAGS += -e
-
-MAIN_TARGET = igb.ko
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	rm -rf ./igb-$(IGB_DRIVER_VERSION)
-	wget -O igb-$(IGB_DRIVER_VERSION).tar.gz "https://sonicstorage.blob.core.windows.net/packages/igb-5.3.5.10.tar.gz?sv=2015-04-05&sr=b&sig=JShcQUqXm13Ni6Qaa3RTo%2FeEDIfuaqUTec%2FpV2J5dyA%3D&se=2154-07-27T09%3A09%3A02Z&sp=r"
-	tar xzf igb-$(IGB_DRIVER_VERSION).tar.gz
-
-	# Patch
-	pushd ./igb-$(IGB_DRIVER_VERSION)
-	patch -p1 < ../patch/0001-add-PHY-support-for-Broadcom-54616.patch
-
-	# Build the package
-	pushd src
-	export BUILD_KERNEL=4.9.0-3-amd64
-	make
-	popd
-
-	popd
-	mv ./igb-$(IGB_DRIVER_VERSION)/src/$* $(DEST)/

src/igb/patch/0001-add-PHY-support-for-Broadcom-54616.patch

@@ -1,61 +0,0 @@
-From 10ed7b7e0fd06c312f497e4647c4140b1cc8eef8 Mon Sep 17 00:00:00 2001
-From: Guohan Lu <gulv@microsoft.com>
-Date: Mon, 8 May 2017 05:53:38 +0000
-Subject: [PATCH] add PHY support for Broadcom 54616
-
----
- src/e1000_82575.c   | 5 +++++
- src/e1000_defines.h | 1 +
- src/e1000_hw.h      | 1 +
- 3 files changed, 7 insertions(+)
-
-diff --git a/src/e1000_82575.c b/src/e1000_82575.c
-index b4b973e..afaa7e5 100644
---- a/src/e1000_82575.c
-+++ b/src/e1000_82575.c
-@@ -302,6 +302,9 @@ static s32 e1000_init_phy_params_82575(struct e1000_hw *hw)
- 		phy->ops.set_d3_lplu_state = e1000_set_d3_lplu_state_82580;
- 		phy->ops.force_speed_duplex = e1000_phy_force_speed_duplex_m88;
- 		break;
-+	case BCM54616_E_PHY_ID:
-+		phy->type = e1000_phy_bcm54616;
-+		break;
- 	default:
- 		ret_val = -E1000_ERR_PHY;
- 		goto out;
-@@ -1602,6 +1605,8 @@ static s32 e1000_setup_copper_link_82575(struct e1000_hw *hw)
- 	case e1000_phy_82580:
- 		ret_val = e1000_copper_link_setup_82577(hw);
- 		break;
-+	case e1000_phy_bcm54616:
-+		break;
- 	default:
- 		ret_val = -E1000_ERR_PHY;
- 		break;
-diff --git a/src/e1000_defines.h b/src/e1000_defines.h
-index 6de3988..773c464 100644
---- a/src/e1000_defines.h
-+++ b/src/e1000_defines.h
-@@ -1185,6 +1185,7 @@
- #define I210_I_PHY_ID		0x01410C00
- #define IGP04E1000_E_PHY_ID	0x02A80391
- #define M88_VENDOR		0x0141
-+#define BCM54616_E_PHY_ID	0x03625D10
- 
- /* M88E1000 Specific Registers */
- #define M88E1000_PHY_SPEC_CTRL		0x10  /* PHY Specific Control Reg */
-diff --git a/src/e1000_hw.h b/src/e1000_hw.h
-index 3bcecf1..cca5d77 100644
---- a/src/e1000_hw.h
-+++ b/src/e1000_hw.h
-@@ -133,6 +133,7 @@ enum e1000_phy_type {
- 	e1000_phy_82580,
- 	e1000_phy_vf,
- 	e1000_phy_i210,
-+	e1000_phy_bcm54616,
- };
- 
- enum e1000_bus_type {
--- 
-2.7.4
-

src/sonic-linux-kernel

@@ -1 +1 @@
-Subproject commit 61923df04554c64107fc91c095016232fb1859a0
+Subproject commit a21a592baf4b189591f63fe7930f7d889bccd57a