patch 'doc: fix event timer adapter guide' has been queued to stable release 20.11.7

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/19/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/ee9f2135b591690dddd9b4f7de6530ff67750548

Thanks.

Luca Boccassi

---
>From ee9f2135b591690dddd9b4f7de6530ff67750548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= <mattias.ronnblom at ericsson.com>
Date: Fri, 4 Nov 2022 07:52:37 +0100
Subject: [PATCH] doc: fix event timer adapter guide
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 4109d71e5211e107e0524c40f77bccc32af7a3d8 ]

In the example:
* Properly initialize the socket id field.
* Remove comments redundant and/or not consistent with the code. 180
  seconds is not 2 minutes.
* Remove redundant pointer initialization.

In both the example and text, the flags field of the conf struct was
erroneously referred to as timer_adapter_flags and the max_tmo_ns
field as max_tmo_nsec.

Fixes: 30e7fbd62839 ("doc: add event timer adapter guide")

Signed-off-by: Mattias Rönnblom <mattias.ronnblom at ericsson.com>
Acked-by: Erik Gabriel Carrillo <erik.g.carrillo at intel.com>
---
 doc/guides/prog_guide/event_timer_adapter.rst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/guides/prog_guide/event_timer_adapter.rst b/doc/guides/prog_guide/event_timer_adapter.rst
index a95efbe0d8..5364db1ed6 100644
--- a/doc/guides/prog_guide/event_timer_adapter.rst
+++ b/doc/guides/prog_guide/event_timer_adapter.rst
@@ -107,18 +107,19 @@ to ``rte_event_timer_adapter_create()``.
 
 .. code-block:: c
 
-	#define NSECPERSEC 1E9 // No of ns in 1 sec
+	#define NSECPERSEC 1E9
 	const struct rte_event_timer_adapter_conf adapter_config = {
                 .event_dev_id = event_dev_id,
                 .timer_adapter_id = 0,
+		.socket_id = rte_socket_id(),
                 .clk_src = RTE_EVENT_TIMER_ADAPTER_CPU_CLK,
-                .timer_tick_ns = NSECPERSEC / 10, // 100 milliseconds
-                .max_tmo_nsec = 180 * NSECPERSEC // 2 minutes
+                .timer_tick_ns = NSECPERSEC / 10,
+                .max_tmo_ns = 180 * NSECPERSEC,
                 .nb_timers = 40000,
-                .timer_adapter_flags = 0,
+                .flags = 0,
 	};
 
-	struct rte_event_timer_adapter *adapter = NULL;
+	struct rte_event_timer_adapter *adapter;
 	adapter = rte_event_timer_adapter_create(&adapter_config);
 
 	if (adapter == NULL) { ... };
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-17 23:07:56.558250105 +0000
+++ 0025-doc-fix-event-timer-adapter-guide.patch	2022-11-17 23:07:55.532331268 +0000
@@ -1 +1 @@
-From 4109d71e5211e107e0524c40f77bccc32af7a3d8 Mon Sep 17 00:00:00 2001
+From ee9f2135b591690dddd9b4f7de6530ff67750548 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 4109d71e5211e107e0524c40f77bccc32af7a3d8 ]
+
@@ -20 +21,0 @@
-Cc: stable at dpdk.org
@@ -25,2 +26,2 @@
- doc/guides/prog_guide/event_timer_adapter.rst | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
+ doc/guides/prog_guide/event_timer_adapter.rst | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
@@ -29 +30 @@
-index 7547059a05..d7307a29bb 100644
+index a95efbe0d8..5364db1ed6 100644
@@ -57,12 +57,0 @@
-@@ -145,9 +146,9 @@ to support timers of the respective type. A periodic timer expires at a fixed
- time interval repeatedly till it is cancelled. A non-periodic timer expires only
- once. The periodic capability flag, ``RTE_EVENT_TIMER_ADAPTER_CAP_PERIODIC``,
- can be set for implementations that support periodic mode if desired. To
--configure an adapter in periodic mode, ``timer_adapter_flags`` of
-+configure an adapter in periodic mode, ``flags`` of
- ``rte_event_timer_adapter_conf`` is set to include the periodic flag
--``RTE_EVENT_TIMER_ADAPTER_F_PERIODIC``. Maximum timeout (``max_tmo_nsec``) does
-+``RTE_EVENT_TIMER_ADAPTER_F_PERIODIC``. Maximum timeout (``max_tmo_ns``) does
- not apply to periodic mode.
- 
- Retrieve Event Timer Adapter Contextual Information