Message ID | 1637682437-31407-1-git-send-email-rahul.lakkireddy@chelsio.com (mailing list archive) |
---|---|
State | Accepted |
Commit | e670e1e86beb82a6eef0d9b451829a32cfa23c81 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] cxgb4: allow reading unrecognized port module eeprom | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Tue, 23 Nov 2021 21:17:17 +0530 you wrote: > Even if firmware fails to recognize the plugged-in port module type, > allow reading port module EEPROM anyway. This helps in obtaining > necessary diagnostics information for debugging and analysis. > > Signed-off-by: Manoj Malviya <manojmalviya@chelsio.com> > Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com> > > [...] Here is the summary with links: - [net-next] cxgb4: allow reading unrecognized port module eeprom https://git.kernel.org/netdev/net-next/c/e670e1e86beb You are awesome, thank you!
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c index 0e4ec4079741..6c790af92170 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c @@ -1993,6 +1993,15 @@ static int get_dump_data(struct net_device *dev, struct ethtool_dump *eth_dump, return 0; } +static bool cxgb4_fw_mod_type_info_available(unsigned int fw_mod_type) +{ + /* Read port module EEPROM as long as it is plugged-in and + * safe to read. + */ + return (fw_mod_type != FW_PORT_MOD_TYPE_NONE && + fw_mod_type != FW_PORT_MOD_TYPE_ERROR); +} + static int cxgb4_get_module_info(struct net_device *dev, struct ethtool_modinfo *modinfo) { @@ -2001,7 +2010,7 @@ static int cxgb4_get_module_info(struct net_device *dev, struct adapter *adapter = pi->adapter; int ret; - if (!t4_is_inserted_mod_type(pi->mod_type)) + if (!cxgb4_fw_mod_type_info_available(pi->mod_type)) return -EINVAL; switch (pi->port_type) {