From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from canpmsgout12.his.huawei.com (canpmsgout12.his.huawei.com [113.46.200.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 356DBCA45; Thu, 4 Jun 2026 07:50:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.227 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780559415; cv=none; b=BdE6hChZtjbtPqoq+NA+CMuAYJDaEcVloZnhlQLYU4Whyj4K6VnrlF/odq0zvOFCMc7K0ZEZkc8hN+/a6ZbS6ok4LOMCpFyTvW0+CvLxJVyUkLx4CGbKGDgzX1xBwMtRdq5pGNVzN9YcCb4srhrtNlWOSMZI9vW//QZ5wMn7ZLQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780559415; c=relaxed/simple; bh=Xi6jLInEcETVU5w4SaocDXndF2bqdv5LK+f5Mt49hbc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=n1kZLLcQW1NigutFDqr+ynIF9TVt5E37zkjHsj4oEXBWteWIvbDUnqErJNiTnrrXwM5YJ16DTv5elx8yeC8EmPl0P3rGc6lI4BH5Vg8ih9lxkirvnpX6vaokO8GKGZ5DDV/aWK0KowE8ZaCP7P/Mt47Tq/SANpLxYDrYs1PyYMo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=rYmGZPSE; arc=none smtp.client-ip=113.46.200.227 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="rYmGZPSE" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=b539C+AawPNqTUMTRaV+ozcrDgitM+hGFWLgyJ7L8wc=; b=rYmGZPSEvc1o55e0ayzpTaHAV3hJcI8qHt0pXiNu26au/R27FzaE4egOodIf4xP/fpjWAXTAr USf31VnVXyQvuClXD+dFpSFLdgEtX31GohzHk2bxQQORsnKynDljKsAZatZMsWIJ4izGpRa9ZPG d+n0A4aVfZ6Uz86n8yjI1Io= Received: from mail.maildlp.com (unknown [172.19.163.200]) by canpmsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4gWGk13jKbznTbR; Thu, 4 Jun 2026 15:42:17 +0800 (CST) Received: from dggemv705-chm.china.huawei.com (unknown [10.3.19.32]) by mail.maildlp.com (Postfix) with ESMTPS id 1D86B4055B; Thu, 4 Jun 2026 15:50:10 +0800 (CST) Received: from kwepemn200012.china.huawei.com (7.202.194.135) by dggemv705-chm.china.huawei.com (10.3.19.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 4 Jun 2026 15:50:09 +0800 Received: from huawei.com (10.50.163.32) by kwepemn200012.china.huawei.com (7.202.194.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 4 Jun 2026 15:50:08 +0800 From: Sizhe Liu To: , , , , , , , , , , , , , , , , , , , , , , , , , , CC: , , , , , , , , , Subject: [PATCH 03/10] perf hisi-ptt: Rename hisi_ptt_4dw union for reuse Date: Thu, 4 Jun 2026 15:49:58 +0800 Message-ID: <20260604075005.2219785-4-liusizhe5@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20260604075005.2219785-1-liusizhe5@huawei.com> References: <20260604075005.2219785-1-liusizhe5@huawei.com> Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: kwepems200001.china.huawei.com (7.221.188.67) To kwepemn200012.china.huawei.com (7.202.194.135) Rename union hisi_ptt_4dw to hisi_ptt_field_data so that it can hold bit field layouts for different DW headers. Add the struct member name dw0_4dw to indicate that the inner struct is for 4DW format DW0. Signed-off-by: Sizhe Liu --- .../hisi-ptt-decoder/hisi-ptt-pkt-decoder.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/hisi-ptt-decoder/hisi-ptt-pkt-decoder.c b/tools/perf/util/hisi-ptt-decoder/hisi-ptt-pkt-decoder.c index 67024f18ebbb..5daae2eaf435 100644 --- a/tools/perf/util/hisi-ptt-decoder/hisi-ptt-pkt-decoder.c +++ b/tools/perf/util/hisi-ptt-decoder/hisi-ptt-pkt-decoder.c @@ -74,7 +74,8 @@ static const char * const hisi_ptt_4dw_pkt_field_name[] = { [HISI_PTT_4DW_HEAD3] = "Header DW3", }; -union hisi_ptt_4dw { +union hisi_ptt_field_data { + /* Header DW0 for 4DW format */ struct { uint32_t time : 11; uint32_t len : 10; @@ -84,7 +85,7 @@ union hisi_ptt_4dw { uint32_t t9 : 1; uint32_t type : 5; uint32_t format : 2; - }; + } dw0_4dw; uint32_t value; }; @@ -128,15 +129,15 @@ static int hisi_ptt_8dw_pkt_desc(const unsigned char *buf, int pos) static void hisi_ptt_4dw_print_dw0(const unsigned char *buf, int pos) { const char *color = PERF_COLOR_BLUE; - union hisi_ptt_4dw dw0; + union hisi_ptt_field_data dw; uint8_t byte; int i; - dw0.value = le32_to_cpu(*(__le32 *)(buf + pos)); + dw.value = le32_to_cpu(*(__le32 *)(buf + pos)); printf("."); color_fprintf(stdout, color, " %08x: ", pos); for (i = 0; i < HISI_PTT_FIELD_LENGTH; i++) { - byte = (dw0.value >> (24 - i * 8)) & 0xFF; + byte = (dw.value >> (24 - i * 8)) & 0xFF; color_fprintf(stdout, color, "%02x ", byte); } for (i = 0; i < HISI_PTT_MAX_SPACE_LEN; i++) @@ -144,9 +145,10 @@ static void hisi_ptt_4dw_print_dw0(const unsigned char *buf, int pos) color_fprintf(stdout, color, " %s %x %s %x %s %x %s %x %s %x %s %x %s %x %s %x\n", - "Format", dw0.format, "Type", dw0.type, "T9", dw0.t9, - "T8", dw0.t8, "TH", dw0.th, "SO", dw0.so, "Length", - dw0.len, "Time", dw0.time); + "Format", dw.dw0_4dw.format, "Type", dw.dw0_4dw.type, + "T9", dw.dw0_4dw.t9, "T8", dw.dw0_4dw.t8, + "TH", dw.dw0_4dw.th, "SO", dw.dw0_4dw.so, + "Length", dw.dw0_4dw.len, "Time", dw.dw0_4dw.time); } static int hisi_ptt_4dw_pkt_desc(const unsigned char *buf, int pos) -- 2.33.0