Attachment #171652 for bug #150249




			physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;
		if (ext_ability & IXGBE_MDIO_PHY_100BASETX_ABILITY)
			physical_layer |= IXGBE_PHYSICAL_LAYER_100BASE_TX;
		printf("phy.type set physical layer %u\n", physical_layer);
		goto out;
	default:
		break;

		if (pma_pmd_1g == IXGBE_AUTOC_1G_KX_BX) {
			physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_KX |
			    IXGBE_PHYSICAL_LAYER_1000BASE_BX;
			printf("autoc_1g set physical layer %u\n", physical_layer);
			goto out;
		} else
			/* SFI mode so read SFP module */

			physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
		else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_XAUI)
			physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_XAUI;
			printf("autoc_10g set physical layer %u\n", physical_layer);
		goto out;
		break;
	case IXGBE_AUTOC_LMS_10G_SERIAL:
		if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_KR) {
			physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KR;
			printf("autoc_10g_serial set physical layer %u\n", physical_layer);
			goto out;
		} else if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_SFI)
			goto sfp_check;

			physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
		if (autoc & IXGBE_AUTOC_KR_SUPP)
			physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KR;
			printf("autoc_LMS set physical layer %u\n", physical_layer);
		goto out;
		break;
	default:
		printf("Unable to set physical layer %u\n", physical_layer);
		goto out;
		break;
	}

	 * test KR mode -  we need to id KR mode correctly before SFP module.
	 * Call identify_sfp because the pluggable module may have changed */
	physical_layer = ixgbe_get_supported_phy_sfp_layer_generic(hw);
	printf("phy_sfp_layer set physical layer %u\n", physical_layer);
out:
	return physical_layer;
}

Lines 1638-1643 Link Here

(-)sys/dev/ixgbe/ixgbe_phy.c (+4 lines)
1638	if (hw->phy.sfp_type == ixgbe_sfp_type_not_present)	1638	if (hw->phy.sfp_type == ixgbe_sfp_type_not_present)
1639	return physical_layer;	1639	return physical_layer;
1640		1640
		1641	printf("hw->phy.type %d\n", hw->phy.type);
1641	switch (hw->phy.type) {	1642	switch (hw->phy.type) {
1642	case ixgbe_phy_sfp_passive_tyco:	1643	case ixgbe_phy_sfp_passive_tyco:
1643	case ixgbe_phy_sfp_passive_unknown:	1644	case ixgbe_phy_sfp_passive_unknown:
Lines 1657-1662 Link Here
1657	IXGBE_SFF_1GBE_COMP_CODES, &comp_codes_1g);	1658	IXGBE_SFF_1GBE_COMP_CODES, &comp_codes_1g);
1658	hw->phy.ops.read_i2c_eeprom(hw,	1659	hw->phy.ops.read_i2c_eeprom(hw,
1659	IXGBE_SFF_10GBE_COMP_CODES, &comp_codes_10g);	1660	IXGBE_SFF_10GBE_COMP_CODES, &comp_codes_10g);
		1661	printf("SFP comp_codes_1g %d\n", comp_codes_1g);
		1662	printf("SFP comp_codes_10g %d\n", comp_codes_10g);
1660	if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)	1663	if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)
1661	physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_SR;	1664	physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_SR;
1662	else if (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)	1665	else if (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)
Lines 1670-1675 Link Here
1670	case ixgbe_phy_qsfp_unknown:	1673	case ixgbe_phy_qsfp_unknown:
1671	hw->phy.ops.read_i2c_eeprom(hw,	1674	hw->phy.ops.read_i2c_eeprom(hw,
1672	IXGBE_SFF_QSFP_10GBE_COMP, &comp_codes_10g);	1675	IXGBE_SFF_QSFP_10GBE_COMP, &comp_codes_10g);
		1676	printf("QSFP comp_codes_10g %d\n", comp_codes_10g);
1673	if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)	1677	if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)
1674	physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_SR;	1678	physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_SR;
1675	else if (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)	1679	else if (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)

