From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E3CCCC0015E for ; Fri, 14 Jul 2023 00:37:49 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8593886C03; Fri, 14 Jul 2023 02:37:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="mAVxmRos"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 886CE86B35; Fri, 14 Jul 2023 02:37:42 +0200 (CEST) Received: from mail-yw1-x112a.google.com (mail-yw1-x112a.google.com [IPv6:2607:f8b0:4864:20::112a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4A02C86C03 for ; Fri, 14 Jul 2023 02:37:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yw1-x112a.google.com with SMTP id 00721157ae682-579ef51428eso12506807b3.2 for ; Thu, 13 Jul 2023 17:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1689295058; x=1691887058; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=FT9VKh9hBZikkU1Q9IUkGE6ZIJxqQL4SPY/IK4+xo3g=; b=mAVxmRosxJp+1yCIPdwmJDf/bA8hamJ+GM0A5uOfqzVuLsaxszOMHS/iXMCNlAymRJ StPq64zgj6OH/pf4VoPyfvbxXryM5skM5PYwAAKuleyUSAhdiBbZiejw6J8EVk6bEkhX OqcvE/F/SfqR83dcNA6epTUydQLHEp30coKFk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689295058; x=1691887058; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FT9VKh9hBZikkU1Q9IUkGE6ZIJxqQL4SPY/IK4+xo3g=; b=kX0zfumeYccnWaQLHlTvktUa34LU3QoQG72Z4Fh1XGURFWPzucz4Kh3myIZa1S12XE t5BhobKfUysGUYQNGXywK77LcaCewu5ySOb7zI7S40HeqF7lbR47bEzZ16eCExXZ8qUX fbRA0msD/dp/qAld9m1dtJscAZWMTe56nPETYtuAXRgVlQiwsE+W1sfZOZXG+xWVko+j 6hegR2Cldim1z+5ZWt9kNCjCMDCsZYDqhz4imiYMjJgKe5xyCjkeD4Chb/eI1Z6wajXY 6bmvxE5KUMXzmIjt2mEkjcosl+GycBUTPFGFX43TcN5hn1gQUO7Ea/q5nSzFMaIHdUfJ D25g== X-Gm-Message-State: ABy/qLYYTm3VLSqCHpnBc+QfuQXfMLWWe8x/InLQTd9SevpKB0KyYlRf EafwyRcv3oeiuk/AVk36QswEf7gkFytnUfqd3LEp7g== X-Google-Smtp-Source: APBJJlEH4rW7H5Fi7avzRjzMf/etg1ZKWgH1u4cbMaTMHQ/Fjk8eiEP3vUs8Z3k+/h61bapSmmOCCg== X-Received: by 2002:a81:7b8a:0:b0:577:31f5:6793 with SMTP id w132-20020a817b8a000000b0057731f56793mr3150779ywc.45.1689295057830; Thu, 13 Jul 2023 17:37:37 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-cb70-e592-de93-e6d2.res6.spectrum.com. [2603:6081:7b00:6400:cb70:e592:de93:e6d2]) by smtp.gmail.com with ESMTPSA id y7-20020a0dd607000000b005616d72f435sm2036552ywd.116.2023.07.13.17.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 17:37:37 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Aaron Williams , Stefan Roese Subject: [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue Date: Thu, 13 Jul 2023 20:37:32 -0400 Message-Id: <20230714003736.3512509-1-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean 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 --- Cc: Aaron Williams Cc: Stefan Roese --- 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