From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Cc: Aaron Williams <awilliams@marvell.com>, Stefan Roese <sr@denx.de>
Subject: [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue
Date: Thu, 13 Jul 2023 20:37:32 -0400 [thread overview]
Message-ID: <20230714003736.3512509-1-trini@konsulko.com> (raw)
When building with gcc-13.1 we see that the prototype for
cvmx_pko3_sq_config_children does not match the declaration. Make these
match and correct a typo in the function's version of the docs that the
prototype did not have, as part of keeping those in-sync.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Aaron Williams <awilliams@marvell.com>
Cc: Stefan Roese <sr@denx.de>
---
arch/mips/mach-octeon/cvmx-pko3-queue.c | 2 +-
.../mips/mach-octeon/include/mach/cvmx-pko3-queue.h | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/arch/mips/mach-octeon/cvmx-pko3-queue.c b/arch/mips/mach-octeon/cvmx-pko3-queue.c
index e28afdf8dd9d..53f2e4dd1861 100644
--- a/arch/mips/mach-octeon/cvmx-pko3-queue.c
+++ b/arch/mips/mach-octeon/cvmx-pko3-queue.c
@@ -761,7 +761,7 @@ int cvmx_pko3_pq_config(unsigned int node, unsigned int mac_num,
* The Scheduler Queues in Levels 3 to 5 and Descriptor Queues are
* configured one-to-one or many-to-one to a single parent Scheduler
* Queues. The level of the parent SQ is specified in an argument,
- * as well as the number of childer to attach to the specific parent.
+ * as well as the number of children to attach to the specific parent.
* The children can have fair round-robin or priority-based scheduling
* when multiple children are assigned a single parent.
*
diff --git a/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h b/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h
index b3f61d75f225..3931191fe20f 100644
--- a/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h
+++ b/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h
@@ -6,6 +6,8 @@
#ifndef __CVMX_PKO3_QUEUE_H__
#define __CVMX_PKO3_QUEUE_H__
+enum cvmx_pko3_level_e;
+
/**
* @INTERNAL
*
@@ -46,11 +48,10 @@ int cvmx_pko3_get_port_queue(int xiface, int index);
* The children can have fair round-robin or priority-based scheduling
* when multiple children are assigned a single parent.
*
- * @param node is the OCI node location for the queues to be configured
- * @param parent_level is the level of the parent queue, 2 to 5.
+ * @param node on which to operate
+ * @param child_level is the level of the child queue
* @param parent_queue is the number of the parent Scheduler Queue
* @param child_base is the number of the first child SQ or DQ to assign to
- * @param parent
* @param child_count is the number of consecutive children to assign
* @param stat_prio_count is the priority setting for the children L2 SQs
*
@@ -65,8 +66,10 @@ int cvmx_pko3_get_port_queue(int xiface, int index);
*
* Note: this function supports the configuration of node-local unit.
*/
-int cvmx_pko3_sq_config_children(unsigned int node, unsigned int parent_level,
- unsigned int parent_queue, unsigned int child_base,
+int cvmx_pko3_sq_config_children(unsigned int node,
+ enum cvmx_pko3_level_e child_level,
+ unsigned int parent_queue,
+ unsigned int child_base,
unsigned int child_count, int stat_prio_count);
/*
--
2.34.1
next reply other threads:[~2023-07-14 0:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-14 0:37 Tom Rini [this message]
2023-07-14 0:37 ` [PATCH 2/5] arm: mx5: Correct mxc_set_clock function prototype Tom Rini
2023-07-21 1:30 ` Tom Rini
2023-07-14 0:37 ` [PATCH 3/5] spl: Correct spl_board_boot_device " Tom Rini
2023-07-15 23:40 ` Simon Glass
2023-07-21 1:30 ` Tom Rini
2023-07-14 0:37 ` [PATCH 4/5] CI: Update to gcc-13.1.0 Tom Rini
2023-07-14 13:52 ` Alexey Brodkin
2023-07-14 14:13 ` Tom Rini
2023-07-15 23:40 ` Simon Glass
2023-07-21 1:30 ` Tom Rini
2023-07-14 0:37 ` [PATCH 5/5] CI: Update to the latest "Jammy" tag Tom Rini
2023-07-15 23:40 ` Simon Glass
2023-07-21 1:30 ` Tom Rini
2023-07-21 1:30 ` [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230714003736.3512509-1-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=awilliams@marvell.com \
--cc=sr@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox