]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: ena: Control PHC enable through devlink
authorDavid Arinzon <darinzon@amazon.com>
Tue, 17 Jun 2025 11:05:42 +0000 (14:05 +0300)
committerJakub Kicinski <kuba@kernel.org>
Thu, 19 Jun 2025 01:57:29 +0000 (18:57 -0700)
Add the capability to set parameters through the devlink framework.

The parameter used for controlling PHC (enable/disable) details
are as follows:
- Name: enable_phc
- Type: Boolean (true - enable/false - disable)
- Mode: DEVLINK_PARAM_CMODE_DRIVERINIT
- Effect: Changes take place during driver initialization,
          any changes require a devlink reload to take effect.

Signed-off-by: David Arinzon <darinzon@amazon.com>
Link: https://patch.msgid.link/20250617110545.5659-7-darinzon@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/amazon/ena/ena_devlink.c
drivers/net/ethernet/amazon/ena/ena_devlink.h
drivers/net/ethernet/amazon/ena/ena_netdev.c
drivers/net/ethernet/amazon/ena/ena_phc.c

index 1aa977a6733d022d1959cc7127451a0753b132cf..ac81c24016dd472d54d37f4de1ad304dae194832 100644 (file)
@@ -5,6 +5,59 @@
 
 #include "linux/pci.h"
 #include "ena_devlink.h"
+#include "ena_phc.h"
+
+static int ena_devlink_enable_phc_validate(struct devlink *devlink, u32 id,
+                                          union devlink_param_value val,
+                                          struct netlink_ext_ack *extack)
+{
+       struct ena_adapter *adapter = ENA_DEVLINK_PRIV(devlink);
+
+       if (!val.vbool)
+               return 0;
+
+       if (!ena_com_phc_supported(adapter->ena_dev)) {
+               NL_SET_ERR_MSG_MOD(extack, "Device doesn't support PHC");
+               return -EOPNOTSUPP;
+       }
+
+       return 0;
+}
+
+static const struct devlink_param ena_devlink_params[] = {
+       DEVLINK_PARAM_GENERIC(ENABLE_PHC,
+                             BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),
+                             NULL,
+                             NULL,
+                             ena_devlink_enable_phc_validate),
+};
+
+void ena_devlink_params_get(struct devlink *devlink)
+{
+       struct ena_adapter *adapter = ENA_DEVLINK_PRIV(devlink);
+       union devlink_param_value val;
+       int err;
+
+       err = devl_param_driverinit_value_get(devlink,
+                                             DEVLINK_PARAM_GENERIC_ID_ENABLE_PHC,
+                                             &val);
+       if (err) {
+               netdev_err(adapter->netdev, "Failed to query PHC param\n");
+               return;
+       }
+
+       ena_phc_enable(adapter, val.vbool);
+}
+
+void ena_devlink_disable_phc_param(struct devlink *devlink)
+{
+       union devlink_param_value value;
+
+       value.vbool = false;
+       devl_param_driverinit_value_set(devlink,
+                                       DEVLINK_PARAM_GENERIC_ID_ENABLE_PHC,
+                                       value);
+}
 
 static void ena_devlink_port_register(struct devlink *devlink)
 {
@@ -79,6 +132,27 @@ static const struct devlink_ops ena_devlink_ops = {
        .reload_up      = ena_devlink_reload_up,
 };
 
+static int ena_devlink_configure_params(struct devlink *devlink)
+{
+       struct ena_adapter *adapter = ENA_DEVLINK_PRIV(devlink);
+       union devlink_param_value value;
+       int rc;
+
+       rc = devlink_params_register(devlink, ena_devlink_params,
+                                    ARRAY_SIZE(ena_devlink_params));
+       if (rc) {
+               netdev_err(adapter->netdev, "Failed to register devlink params\n");
+               return rc;
+       }
+
+       value.vbool = ena_phc_is_enabled(adapter);
+       devl_param_driverinit_value_set(devlink,
+                                       DEVLINK_PARAM_GENERIC_ID_ENABLE_PHC,
+                                       value);
+
+       return 0;
+}
+
 struct devlink *ena_devlink_alloc(struct ena_adapter *adapter)
 {
        struct device *dev = &adapter->pdev->dev;
@@ -96,11 +170,26 @@ struct devlink *ena_devlink_alloc(struct ena_adapter *adapter)
        ENA_DEVLINK_PRIV(devlink) = adapter;
        adapter->devlink = devlink;
 
+       if (ena_devlink_configure_params(devlink))
+               goto free_devlink;
+
        return devlink;
+
+free_devlink:
+       devlink_free(devlink);
+       return NULL;
+}
+
+static void ena_devlink_configure_params_clean(struct devlink *devlink)
+{
+       devlink_params_unregister(devlink, ena_devlink_params,
+                                 ARRAY_SIZE(ena_devlink_params));
 }
 
 void ena_devlink_free(struct devlink *devlink)
 {
+       ena_devlink_configure_params_clean(devlink);
+
        devlink_free(devlink);
 }
 
index cb1a5f21a72e3e9b3325443afb70a855e5a4cc8b..7a19ce4830d914e713761ee101c5c9ddbbfefa25 100644 (file)
@@ -15,5 +15,7 @@ struct devlink *ena_devlink_alloc(struct ena_adapter *adapter);
 void ena_devlink_free(struct devlink *devlink);
 void ena_devlink_register(struct devlink *devlink, struct device *dev);
 void ena_devlink_unregister(struct devlink *devlink);
+void ena_devlink_params_get(struct devlink *devlink);
+void ena_devlink_disable_phc_param(struct devlink *devlink);
 
 #endif /* DEVLINK_H */
index ab88895b874e61f2d68600aa5ca816127032675b..cf1b817bf1e0863090ecb71c338192dc0d963c01 100644 (file)
@@ -3138,6 +3138,8 @@ static int ena_device_init(struct ena_adapter *adapter, struct pci_dev *pdev,
                goto err_mmio_read_less;
        }
 
+       ena_devlink_params_get(adapter->devlink);
+
        /* ENA admin level init */
        rc = ena_com_admin_init(ena_dev, &aenq_handlers);
        if (rc) {
index 5ce9a32d210a476cbe3b4042ec165d640c15577f..7867e893fd15f935ad3becf7cacd7c965313a893 100644 (file)
@@ -6,6 +6,7 @@
 #include <linux/pci.h>
 #include "ena_netdev.h"
 #include "ena_phc.h"
+#include "ena_devlink.h"
 
 static int ena_phc_adjtime(struct ptp_clock_info *clock_info, s64 delta)
 {
@@ -213,6 +214,7 @@ err_ena_com_phc_config:
        ena_com_phc_destroy(ena_dev);
 err_ena_com_phc_init:
        ena_phc_enable(adapter, false);
+       ena_devlink_disable_phc_param(adapter->devlink);
        return rc;
 }