5 files changed, 33 insertions, 2 deletions

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index bcbe07ec22be..6ee6de7f0160 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -122,6 +122,12 @@ void *mlxsw_core_driver_priv(struct mlxsw_core *mlxsw_core)
 }
 EXPORT_SYMBOL(mlxsw_core_driver_priv);
 
+bool mlxsw_core_res_query_enabled(const struct mlxsw_core *mlxsw_core)
+{
+        return mlxsw_core->driver->res_query_enabled;
+}
+EXPORT_SYMBOL(mlxsw_core_res_query_enabled);
+
 struct mlxsw_rx_listener_item {
         struct list_head list;
         struct mlxsw_rx_listener rxl;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h
index 917be621c904..e3832cb5bdda 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.h
@@ -28,6 +28,8 @@ unsigned int mlxsw_core_max_ports(const struct mlxsw_core *mlxsw_core);
 
 void *mlxsw_core_driver_priv(struct mlxsw_core *mlxsw_core);
 
+bool mlxsw_core_res_query_enabled(const struct mlxsw_core *mlxsw_core);
+
 int mlxsw_core_driver_register(struct mlxsw_driver *mlxsw_driver);
 void mlxsw_core_driver_unregister(struct mlxsw_driver *mlxsw_driver);
 
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.c b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
index c1c1965d7acc..72539a9a3847 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_env.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
@@ -3,6 +3,7 @@
 
 #include <linux/kernel.h>
 #include <linux/err.h>
+#include <linux/sfp.h>
 
 #include "core.h"
 #include "core_env.h"
@@ -162,7 +163,7 @@ int mlxsw_env_get_module_info(struct mlxsw_core *mlxsw_core, int module,
 {
         u8 module_info[MLXSW_REG_MCIA_EEPROM_MODULE_INFO_SIZE];
         u16 offset = MLXSW_REG_MCIA_EEPROM_MODULE_INFO_SIZE;
-        u8 module_rev_id, module_id;
+        u8 module_rev_id, module_id, diag_mon;
         unsigned int read_size;
         int err;
 
@@ -195,8 +196,21 @@ int mlxsw_env_get_module_info(struct mlxsw_core *mlxsw_core, int module,
                 }
                 break;
         case MLXSW_REG_MCIA_EEPROM_MODULE_INFO_ID_SFP:
+                /* Verify if transceiver provides diagnostic monitoring page */
+                err = mlxsw_env_query_module_eeprom(mlxsw_core, module,
+                                                    SFP_DIAGMON, 1, &diag_mon,
+                                                    &read_size);
+                if (err)
+                        return err;
+
+                if (read_size < 1)
+                        return -EIO;
+
                 modinfo->type       = ETH_MODULE_SFF_8472;
-                modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN;
+                if (diag_mon)
+                        modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN;
+                else
+                        modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN / 2;
                 break;
         default:
                 return -EINVAL;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c b/drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c
index 6956bbebe2f1..496dc904c5ed 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c
@@ -518,6 +518,9 @@ static int mlxsw_hwmon_module_init(struct mlxsw_hwmon *mlxsw_hwmon)
         u8 width;
         int err;
 
+        if (!mlxsw_core_res_query_enabled(mlxsw_hwmon->core))
+                return 0;
+
         /* Add extra attributes for module temperature. Sensor index is
          * assigned to sensor_count value, while all indexed before
          * sensor_count are already utilized by the sensors connected through
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
index 472f63f9fac5..d3e851e7ca72 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
@@ -740,6 +740,9 @@ mlxsw_thermal_modules_init(struct device *dev, struct mlxsw_core *core,
         struct mlxsw_thermal_module *module_tz;
         int i, err;
 
+        if (!mlxsw_core_res_query_enabled(core))
+                return 0;
+
         thermal->tz_module_arr = kcalloc(module_count,
                                          sizeof(*thermal->tz_module_arr),
                                          GFP_KERNEL);
@@ -776,6 +779,9 @@ mlxsw_thermal_modules_fini(struct mlxsw_thermal *thermal)
         unsigned int module_count = mlxsw_core_max_ports(thermal->core);
         int i;
 
+        if (!mlxsw_core_res_query_enabled(thermal->core))
+                return;
+
         for (i = module_count - 1; i >= 0; i--)
                 mlxsw_thermal_module_fini(&thermal->tz_module_arr[i]);
         kfree(thermal->tz_module_arr);