Index: sys/dev/bnxt/if_bnxt.c
===================================================================
--- sys/dev/bnxt/if_bnxt.c
+++ sys/dev/bnxt/if_bnxt.c
@@ -1216,36 +1216,86 @@
 		ifmr->ifm_active |= IFM_HDX;
 
 	switch (link_info->link_speed) {
+	case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_10MB:
+		switch (phy_type) {
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASET:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASETE:
+			ifmr->ifm_active |= IFM_10_T;
+			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_UNKNOWN:
+		default:
+			ifmr->ifm_active |= IFM_UNKNOWN;
+			break;
+		}
+		break;
 	case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_100MB:
-		ifmr->ifm_active |= IFM_100_T;
+		switch (phy_type) {
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASET:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASETE:
+			ifmr->ifm_active |= IFM_100_T;
+			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_UNKNOWN:
+		default:
+			ifmr->ifm_active |= IFM_UNKNOWN;
+			break;
+		}
 		break;
 	case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_1GB:
 		switch (phy_type) {
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASECR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASECR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_L:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_S:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_N:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASECR:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASET:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASETE:
+			ifmr->ifm_active |= IFM_1000_T;
+			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASELR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASELR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASELR:
+			ifmr->ifm_active |= IFM_1000_LX;
+			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASESR10:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASESR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASESR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASESR:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASEER4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASEER4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASESR:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASESX:
+			ifmr->ifm_active |= IFM_1000_SX;
+			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR2:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX:
 			ifmr->ifm_active |= IFM_1000_KX;
 			break;
-		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET:
-			ifmr->ifm_active |= IFM_1000_T;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASECX:
+			ifmr->ifm_active |= IFM_1000_CX;
 			break;
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_SGMIIEXTPHY:
 			ifmr->ifm_active |= IFM_1000_SGMII;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_UNKNOWN:
 		default:
-                        /*
-                         * Workaround: 
-                         *    Don't return IFM_UNKNOWN until 
-                         *    Stratus return proper media_type 
-                         */  
-			ifmr->ifm_active |= IFM_1000_KX;
+			ifmr->ifm_active |= IFM_UNKNOWN;
 			break;
 		}
-	break;
+		break;
 	case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_2_5GB:
 		switch (phy_type) {
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX:
 			ifmr->ifm_active |= IFM_2500_KX;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASET:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASETE:
 			ifmr->ifm_active |= IFM_2500_T;
 			break;
 		default:
@@ -1255,64 +1305,106 @@
 		break;
 	case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_10GB:
 		switch (phy_type) {
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASECR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASECR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_L:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_S:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_N:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASECR:
 			ifmr->ifm_active |= IFM_10G_CR1;
 			break;
-		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR4:
-		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR2:
-		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR:
-			ifmr->ifm_active |= IFM_10G_KR;
-			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASELR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASELR4:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASELR:
 			ifmr->ifm_active |= IFM_10G_LR;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASESR10:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASESR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASESR4:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASESR:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASEER4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASEER4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASESR:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASESX:
 			ifmr->ifm_active |= IFM_10G_SR;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR2:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX:
-			ifmr->ifm_active |= IFM_10G_KX4;
+			ifmr->ifm_active |= IFM_10G_KR;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_ACTIVE_CABLE:
+			ifmr->ifm_active |= IFM_10G_AOC;
+			break;
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET:
 			ifmr->ifm_active |= IFM_10G_T;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_UNKNOWN:
 		default:
-                        /*
-                         * Workaround: 
-                         *    Don't return IFM_UNKNOWN until 
-                         *    Stratus return proper media_type 
-                         */  
-			ifmr->ifm_active |= IFM_10G_CR1;
+			ifmr->ifm_active |= IFM_UNKNOWN;
 			break;
 		}
 		break;
 	case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_20GB:
-		ifmr->ifm_active |= IFM_20G_KR2;
+		switch (phy_type) {
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR2:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR:
+			ifmr->ifm_active |= IFM_20G_KR2;
+			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_UNKNOWN:
+		default:
+			ifmr->ifm_active |= IFM_UNKNOWN;
+			break;
+		}
 		break;
 	case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_25GB:
 		switch (phy_type) {
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASECR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASECR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_L:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_S:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_N:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASECR:
 			ifmr->ifm_active |= IFM_25G_CR;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASELR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASELR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASELR:
+			ifmr->ifm_active |= IFM_25G_LR;
+			break;
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR4:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR2:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR:
 			ifmr->ifm_active |= IFM_25G_KR;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASESR10:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASESR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASESR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASEER4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASEER4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASESX:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASESR:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASESR:
 			ifmr->ifm_active |= IFM_25G_SR;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_ACTIVE_CABLE:
+			ifmr->ifm_active |= IFM_25G_ACC;
+			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_UNKNOWN:
 		default:
-                        /*
-                         * Workaround: 
-                         *    Don't return IFM_UNKNOWN until 
-                         *    Stratus return proper media_type 
-                         */  
-			ifmr->ifm_active |= IFM_25G_CR;
+			ifmr->ifm_active |= IFM_UNKNOWN;
 			break;
 		}
 		break;
 	case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_40GB:
 		switch (phy_type) {
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASECR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASECR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_L:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_S:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_N:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASECR:
 			ifmr->ifm_active |= IFM_40G_CR4;
 			break;
@@ -1321,12 +1413,22 @@
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR:
 			ifmr->ifm_active |= IFM_40G_KR4;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASELR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASELR4:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASELR:
 			ifmr->ifm_active |= IFM_40G_LR4;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASESR10:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASESR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASESR4:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASESR:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASEER4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASEER4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASESR:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASESX:
 			ifmr->ifm_active |= IFM_40G_SR4;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_UNKNOWN:
 		default:
 			ifmr->ifm_active |= IFM_UNKNOWN;
 			break;
@@ -1334,6 +1436,11 @@
 		break;
 	case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_50GB:
 		switch (phy_type) {
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASECR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASECR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_L:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_S:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_N:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASECR:
 			ifmr->ifm_active |= IFM_50G_CR2;
 			break;
@@ -1342,18 +1449,19 @@
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR:
 			ifmr->ifm_active |= IFM_50G_KR2;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_UNKNOWN:
 		default:
-                        /*
-                         * Workaround: 
-                         *    Don't return IFM_UNKNOWN until 
-                         *    Stratus return proper media_type 
-                         */  
-			ifmr->ifm_active |= IFM_50G_CR2;
+			ifmr->ifm_active |= IFM_UNKNOWN;
 			break;
 		}
 		break;
 	case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_100GB:
 		switch (phy_type) {
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASECR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASECR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_L:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_S:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_N:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASECR:
 			ifmr->ifm_active |= IFM_100G_CR4;
 			break;
@@ -1362,22 +1470,29 @@
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR:
 			ifmr->ifm_active |= IFM_100G_KR4;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASELR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASELR4:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASELR:
 			ifmr->ifm_active |= IFM_100G_LR4;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASESR10:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASESR4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASESR4:
 		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASESR:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASEER4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASEER4:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASESR:
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASESX:
 			ifmr->ifm_active |= IFM_100G_SR4;
 			break;
+		case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_UNKNOWN:
 		default:
-                        /*
-                         * Workaround: 
-                         *    Don't return IFM_UNKNOWN until 
-                         *    Stratus return proper media_type 
-                         */  
-			ifmr->ifm_active |= IFM_100G_CR4;
+			ifmr->ifm_active |= IFM_UNKNOWN;
 			break;
 		}
+		break;
 	default:
+		ifmr->ifm_active |= IFM_UNKNOWN;
 		return;
 	}
 
@@ -2184,6 +2299,8 @@
 	case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASET:
 	case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET:
 	case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASETE:
+		BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_T);
+		BNXT_IFMEDIA_ADD(supported, SPEEDS_2_5GB, IFM_2500_T);
 		BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_T);
 		BNXT_IFMEDIA_ADD(supported, SPEEDS_100MB, IFM_100_T);
 		BNXT_IFMEDIA_ADD(supported, SPEEDS_10MB, IFM_10_T);
@@ -2191,6 +2308,7 @@
 	
 	case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX:
 		BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_KR);
+		BNXT_IFMEDIA_ADD(supported, SPEEDS_2_5GB, IFM_2500_KX);
 		BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_KX);
 		break;