From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (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 19C6148A8A4 for ; Fri, 21 Aug 2026 11:44:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787312660; cv=none; b=haTYXIi2kNlqpFD5FkKULY7ME4vKQh0UYsrCw8JCM9k4wIS7WVfI/+AlHipsIQVccULlaggmGjSRWXvCRG8A2Q42poDD7ViubBhF+P+w4+2MYduiOorM0sjsqVtry+AIWMQMAgxuTD5fzO5ztedGsSsefk1eu/Vr1ZE/gBnsG5Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787312660; c=relaxed/simple; bh=lGBFWUvumgv7qiTBm2/G9dt386z7ODZ/bFwZpVLibqw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZP2PK5CNyFowP9lQFo6noB8RVetinUK6q0fn8TqdxkCuuT0roB81KGhpHreGPOO4m25zuVWkjcCs3gmyXbpajjh/+NT5RGveN3Veu6iBD7sMXH0W3KHWndt9bbpGDKN8hf3qVpMb7oS70hvAbQxGTZpQVfROdeC2mAj/b4tY+Wk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=O98q0oKp; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="O98q0oKp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1787312659; x=1818848659; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lGBFWUvumgv7qiTBm2/G9dt386z7ODZ/bFwZpVLibqw=; b=O98q0oKpF3hXa8EaebNIw4qXHQhLvhRaI8or1YO51WgowSrf1eFyeKXx asbigR9ygVfp8Pff810/7nxVUuAS1lSys22yFpK6BUbXX8aAMhucBIC0p QnKjxL52EBSfxG7L4uFt/ksOUCnGdMsuY36mgu3PAneHXkhxhj09TtGzQ sIQ8UHPBytOuRTEBsPYT6KYTU7a2uyPb1teg71lLDzZ0tOlDslt42ZiTx uqILmYbwDxRxWZb9bANiCqUDCTVSIIIvgzuk+dfd2G7gIXN0WphfCqG/f Ycr3kaLC5tsqX+d5ydB0YciWKHettbmeXi6nu/9eSxnYfkDavfEJ1gyGD g==; X-CSE-ConnectionGUID: C583uXWtRmGsBDLhouLm1Q== X-CSE-MsgGUID: v/brbZnKSzqTSoAnocTioA== X-IronPort-AV: E=McAfee;i="6800,10657,11881"; a="87989073" X-IronPort-AV: E=Sophos;i="6.25,235,1779174000"; d="scan'208";a="87989073" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Aug 2026 04:44:19 -0700 X-CSE-ConnectionGUID: uZJkWGvOTwCE4E3i3VMGlg== X-CSE-MsgGUID: xWdJDv3YR4On4yaRRTWk+g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,235,1779174000"; d="scan'208";a="291172291" Received: from mwiniars-mobl.ger.corp.intel.com (HELO alaakso-desk.kioski) ([10.245.246.151]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Aug 2026 04:44:17 -0700 From: Antti Laakso To: linux-media@vger.kernel.org, mchehab@kernel.org, sakari.ailus@linux.intel.com Cc: daxing.li@intel.com, ong.hock.yu@intel.com, antti.laakso@linux.intel.com Subject: [PATCH v2 17/44] media: ipu6: Rename isys fw msg union Date: Fri, 21 Aug 2026 14:42:35 +0300 Message-ID: <20260821114302.365532-18-antti.laakso@linux.intel.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260821114302.365532-1-antti.laakso@linux.intel.com> References: <20260821114302.365532-1-antti.laakso@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Later we need to abstract ipu7 firmware abi structs same way we have it now for ipu6. Renaming union per ipu helps to make the split more clear. Signed-off-by: Antti Laakso --- drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 4 ++-- drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 4 ++-- drivers/media/pci/intel/ipu6/ipu6-isys.c | 4 ++-- drivers/media/pci/intel/ipu6/ipu6-isys.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c index fabaed63df0c..529973860e9e 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c @@ -316,7 +316,7 @@ static int ipu6_isys_stream_start(struct ipu6_isys_video *av, if (!msg) return -ENOMEM; - buf = &msg->fw_msg.frame; + buf = &msg->ipu6.frame; ipu6_isys_buf_to_fw_frame_buf(buf, stream, bl); ipu6_fw_isys_dump_frame_buff_set(dev, buf, stream->nr_output_pins); @@ -396,7 +396,7 @@ static void buf_queue(struct vb2_buffer *vb) goto out; } - buf = &msg->fw_msg.frame; + buf = &msg->ipu6.frame; ipu6_isys_buf_to_fw_frame_buf(buf, stream, &bl); ipu6_fw_isys_dump_frame_buff_set(dev, buf, stream->nr_output_pins); diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c index 89eb265737d7..c925386a1e98 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c @@ -533,7 +533,7 @@ static int start_stream_firmware(struct ipu6_isys_video *av, if (!msg) return -ENOMEM; - stream_cfg = &msg->fw_msg.stream; + stream_cfg = &msg->ipu6.stream; stream_cfg->src = stream->stream_source; stream_cfg->vc = stream->vc; stream_cfg->isl_use = 0; @@ -590,7 +590,7 @@ static int start_stream_firmware(struct ipu6_isys_video *av, ret = -ENOMEM; goto out_put_stream_opened; } - buf = &msg->fw_msg.frame; + buf = &msg->ipu6.frame; ipu6_isys_buf_to_fw_frame_buf(buf, stream, bl); ipu6_isys_buffer_list_queue(bl, IPU6_ISYS_BUFFER_LIST_FL_ACTIVE, 0); diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.c b/drivers/media/pci/intel/ipu6/ipu6-isys.c index 8af891081bd3..8f2d361b89f6 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys.c @@ -1003,7 +1003,7 @@ struct isys_fw_msgs *ipu6_get_fw_msg_buf(struct ipu6_isys_stream *stream) msg = list_last_entry(&isys->framebuflist, struct isys_fw_msgs, head); list_move(&msg->head, &isys->framebuflist_fw); spin_unlock_irqrestore(&isys->listlock, flags); - memset(&msg->fw_msg, 0, sizeof(msg->fw_msg)); + memset(&msg->ipu6, 0, sizeof(msg->ipu6)); return msg; } @@ -1029,7 +1029,7 @@ void ipu6_put_fw_msg_buf(struct ipu6_isys *isys, uintptr_t data) return; spin_lock_irqsave(&isys->listlock, flags); - msg = container_of(ptr, struct isys_fw_msgs, fw_msg.dummy); + msg = container_of(ptr, struct isys_fw_msgs, ipu6.dummy); list_move(&msg->head, &isys->framebuflist); spin_unlock_irqrestore(&isys->listlock, flags); } diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.h b/drivers/media/pci/intel/ipu6/ipu6-isys.h index 0b139ab24431..abcd5e1cbc2c 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys.h +++ b/drivers/media/pci/intel/ipu6/ipu6-isys.h @@ -169,7 +169,7 @@ struct isys_fw_msgs { u64 dummy; struct ipu6_fw_isys_frame_buff_set_abi frame; struct ipu6_fw_isys_stream_cfg_data_abi stream; - } fw_msg; + } ipu6; struct list_head head; dma_addr_t dma_addr; }; -- 2.55.0