From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (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 F12841B6556 for ; Thu, 15 May 2025 08:08:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747296495; cv=none; b=nozxB05q3k2GRW8VwsOUDvoJsvNtrNlaPu1t5nMbmUeGPL55rRsTKbmjOtx1F4JZ04Z8peN/W/GR1k2HECesWcrPhDjT2sq1j0bUVP/bjl9qAEL8CEeKQfQsJTLiSH1AuMnGRCEaXRsT0UJWGWw9yLRVVI1Ba5pjA1ao0NoS7Rc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747296495; c=relaxed/simple; bh=1AnATLoCvpWdtTCkDZsBgKnp3pMIZcVXqd27NhUqOtA=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=DVR5ija7HhNLzTwyzV86zGWu91Ey8+lMYAk0KrXS2KEfWBXSP/Yd+Dp9mY7cgi7/ZQKGaLU3ByTCxj/ibNukJ9uanXTbyXgC9faTzqIojvJT+AbOSIdawIXXtTf8e2tLSb5V7Vs8FM2pA1Fnplptsdig4R8plajsM2cwEBaFfjc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=gFMslssZ; arc=none smtp.client-ip=198.175.65.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="gFMslssZ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1747296494; x=1778832494; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=1AnATLoCvpWdtTCkDZsBgKnp3pMIZcVXqd27NhUqOtA=; b=gFMslssZMZ5jG/DRZw2FSyNuFOdNpe5SLujqSaqPhtMWpxRfUFRO5xsS 0S76evd7vDhHiD8J1d5v1giKkXZ5sX9m95DMMLOtC5KkfLlUF4u1YMCte OZQLG2jPp97rAob9+6ArzI53w+GwAbw4i7yPZHuu+8YArygm2ETOb602f iOQotrKbm3/eqyxdbj+KouLDWIOG2atj8A2hrG1YrfEszITR/YF2Wznt3 Hlt56nQ4i9cGi0vzFoy+lrCZ2ql25ATZdSbTqQmXh3xzjL9+T3wYQBprv LCJN79FYYp7qvmJpk4CRIdeT0rr3970U88yTCtUfIpCVlP+qm+nEfC1rU w==; X-CSE-ConnectionGUID: vAIFEZh0Q4OYGIsohweaiw== X-CSE-MsgGUID: XGO3HbGGSgaJdLeiZMEaEw== X-IronPort-AV: E=McAfee;i="6700,10204,11433"; a="49088614" X-IronPort-AV: E=Sophos;i="6.15,290,1739865600"; d="scan'208";a="49088614" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2025 01:08:13 -0700 X-CSE-ConnectionGUID: zUkxVkykSFCEb485bRZwWw== X-CSE-MsgGUID: AE6yTCKbQjS55KgTgA+1xg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,290,1739865600"; d="scan'208";a="138792583" Received: from xiaoyaol-hp-g830.ccr.corp.intel.com (HELO [10.124.247.1]) ([10.124.247.1]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2025 01:08:02 -0700 Message-ID: Date: Thu, 15 May 2025 16:08:00 +0800 Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 05/27] hw/nvram/fw_cfg: Factor fw_cfg_init_mem_internal() out To: =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , Liu Zhiwei , =?UTF-8?Q?Cl=C3=A9ment_Mathieu--Drif?= , qemu-arm@nongnu.org, =?UTF-8?Q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang References: <20250508133550.81391-1-philmd@linaro.org> <20250508133550.81391-6-philmd@linaro.org> Content-Language: en-US From: Xiaoyao Li In-Reply-To: <20250508133550.81391-6-philmd@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 5/8/2025 9:35 PM, Philippe Mathieu-Daudé wrote: > Factor fw_cfg_init_mem_internal() out of fw_cfg_init_mem_wide(). > In fw_cfg_init_mem_wide(), assert DMA arguments are provided. > Callers without DMA have to use the fw_cfg_init_mem() helper. > > Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Xiaoyao Li > --- > hw/nvram/fw_cfg.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > index 10f8f8db86f..4067324fb09 100644 > --- a/hw/nvram/fw_cfg.c > +++ b/hw/nvram/fw_cfg.c > @@ -1053,9 +1053,9 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, > return s; > } > > -FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, > - hwaddr data_addr, uint32_t data_width, > - hwaddr dma_addr, AddressSpace *dma_as) > +static FWCfgState *fw_cfg_init_mem_internal(hwaddr ctl_addr, > + hwaddr data_addr, uint32_t data_width, > + hwaddr dma_addr, AddressSpace *dma_as) > { > DeviceState *dev; > SysBusDevice *sbd; > @@ -1087,10 +1087,19 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, > return s; > } > > +FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, > + hwaddr data_addr, uint32_t data_width, > + hwaddr dma_addr, AddressSpace *dma_as) > +{ > + assert(dma_addr && dma_as); > + return fw_cfg_init_mem_internal(ctl_addr, data_addr, data_addr, > + dma_addr, dma_as); > +} > + > FWCfgState *fw_cfg_init_mem_nodma(hwaddr ctl_addr, hwaddr data_addr, > unsigned data_width) > { > - return fw_cfg_init_mem_wide(ctl_addr, data_addr, data_width, 0, NULL); > + return fw_cfg_init_mem_internal(ctl_addr, data_addr, data_width, 0, NULL); > } > >