From nobody Tue Jun 16 06:24:51 2026 Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 008A518BC3B for ; Fri, 17 Apr 2026 02:36:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776393372; cv=none; b=mIAVWPHOvj1dXcwvt93CawK/sk4160mmRTk/Bb91JEpNGaEuUNuTptDIkG7060CA8gz36+m7Y6KfK5sGjDf/CBIsYC+AYtgI2MsXqafj7U75ZU5T6S7QW3q0zxDCNXL/SNm8rhR8KSS/qmv48Jd4oopTV7qAr5/hs7lom/Fls7I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776393372; c=relaxed/simple; bh=VeKDihqhlOCIhst3RPegrgi+QOHxHhPbR2wfKOfov+s=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=KQDACz3NzHxON/oIk1BFyO56iEIBBHc50XtkY7rcthQzn/qnPaI8i2bVEEwZs+9wJzhXCxWeK5L/7ZoZAoYjKOA41cGUN+x/RvhZoPL8lKGKGFJNLCkMmz+ef6UvoZIrKWw4rDLXmYJpzpRS/7Fv9Oke3RO2JKJT5TKOidhcBbo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WL77VqXY; arc=none smtp.client-ip=209.85.210.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WL77VqXY" Received: by mail-ot1-f47.google.com with SMTP id 46e09a7af769-7dbce74e537so194240a34.1 for ; Thu, 16 Apr 2026 19:36:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776393370; x=1776998170; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=6SHyQChDMp2FfJSL1Jb4vIVb/ftlOjma1SC6BeaD5Lg=; b=WL77VqXYvR5btZd6JT81Vb8XLnH/hbZDW37EFyyVA0+QffgjKSZUKV7ENVmoEeh/LK 5Z5uOSWDjW5T4WFCF/Edhy3lyuLbaZBmcyqLRK1TeGIzIPmjNHGegFYb7yQFH5u4EP/e 9ByNUSeLZzXEuBIAdOqlJrlBjPsiMWmPsYPpjPBZjZflgQB1KOMgv7Ux/cjY07eDoXNU dIdVaWEQEyQlHTmwBECKfmqpWq0bjC87eh2enXFHzyscgkO+tzAH95iOQC30M8Np2TMZ 5nt9GJKBhWmOnuzgPyxFlqHT2SDo87PKDih2Kx0Vu7uRVFoblkCWYEA05nGmUqcHWp/V PobA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776393370; x=1776998170; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6SHyQChDMp2FfJSL1Jb4vIVb/ftlOjma1SC6BeaD5Lg=; b=K821W3vtcO91M87TW00NSd5joHoE7ksJgLoekLe9+yb6eObAogLgW9pqQOnljhWaf1 k3ryLnSrKVMAiYqNtuu2hoG4PvyX8tzFUZAmg1FHcbm5drod7VwoufsNP5d3oXQ0majr Wd/CQ0LINFdakgLYDfJ+AbgkgekshqpIi+OlRLEB2hUt4dEwyF2ntva3Rpgwf5JkXa6T 5qhObAjm7iod9mnAZ1i/XEJIZ5qAMS7qF46kqfXpctWYRKlfXH3R/Tf903rosi0JiCT9 xSY2htDASbcLtkPYvbqgve7BiR/KTM75KkJsfcFeZFg558Fiz5czN+rj9OLvD5QhKvoA XQGg== X-Forwarded-Encrypted: i=1; AFNElJ9Ijmy0oXXRbHPHBlhjb74OjWDblgVlyHBR95iD5lR6qBtL+ljM4Tz47FviB0w0X65Sp5DHdFzPOj0f10U=@vger.kernel.org X-Gm-Message-State: AOJu0Yxk+bjpzGotNA+B/wc8vwk3FxT+kWWoXNzwXkM5QE5tV3WiXQuk /fqbQVcsDBXUaQ30aqrfC1/eaVLRzRMAvYADHTMbsEu4qcDa8dHNPBTm X-Gm-Gg: AeBDietdTLuV4Bf8wgUrLM6iMdeg5yCjRod7sDQTjyEHbMMJuTH8p0hiajgZiMvuFkE osQRZqWY84YN8snxQ1feNkUdjWewnZREsnbEYBe3c+17iRWMvdxvG+wlcfY83EYuWh4aSFdHrcM 9yem62odu8JXZe3X9FJnYyohnXKaRdvqo8vYr5qUEw+gLujrYvLeBOmNfQt0jv2aJgJ/dGIu7cK LA4hLPLOYpZXlaYOqivkER8yUEcTD8GAU/hiu6hoN6frTW7NdldvhcWGzdlZ6IVbTVyZEMjqamX gKdR/+xmH9ZSLuYPNnaNBWCQFv0/oO49vBRdZ0Nq3hGg4T0b76jASq25bBSz+PAQ3oa9EPUbuDi XPrAGTK83MqZaRh5Y8CStLN9wREuY/ns1dy5QMCYDTNTm7jDTwudt1UOrc6HMqx+GdbtMdwARv6 fhBDHI7Oj5TftlPna+488Z4Ik5BNLSGGjIj9Pgh6YI3TJHHPldKiuNRCaIQF8a6hAImL7P X-Received: by 2002:a05:6830:6d2e:b0:7d7:cde1:5440 with SMTP id 46e09a7af769-7dc951c7541mr742358a34.18.1776393369920; Thu, 16 Apr 2026 19:36:09 -0700 (PDT) Received: from linuxescape.lan (23-88-128-2.fttp.usinternet.com. [23.88.128.2]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7dc97519090sm142802a34.10.2026.04.16.19.36.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Apr 2026 19:36:09 -0700 (PDT) From: Maxwell Doose To: tsbogend@alpha.franken.de Cc: gregkh@linuxfoundation.org, linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Subject: [PATCH] mips: cavium-octeon: remove cmd queue state and related typedefs Date: Thu, 16 Apr 2026 21:36:02 -0500 Message-ID: <20260417023602.112359-1-m32285159@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This change removes the cmd queue state typedefs to work towards the "code cleanup" task in the staging's TODO, and aligns the codebase further = with the Linux Kernel Code Style. The following structs are affected: - __cvmx_cmd_queue_state_t (now struct __cvmx_cmd_queue_state) - __cvmx_cmd_queue_all_state_t (now struct __cvmx_cmd_queue_all_state) In addition, the global exported pointer __cvmx_cmd_queue_state_ptr has also been updated to use the new names, and its extern statement in cvmx-cmd-queue.h has been moved to the top of the file to satisfy the requirements for EXPORT_SYMBOL_GPL. Signed-off-by: Maxwell Doose --- note: This patch is a part of a continued effort to remove abiguous typedefs across the cavium-octeon/octeon codebase. .../cavium-octeon/executive/cvmx-cmd-queue.c | 8 ++--- arch/mips/include/asm/octeon/cvmx-cmd-queue.h | 32 +++++++++++-------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c b/arch/mips= /cavium-octeon/executive/cvmx-cmd-queue.c index 042a6bc44b5c..4cf4060df48c 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c +++ b/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c @@ -46,7 +46,7 @@ * This application uses this pointer to access the global queue * state. It points to a bootmem named block. */ -__cvmx_cmd_queue_all_state_t *__cvmx_cmd_queue_state_ptr; +struct __cvmx_cmd_queue_all_state *__cvmx_cmd_queue_state_ptr; EXPORT_SYMBOL_GPL(__cvmx_cmd_queue_state_ptr); =20 /* @@ -109,7 +109,7 @@ cvmx_cmd_queue_result_t cvmx_cmd_queue_initialize(cvmx_= cmd_queue_id_t queue_id, int max_depth, int fpa_pool, int pool_size) { - __cvmx_cmd_queue_state_t *qstate; + struct __cvmx_cmd_queue_state *qstate; cvmx_cmd_queue_result_t result =3D __cvmx_cmd_queue_init_state_ptr(); if (result !=3D CVMX_CMD_QUEUE_SUCCESS) return result; @@ -202,7 +202,7 @@ cvmx_cmd_queue_result_t cvmx_cmd_queue_initialize(cvmx_= cmd_queue_id_t queue_id, */ cvmx_cmd_queue_result_t cvmx_cmd_queue_shutdown(cvmx_cmd_queue_id_t queue_= id) { - __cvmx_cmd_queue_state_t *qptr =3D __cvmx_cmd_queue_get_state(queue_id); + struct __cvmx_cmd_queue_state *qptr =3D __cvmx_cmd_queue_get_state(queue_= id); if (qptr =3D=3D NULL) { cvmx_dprintf("ERROR: cvmx_cmd_queue_shutdown: Unable to " "get queue information.\n"); @@ -295,7 +295,7 @@ int cvmx_cmd_queue_length(cvmx_cmd_queue_id_t queue_id) */ void *cvmx_cmd_queue_buffer(cvmx_cmd_queue_id_t queue_id) { - __cvmx_cmd_queue_state_t *qptr =3D __cvmx_cmd_queue_get_state(queue_id); + struct __cvmx_cmd_queue_state *qptr =3D __cvmx_cmd_queue_get_state(queue_= id); if (qptr && qptr->base_ptr_div128) return cvmx_phys_to_ptr((uint64_t) qptr->base_ptr_div128 << 7); else diff --git a/arch/mips/include/asm/octeon/cvmx-cmd-queue.h b/arch/mips/incl= ude/asm/octeon/cvmx-cmd-queue.h index 67e1b2162b19..faef98173a4f 100644 --- a/arch/mips/include/asm/octeon/cvmx-cmd-queue.h +++ b/arch/mips/include/asm/octeon/cvmx-cmd-queue.h @@ -71,6 +71,12 @@ * */ =20 +/* Global pointer to the state of command the queues + * Moved here to satisfy requirements in cvmx-cmd-queue.c for EXPORT_SYMBO= L_GPL + */ +extern struct __cvmx_cmd_queue_all_state + *__cvmx_cmd_queue_state_ptr; + #ifndef __CVMX_CMD_QUEUE_H__ #define __CVMX_CMD_QUEUE_H__ =20 @@ -125,7 +131,7 @@ typedef enum { CVMX_CMD_QUEUE_ALREADY_SETUP =3D -4, } cvmx_cmd_queue_result_t; =20 -typedef struct { +struct __cvmx_cmd_queue_state { /* You have lock when this is your ticket */ uint8_t now_serving; uint64_t unused1:24; @@ -140,7 +146,7 @@ typedef struct { uint64_t pool_size_m1:13; /* Number of commands already used in buffer */ uint64_t index:13; -} __cvmx_cmd_queue_state_t; +}; =20 /** * This structure contains the global state of all command queues. @@ -150,10 +156,10 @@ typedef struct { * ll/sc used to get a ticket. If this is not the case, the update * of queue state causes the ll/sc to fail quite often. */ -typedef struct { +struct __cvmx_cmd_queue_all_state { uint64_t ticket[(CVMX_CMD_QUEUE_END >> 16) * 256]; - __cvmx_cmd_queue_state_t state[(CVMX_CMD_QUEUE_END >> 16) * 256]; -} __cvmx_cmd_queue_all_state_t; + struct __cvmx_cmd_queue_state state[(CVMX_CMD_QUEUE_END >> 16) * 256]; +}; =20 /** * Initialize a command queue for use. The initial FPA buffer is @@ -234,10 +240,8 @@ static inline int __cvmx_cmd_queue_get_index(cvmx_cmd_= queue_id_t queue_id) * @qptr: Pointer to the queue's global state */ static inline void __cvmx_cmd_queue_lock(cvmx_cmd_queue_id_t queue_id, - __cvmx_cmd_queue_state_t *qptr) + struct __cvmx_cmd_queue_state *qptr) { - extern __cvmx_cmd_queue_all_state_t - *__cvmx_cmd_queue_state_ptr; int tmp; int my_ticket; prefetch(qptr); @@ -286,7 +290,7 @@ static inline void __cvmx_cmd_queue_lock(cvmx_cmd_queue= _id_t queue_id, * * @qptr: Queue to unlock */ -static inline void __cvmx_cmd_queue_unlock(__cvmx_cmd_queue_state_t *qptr) +static inline void __cvmx_cmd_queue_unlock(struct __cvmx_cmd_queue_state *= qptr) { qptr->now_serving++; CVMX_SYNCWS; @@ -299,10 +303,10 @@ static inline void __cvmx_cmd_queue_unlock(__cvmx_cmd= _queue_state_t *qptr) * * Returns Queue structure or NULL on failure */ -static inline __cvmx_cmd_queue_state_t +static inline struct __cvmx_cmd_queue_state *__cvmx_cmd_queue_get_state(cvmx_cmd_queue_id_t queue_id) { - extern __cvmx_cmd_queue_all_state_t + extern struct __cvmx_cmd_queue_all_state *__cvmx_cmd_queue_state_ptr; return &__cvmx_cmd_queue_state_ptr-> state[__cvmx_cmd_queue_get_index(queue_id)]; @@ -329,7 +333,7 @@ static inline cvmx_cmd_queue_result_t cvmx_cmd_queue_wr= ite(cvmx_cmd_queue_id_t int cmd_count, uint64_t *cmds) { - __cvmx_cmd_queue_state_t *qptr =3D __cvmx_cmd_queue_get_state(queue_id); + struct __cvmx_cmd_queue_state *qptr =3D __cvmx_cmd_queue_get_state(queue_= id); =20 /* Make sure nobody else is updating the same queue */ if (likely(use_locking)) @@ -427,7 +431,7 @@ static inline cvmx_cmd_queue_result_t cvmx_cmd_queue_wr= ite2(cvmx_cmd_queue_id_t uint64_t cmd1, uint64_t cmd2) { - __cvmx_cmd_queue_state_t *qptr =3D __cvmx_cmd_queue_get_state(queue_id); + struct __cvmx_cmd_queue_state *qptr =3D __cvmx_cmd_queue_get_state(queue_= id); =20 /* Make sure nobody else is updating the same queue */ if (likely(use_locking)) @@ -528,7 +532,7 @@ static inline cvmx_cmd_queue_result_t cvmx_cmd_queue_wr= ite3(cvmx_cmd_queue_id_t uint64_t cmd2, uint64_t cmd3) { - __cvmx_cmd_queue_state_t *qptr =3D __cvmx_cmd_queue_get_state(queue_id); + struct __cvmx_cmd_queue_state *qptr =3D __cvmx_cmd_queue_get_state(queue_= id); =20 /* Make sure nobody else is updating the same queue */ if (likely(use_locking)) --=20 2.53.0