From patchwork Thu May 8 13:35:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 888585 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp6853wre; Thu, 8 May 2025 06:37:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU86si9l1pcHzAoS5xaHhLF2gZ6Ay9v/LQGcFnfZB6Fl5dLT3V/1w/QKzQv56eJCdJcnfBUZw==@linaro.org X-Google-Smtp-Source: AGHT+IEluLEzgt+E6RN2phnCxSPVAQezDiNBKZ5cmcnl4ZMQGVfyXZlxpqYcs9y1dyHN+2p/9hfD X-Received: by 2002:a05:622a:1354:b0:48a:4465:bfd8 with SMTP id d75a77b69052e-4944963f74bmr56831231cf.49.1746711477623; Thu, 08 May 2025 06:37:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711477; cv=none; d=google.com; s=arc-20240605; b=gxF/5+LoBoDTDSaqu5Q1zdXWH6kk9+PCBVBl/JVjGOggi56LR6yMgY01ij3Hcdany5 UeIlZS21M5D4o/OwUxPWdLhBvjZfg3YIFO/5BFq/WAF5pruuJc2YNLrF/3rb39tKELdu K/8gTMwht9Ehrfry5POkTNLvkjLaa9Zn/aYee8q6wDJ6O4UnJWARvy1pAQCNhyhblduX tm4xJAV+wQoVU5s2ZuTWfrnIyoSR4O21Uu0uzEGtAIlUrEgko00zvCJKtqX0cS0Q9cBy h7Iq0hwjZTj/k38o1g2FVlM07bHPB6GAh2RQ8gBxPrGispkrdN3LgZSeadIjVHQBVhdg sa0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=5TBd8qqudhdD0Z8zjZ7s78pINlfboYf1Urx2r0CkJAA=; fh=t4sCPXSJJxzszaJF+1Mm6mpQfCAwhf2cujSX+L6g5pY=; b=Sj96bUtX3ASQEd847q/AtvDcf7bCI5yTP3DNlSY/VRJByy2eLJxZ8ZDspo0+x+6zSq vAjZI8AAOacKWAUuoDr44Los6wdZG+paNZxmNpVBI5+vIrVwPEbpPMnHjdHy7V+nc7zp y+GzzpRYiUeMIUr4hk1NoEZy5lymKTyTQFd8WeltYveTibvgwuD8B3/KjslOjeY//+Lc RS6k2O02M9gA30dFLZ0zBYlWfTPHnUxzt5mmRkRzEYTOPLJUjvjpnuALz+M5Pg+r5wYY +d39WLQMkE2KXseKACU28MxOj7Y2ln5BiOl4jitXV3dQQgU9KBd53ARbahJu3EsDgVCl 9aqw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S429XQ0t; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4922354d633si45429761cf.590.2025.05.08.06.37.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:37:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S429XQ0t; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uD1RB-0006yC-Bt; Thu, 08 May 2025 09:37:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uD1R9-0006uq-5v for qemu-devel@nongnu.org; Thu, 08 May 2025 09:37:19 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1R7-0003mU-8y for qemu-devel@nongnu.org; Thu, 08 May 2025 09:37:18 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-22e8461d872so10227335ad.3 for ; Thu, 08 May 2025 06:37:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711435; x=1747316235; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5TBd8qqudhdD0Z8zjZ7s78pINlfboYf1Urx2r0CkJAA=; b=S429XQ0tOrkMZD1st2icj26/ufTBgFP10Lh5LA5ngiFSDnES4gFd+cEjJXFfZ9oPJ6 405pKS8DM7MQGE8v/MZ6j+/89M8IBAUU/FolhHIiFIKQ7WGaIMJgnmb+Z10x4ZWpRy9a ueP+qMiJZh8VYl47hoWqA8dkJ8hVc4K9B8M+ZkE5A0maZzsSBmViVk6Sg2CR3cYyZqkP /pyLGZGmJmjIct8G4mcCX7/1zy3fgVhDmkphDuWlX0n1wPp4OdtIW6NtRJOtdn6zDFpi 2plN2zX3Sk/UvGr/847XyLj/iAbX22f/mb39kpcL4iqAq0mgmgiGD9KaHJz4bdtAC13Z g4PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711435; x=1747316235; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5TBd8qqudhdD0Z8zjZ7s78pINlfboYf1Urx2r0CkJAA=; b=V5S4+1eR0jLnaavT+4Ewk1wIkMOiSPDDnDyQYtuqYAjyHHxSPmkWzE5HXB18s0ylMN JCfYaLwBMjcDy62+ux9LYfsIegixsujguOgd4r3BEJ1IQ7CEqpEZ11ABq0H3tUPzojI0 pLQ4Vjar9TNE/lnY6c8sR+y3U584080BIAePUVz62EvOVweL6BC47pS65MjHiE4NUL4a fT89UzxCl5vdNmFcH2F1yqqFWjXVKdCqaaQcvw0KuOZ5b9EZcsF+HQXPZTC0hP+sFSa9 jVX5lsZxCIhJMz+ISaMacfYMjxla35YAquBsKyas/sfWaYB58jfQPeQSp+dCDI1ivB/c BRPQ== X-Gm-Message-State: AOJu0Yxe6fmujo41Rzg44OeEO+m2N1EJC6wimPMI2JY1wtiO4+bYyYF9 Nkp1QJbyNeJsfLaAa0Q1sDonC+0AC+EaM78W0Wq3k3orzr/iH8kiGj6i6PsLloPECWrWMWuj4Ar RaUbtsg== X-Gm-Gg: ASbGncu27dGfpJcYeMid6Th6Nl2Gr/AiykBJ9C4lfuJ9m3m+YyGodDUDwcOk1FPrgil REB4fDJwTYWUo9Rt5wOrlIVRQZ02K9yo6mCfjVnT8hzhzX9J12HWxHrMGyPtisf2k6c1pWyMd9x odlv8jgioOHmWVzhHjwjhRKcy6nBfY3Jf011Ty2w7HXCo7f6qWmMug1Ajkuod5K57yRk87QTccQ Hp86MXPhL2e5PM09WSi9i2GTsZbomnhTkKxg6GdYCtfyiho4gI5Mcllp4LTl3gXf5byNctV/t+7 PWkKeWAGTKTo1v97PJxaTy8GenqEw7KnjwQv13pafwVWbvuwcNAy+STnfx4Kpr5H+U9oBGrO4dq FPDXeVjpUXux9/cY8LuLJix/8gw== X-Received: by 2002:a17:903:440c:b0:226:5dbf:373f with SMTP id d9443c01a7336-22e8560ce56mr54655525ad.10.1746711435370; Thu, 08 May 2025 06:37:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e1521fb4asm111932715ad.113.2025.05.08.06.37.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:37:14 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: 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 , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang Subject: [PATCH v4 03/27] hw/nvram/fw_cfg: Rename fw_cfg_init_mem() with '_nodma' suffix Date: Thu, 8 May 2025 15:35:26 +0200 Message-ID: <20250508133550.81391-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=philmd@linaro.org; helo=mail-pl1-x633.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Rename fw_cfg_init_mem() as fw_cfg_init_mem_nodma() to distinct with the DMA version (currently named fw_cfg_init_mem_wide). Suggested-by: Zhao Liu Signed-off-by: Philippe Mathieu-Daudé --- include/hw/nvram/fw_cfg.h | 3 ++- hw/hppa/machine.c | 2 +- hw/nvram/fw_cfg.c | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index d41b9328fd1..d5161a79436 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -307,7 +307,8 @@ bool fw_cfg_add_file_from_generator(FWCfgState *s, FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, AddressSpace *dma_as); -FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr); +FWCfgState *fw_cfg_init_mem_nodma(hwaddr ctl_addr, hwaddr data_addr, + unsigned data_width); FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, hwaddr data_addr, uint32_t data_width, hwaddr dma_addr, AddressSpace *dma_as); diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index dacedc5409c..0d768cb90b0 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -201,7 +201,7 @@ static FWCfgState *create_fw_cfg(MachineState *ms, PCIBus *pci_bus, int btlb_entries = HPPA_BTLB_ENTRIES(&cpu[0]->env); int len; - fw_cfg = fw_cfg_init_mem(addr, addr + 4); + fw_cfg = fw_cfg_init_mem_nodma(addr, addr + 4, 1); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, ms->smp.cpus); fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, HPPA_MAX_CPUS); fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, ms->ram_size); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 54cfa07d3f5..10f8f8db86f 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1087,11 +1087,10 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, return s; } -FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr) +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, - fw_cfg_data_mem_ops.valid.max_access_size, - 0, NULL); + return fw_cfg_init_mem_wide(ctl_addr, data_addr, data_width, 0, NULL); }