From nobody Fri Nov 7 14:43:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548094909428446.6200204259035; Mon, 21 Jan 2019 10:21:49 -0800 (PST) Received: from localhost ([127.0.0.1]:57564 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gleCi-0007uR-9Y for importer@patchew.org; Mon, 21 Jan 2019 13:21:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gldyG-0004WE-Fs for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gldyF-0004Kn-QV for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:52 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:45383) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gldyF-0004Jn-Iz for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:51 -0500 Received: by mail-wr1-x42d.google.com with SMTP id t6so24421258wrr.12 for ; Mon, 21 Jan 2019 10:06:51 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 133sm56197732wme.9.2019.01.21.10.06.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 10:06:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=0yrVirtf2XYWtid3rKgKyPY4/E20xtlKXHv18PjOeFM=; b=Vj4lhLQX6F70hqlJ+9sIo66rIrMz9Esa+GrmRT3E30vAW4Ka95WdAP9CZM9yLCxSOE pCQ2RmDQA6K5+VvgSxokzBtJSXaAxBGz7oAq7CDBMy6vz8kutSQTdspeSJ25j9RieZJO AuBr91MtNBG9WT4s2qRhmDjnhzKBo4Cks44VvWS2A1JAv/jfiPdKVxYlCarEdS4yfvG6 zdhLXq2dZe7oGUn5Ywerp2RdJaqPvk3CNcXRdGLsnG+zhLaJjTmZ1vrjirYBvDipD8Eq HMQYCaPkGGDp/+N5G7jlTWVUFISNFHYyJMvDmC0/lLOjukOkilPklZQWaysQ8T1dnKfP Yd8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=0yrVirtf2XYWtid3rKgKyPY4/E20xtlKXHv18PjOeFM=; b=ZfrJ8cetLwbAvC0x79YSssIKviYXmNs3uZVYLhyS8oTLPyNNRf8fvIsS3uNPgv39sx JSuYIruZaRQuU0HicBn9o6+SdEa8/ogdHkAHFegeOoMunNea7MZXXHp3B0/VhAnAY+TX Iaa337B/MxwHm/87nke8auSBgVQ0p/4ruagKaOO+DMIQcUraR69UvfdzWZv364+lKp5s QEmlT0abCgbZtwxX1ljEwgVO0eUyvL5dBKMS1ZdsLAFJRPRBbvaL2YKIQvFqLYqtfYJi JeleQWo6Xpn2jGnzMttBHy9/DUuRb3HOlGcUMyc66eYzkiFUogpUT3GotyyHwHeAh0p0 GUMA== X-Gm-Message-State: AJcUukce98bKBsGLSenA06Pu0FkBiEjpBXWuKIY90Kz+liaOrxdggvGn QCliwoGmuzYUsuF6N9acDvy4Gfac X-Google-Smtp-Source: ALg8bN6yOooEhzfrxNxglND07D4wTnzSfwF+4DBBmg+0sQ1vXK2HMiYDs+nRZv2N0qtS736v0AphTA== X-Received: by 2002:a5d:524b:: with SMTP id p11mr27884568wrv.147.1548094010453; Mon, 21 Jan 2019 10:06:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 19:05:59 +0100 Message-Id: <1548093980-43088-29-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> References: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PULL 28/49] linuxboot_dma: remove duplicate definitions of FW_CFG X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Garzarella FW_CFG_DMA_CTL_* bits and struct fw_cfg_dma_access are defined in the qemu_fw_cfg.h header file already included in linuxboot_dma.c, so we can remove the definition of BIOS_CFG_DMA_CTL_* and struct FWCfgDmaAccess. Signed-off-by: Stefano Garzarella Reviewed-by: Stefan Hajnoczi Reviewed-by: Liam Merwick Based-on: <1547554687-12687-1-git-send-email-liam.merwick@oracle.com> Signed-off-by: Paolo Bonzini --- pc-bios/optionrom/linuxboot_dma.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pc-bios/optionrom/linuxboot_dma.c b/pc-bios/optionrom/linuxboo= t_dma.c index d856d41..f728dc8 100644 --- a/pc-bios/optionrom/linuxboot_dma.c +++ b/pc-bios/optionrom/linuxboot_dma.c @@ -58,12 +58,6 @@ asm( " jmp load_kernel\n" ); =20 -/* QEMU_CFG_DMA_CONTROL bits */ -#define BIOS_CFG_DMA_CTL_ERROR 0x01 -#define BIOS_CFG_DMA_CTL_READ 0x02 -#define BIOS_CFG_DMA_CTL_SKIP 0x04 -#define BIOS_CFG_DMA_CTL_SELECT 0x08 - #define BIOS_CFG_DMA_ADDR_HIGH 0x514 #define BIOS_CFG_DMA_ADDR_LOW 0x518 =20 @@ -75,12 +69,6 @@ asm( =20 #define barrier() asm("" : : : "memory") =20 -typedef struct FWCfgDmaAccess { - uint32_t control; - uint32_t length; - uint64_t address; -} __attribute__((packed)) FWCfgDmaAccess; - static inline void outl(uint32_t value, uint16_t port) { asm("outl %0, %w1" : : "a"(value), "Nd"(port)); @@ -153,9 +141,9 @@ static inline uint32_t be32_to_cpu(uint32_t x) static __attribute__((__noinline__)) void bios_cfg_read_entry(void *buf, uint16_t entry, uint32_t len) { - FWCfgDmaAccess access; - uint32_t control =3D (entry << 16) | BIOS_CFG_DMA_CTL_SELECT - | BIOS_CFG_DMA_CTL_READ; + struct fw_cfg_dma_access access; + uint32_t control =3D (entry << 16) | FW_CFG_DMA_CTL_SELECT + | FW_CFG_DMA_CTL_READ; =20 access.address =3D cpu_to_be64((uint64_t)(uint32_t)buf); access.length =3D cpu_to_be32(len); @@ -165,7 +153,7 @@ void bios_cfg_read_entry(void *buf, uint16_t entry, uin= t32_t len) =20 outl(cpu_to_be32((uint32_t)&access), BIOS_CFG_DMA_ADDR_LOW); =20 - while (be32_to_cpu(access.control) & ~BIOS_CFG_DMA_CTL_ERROR) { + while (be32_to_cpu(access.control) & ~FW_CFG_DMA_CTL_ERROR) { barrier(); } } --=20 1.8.3.1