Return to bug 150249

Lines 2183-2188 Link Here

(-)sys/dev/ixgbe/ixgbe_82599.c (+7 lines)
2183	physical_layer \|= IXGBE_PHYSICAL_LAYER_1000BASE_T;	2183	physical_layer \|= IXGBE_PHYSICAL_LAYER_1000BASE_T;
2184	if (ext_ability & IXGBE_MDIO_PHY_100BASETX_ABILITY)	2184	if (ext_ability & IXGBE_MDIO_PHY_100BASETX_ABILITY)
2185	physical_layer \|= IXGBE_PHYSICAL_LAYER_100BASE_TX;	2185	physical_layer \|= IXGBE_PHYSICAL_LAYER_100BASE_TX;
		2186	printf("phy.type set physical layer %u\n", physical_layer);
2186	goto out;	2187	goto out;
2187	default:	2188	default:
2188	break;	2189	break;
Lines 2194-2199 Link Here
2194	if (pma_pmd_1g == IXGBE_AUTOC_1G_KX_BX) {	2195	if (pma_pmd_1g == IXGBE_AUTOC_1G_KX_BX) {
2195	physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_KX \|	2196	physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_KX \|
2196	IXGBE_PHYSICAL_LAYER_1000BASE_BX;	2197	IXGBE_PHYSICAL_LAYER_1000BASE_BX;
		2198	printf("autoc_1g set physical layer %u\n", physical_layer);
2197	goto out;	2199	goto out;
2198	} else	2200	} else
2199	/* SFI mode so read SFP module */	2201	/* SFI mode so read SFP module */
Lines 2206-2216 Link Here
2206	physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KX4;	2208	physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
2207	else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_XAUI)	2209	else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_XAUI)
2208	physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_XAUI;	2210	physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_XAUI;
		2211	printf("autoc_10g set physical layer %u\n", physical_layer);
2209	goto out;	2212	goto out;
2210	break;	2213	break;
2211	case IXGBE_AUTOC_LMS_10G_SERIAL:	2214	case IXGBE_AUTOC_LMS_10G_SERIAL:
2212	if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_KR) {	2215	if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_KR) {
2213	physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KR;	2216	physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KR;
		2217	printf("autoc_10g_serial set physical layer %u\n", physical_layer);
2214	goto out;	2218	goto out;
2215	} else if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_SFI)	2219	} else if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_SFI)
2216	goto sfp_check;	2220	goto sfp_check;
Lines 2223-2231 Link Here
2223	physical_layer \|= IXGBE_PHYSICAL_LAYER_10GBASE_KX4;	2227	physical_layer \|= IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
2224	if (autoc & IXGBE_AUTOC_KR_SUPP)	2228	if (autoc & IXGBE_AUTOC_KR_SUPP)
2225	physical_layer \|= IXGBE_PHYSICAL_LAYER_10GBASE_KR;	2229	physical_layer \|= IXGBE_PHYSICAL_LAYER_10GBASE_KR;
		2230	printf("autoc_LMS set physical layer %u\n", physical_layer);
2226	goto out;	2231	goto out;
2227	break;	2232	break;
2228	default:	2233	default:
		2234	printf("Unable to set physical layer %u\n", physical_layer);
2229	goto out;	2235	goto out;
2230	break;	2236	break;
2231	}	2237	}
Lines 2235-2240 Link Here
2235	* test KR mode - we need to id KR mode correctly before SFP module.	2241	* test KR mode - we need to id KR mode correctly before SFP module.
2236	* Call identify_sfp because the pluggable module may have changed */	2242	* Call identify_sfp because the pluggable module may have changed */
2237	physical_layer = ixgbe_get_supported_phy_sfp_layer_generic(hw);	2243	physical_layer = ixgbe_get_supported_phy_sfp_layer_generic(hw);
		2244	printf("phy_sfp_layer set physical layer %u\n", physical_layer);
2238	out:	2245	out:
2239	return physical_layer;	2246	return physical_layer;
2240	}	2247	}