| Message ID | 20210712130631.38153-3-alexandru.tachici@analog.com (mailing list archive) |
|---|---|
| State | Deferred |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: phy: adin1100: Add initial support for ADIN1100 industrial PHY | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 7 maintainers not CCed: petr.vorel@gmail.com george.mccollister@gmail.com shenjian15@huawei.com idosch@nvidia.com dmurphy@ti.com danieller@nvidia.com alobakin@pm.me |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | fail | Errors and warnings before: 2153 this patch: 2171 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | warning | CHECK: Alignment should match open parenthesis |
| netdev/build_allmodconfig_warn | fail | Errors and warnings before: 2142 this patch: 2158 |
| netdev/header_inline | success | Link |
diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c index fd9c83ce10fc..a82e7457bda2 100644 --- a/drivers/net/phy/phy-core.c +++ b/drivers/net/phy/phy-core.c @@ -13,7 +13,7 @@ */ const char *phy_speed_to_str(int speed) { - BUILD_BUG_ON_MSG(__ETHTOOL_LINK_MODE_MASK_NBITS != 94, + BUILD_BUG_ON_MSG(__ETHTOOL_LINK_MODE_MASK_NBITS != 96, "Enum ethtool_link_mode_bit_indices and phylib are out of sync. " "If a speed or mode has been added please update phy_speed_to_str " "and the PHY settings array.\n"); diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 8a905466d7dc..748d7a01e4e9 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -1661,6 +1661,8 @@ enum ethtool_link_mode_bit_indices { ETHTOOL_LINK_MODE_100baseFX_Full_BIT = 91, ETHTOOL_LINK_MODE_10baseT1L_Half_BIT = 92, ETHTOOL_LINK_MODE_10baseT1L_Full_BIT = 93, + ETHTOOL_LINK_MODE_2400mv_BIT = 94, + ETHTOOL_LINK_MODE_1000mv_BIT = 95, /* must be last entry */ __ETHTOOL_LINK_MODE_MASK_NBITS }; diff --git a/net/ethtool/common.c b/net/ethtool/common.c index 5b93d888fd83..c0110a4b3392 100644 --- a/net/ethtool/common.c +++ b/net/ethtool/common.c @@ -201,6 +201,8 @@ const char link_mode_names[][ETH_GSTRING_LEN] = { __DEFINE_LINK_MODE_NAME(100, FX, Full), __DEFINE_LINK_MODE_NAME(10, T1L, Half), __DEFINE_LINK_MODE_NAME(10, T1L, Full), + __DEFINE_SPECIAL_MODE_NAME(2400mv, "2400mv"), + __DEFINE_SPECIAL_MODE_NAME(1000mv, "1000mv"), }; static_assert(ARRAY_SIZE(link_mode_names) == __ETHTOOL_LINK_MODE_MASK_NBITS); @@ -349,6 +351,8 @@ const struct link_mode_info link_mode_params[] = { __DEFINE_LINK_MODE_PARAMS(400000, CR4, Full), __DEFINE_LINK_MODE_PARAMS(100, FX, Half), __DEFINE_LINK_MODE_PARAMS(100, FX, Full), + __DEFINE_SPECIAL_MODE_PARAMS(2400mv), + __DEFINE_SPECIAL_MODE_PARAMS(1000mv), }; static_assert(ARRAY_SIZE(link_mode_params) == __ETHTOOL_LINK_MODE_MASK_NBITS);