eal: rename power monitor condition member

The `data_sz` name is fine, but it looks out of place because nothing
else has "data" prefix in that structure. Rename it to "size", as well
as add more clarity to the comments around each struct member.

Fixes: 6a17919b0e2a ("eal: change power intrinsics API")

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>

diff --git a/drivers/event/dlb/dlb.c b/drivers/event/dlb/dlb.c
index d2f2026..a65f708 100644 (file)
--- a/drivers/event/dlb/dlb.c
+++ b/drivers/event/dlb/dlb.c
@@ -3185,7 +3185,7 @@ dlb_dequeue_wait(struct dlb_eventdev *dlb,
                pmc.addr = monitor_addr;
                pmc.val = expected_value;
                pmc.mask = qe_mask.raw_qe[1];
-               pmc.data_sz = sizeof(uint64_t);
+               pmc.size = sizeof(uint64_t);
 
                rte_power_monitor(&pmc, timeout + start_ticks);
 

diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c
index c9a8a02..5782960 100644 (file)
--- a/drivers/event/dlb2/dlb2.c
+++ b/drivers/event/dlb2/dlb2.c
@@ -2894,7 +2894,7 @@ dlb2_dequeue_wait(struct dlb2_eventdev *dlb2,
                pmc.addr = monitor_addr;
                pmc.val = expected_value;
                pmc.mask = qe_mask.raw_qe[1];
-               pmc.data_sz = sizeof(uint64_t);
+               pmc.size = sizeof(uint64_t);
 
                rte_power_monitor(&pmc, timeout + start_ticks);
 

diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 89560d4..668edd6 100644 (file)
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -92,7 +92,7 @@ i40e_get_monitor_addr(void *rx_queue, struct rte_power_monitor_cond *pmc)
        pmc->mask = rte_cpu_to_le_64(1 << I40E_RX_DESC_STATUS_DD_SHIFT);
 
        /* registers are 64-bit */
-       pmc->data_sz = sizeof(uint64_t);
+       pmc->size = sizeof(uint64_t);
 
        return 0;
 }

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 7286e3a..69f9945 100644 (file)
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -46,7 +46,7 @@ ice_get_monitor_addr(void *rx_queue, struct rte_power_monitor_cond *pmc)
        pmc->mask = rte_cpu_to_le_16(1 << ICE_RX_FLEX_DESC_STATUS0_DD_S);
 
        /* register is 16-bit */
-       pmc->data_sz = sizeof(uint16_t);
+       pmc->size = sizeof(uint16_t);
 
        return 0;
 }

diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index cc8f70e..c0305a8 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -1389,7 +1389,7 @@ ixgbe_get_monitor_addr(void *rx_queue, struct rte_power_monitor_cond *pmc)
        pmc->mask = rte_cpu_to_le_32(IXGBE_RXDADV_STAT_DD);
 
        /* the registers are 32-bit */
-       pmc->data_sz = sizeof(uint32_t);
+       pmc->size = sizeof(uint32_t);
 
        return 0;
 }

diff --git a/lib/librte_eal/include/generic/rte_power_intrinsics.h b/lib/librte_eal/include/generic/rte_power_intrinsics.h
index 6109d28..5960c48 100644 (file)
--- a/lib/librte_eal/include/generic/rte_power_intrinsics.h
+++ b/lib/librte_eal/include/generic/rte_power_intrinsics.h
@@ -20,14 +20,17 @@
 
 struct rte_power_monitor_cond {
        volatile void *addr;  /**< Address to monitor for changes */
-       uint64_t val;         /**< Before attempting the monitoring, the address
-                              *   may be read and compared against this value.
-                              **/
-       uint64_t mask;   /**< 64-bit mask to extract current value from addr */
-       uint8_t data_sz; /**< Data size (in bytes) that will be used to compare
-                         *   expected value with the memory address. Can be 1,
-                         *   2, 4, or 8. Supplying any other value will lead to
-                         *   undefined result. */
+       uint64_t val;         /**< If the `mask` is non-zero, location pointed
+                              *   to by `addr` will be read and compared
+                              *   against this value.
+                              */
+       uint64_t mask;   /**< 64-bit mask to extract value read from `addr` */
+       uint8_t size;    /**< Data size (in bytes) that will be used to compare
+                         *   expected value (`val`) with data read from the
+                         *   monitored memory location (`addr`). Can be 1, 2,
+                         *   4, or 8. Supplying any other value will result in
+                         *   an error.
+                         */
 };
 
 /**

diff --git a/lib/librte_eal/x86/rte_power_intrinsics.c b/lib/librte_eal/x86/rte_power_intrinsics.c
index af3ae32..39ea9fd 100644 (file)
--- a/lib/librte_eal/x86/rte_power_intrinsics.c
+++ b/lib/librte_eal/x86/rte_power_intrinsics.c
@@ -88,7 +88,7 @@ rte_power_monitor(const struct rte_power_monitor_cond *pmc,
        if (pmc == NULL)
                return -EINVAL;
 
-       if (__check_val_size(pmc->data_sz) < 0)
+       if (__check_val_size(pmc->size) < 0)
                return -EINVAL;
 
        s = &wait_status[lcore_id];
@@ -113,7 +113,7 @@ rte_power_monitor(const struct rte_power_monitor_cond *pmc,
        /* if we have a comparison mask, we might not need to sleep at all */
        if (pmc->mask) {
                const uint64_t cur_value = __get_umwait_val(
-                               pmc->addr, pmc->data_sz);
+                               pmc->addr, pmc->size);
                const uint64_t masked = cur_value & pmc->mask;
 
                /* if the masked value is already matching, abort */