From nobody Tue Nov 18 10:37:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1609707030; cv=none; d=zohomail.com; s=zohoarc; b=l5OqxLmwDigD3HWrJByAEMcKSWx4nNfGLMnMm+y57A1xWoM4ubB+3LrPCYctWKFYre8FyDFeVRWigx2UpksZKNij/A5AE/dgeexBaK37zQHsNwMn2/Xd8+BE9sl9e/rtTWQWnxi35jxgz6hRyz+PAB++SxnhrO2ryujV9SrK//M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707030; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gAe+ySOPN0ziiB9Rsr0qc0IoOAIOTLWZuAmtV89p3uU=; b=mVECZJ+gMgvFPKII7FhZqvlqJ17iFxS8+KPOgbZ/YbqlGUHfYqrI0zvgH5e9KRJLg2glr5Au3R6zLUGo3kSdv3La8WHZD9eJvTZgqhguZPRKHCmbZMP3zk0cWbaEWRmvJd3NgekqJ15GuSud+MKON0fs5kjupeo5I8CBjPr673U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1609707030730924.6325756854367; Sun, 3 Jan 2021 12:50:30 -0800 (PST) Received: by mail-wm1-f42.google.com with SMTP id v14so15930740wml.1 for ; Sun, 03 Jan 2021 12:50:30 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (194.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.194]) by smtp.gmail.com with ESMTPSA id s25sm96778933wrs.49.2021.01.03.12.50.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:50:28 -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 :mime-version:content-transfer-encoding; bh=gAe+ySOPN0ziiB9Rsr0qc0IoOAIOTLWZuAmtV89p3uU=; b=U2DhFvJ66OYBTjFqTNoB8wHvw32hZo/1wIWRzOmSWUaC8xI7vyo1K852LrTO7ZRl67 hBnmjGjiDLxkYefwdGlYITf0NAK9UfHVaPG+LeuND4Au9t3D+vst0/bNHVzWHvtqFE7j acci5BFRc0ommVIzqVRVkbUNUJJOrDbL+W3mMu7/c7lFCMuKXuMoOkEJNJ5qWOKpEifY 0QUWJIqyLcBhMXrtAT2A9FU+DnvhfqmfjSWaQNTPfCq534LHp38AI0CfNnFkoEL/cPWB P/6KGht7mjyyk0s+ZI2Ay3apG25wEud9Kk6z2Uw4tS18GPQvP1QdKA5dTMayQ6r2cmRU 0xQg== 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:mime-version:content-transfer-encoding; bh=gAe+ySOPN0ziiB9Rsr0qc0IoOAIOTLWZuAmtV89p3uU=; b=rQBxHrAOhTc6VwFCZIqZJdvXLLTrigHssl81Emt92POgRf1ZFPFP2i4MdV2+mIt7Qp xet1HfxNEjPr4PCDhLts0wsw4zxOvb5rE9lpJgc7OyD05PEvzF+pJmp30iwT32gsvSi/ G2klHPrOhI/6HaZ5LPmRFiRtDMb3O8ewsvserX3BDMhCMLNOcuNKu3DsjaHaajtJbxFP fsQMLOo0h4CjsfuvuTiWHO9YO7ThYTw95h8X0+3LH7d/L/StnbNvlIVytICrfaVGxNdt Z2Br59to5fc0kzZ4fwml2Fav5N4L4F2zx7DAjA1NYpD0y/GTAw/Zp0+iQLQFjqIGyqJp dBjQ== X-Gm-Message-State: AOAM53225RmUsMBGxadVl1Qw02SNfkmnOEcUedlfjlN1VPzW83Gg5q7a vQnOqDAX+uaHYTLl2oKkc6AYG8nOFdA= X-Google-Smtp-Source: ABdhPJzOMyRRIqVILF2QacHFbgrWNhP3hxGAxT7fqhT+y35VyqrzHaGfn5lOOtxWIyj84fivdCnMyA== X-Received: by 2002:a05:600c:211:: with SMTP id 17mr24154915wmi.84.1609707029019; Sun, 03 Jan 2021 12:50:29 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Huacai Chen , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Subject: [PULL 01/35] hw/pci-host: Use the PCI_BUILD_BDF() macro from 'hw/pci/pci.h' Date: Sun, 3 Jan 2021 21:49:47 +0100 Message-Id: <20210103205021.2837760-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210103205021.2837760-1-f4bug@amsat.org> References: <20210103205021.2837760-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We already have a generic PCI_BUILD_BDF() macro in "hw/pci/pci.h" to pack these values, use it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson Message-Id: <20201012124506.3406909-3-philmd@redhat.com> --- hw/pci-host/bonito.c | 3 +-- hw/pci-host/pnv_phb4.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index a99eced0657..b05295639a6 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -196,8 +196,7 @@ FIELD(BONGENCFG, PCIQUEUE, 12, 1) #define PCI_IDSEL_VIA686B (1 << PCI_IDSEL_VIA686B_BIT) =20 #define PCI_ADDR(busno , devno , funno , regno) \ - ((((busno) << 16) & 0xff0000) + (((devno) << 11) & 0xf800) + \ - (((funno) << 8) & 0x700) + (regno)) + ((PCI_BUILD_BDF(busno, PCI_DEVFN(devno , funno)) << 8) + (regno)) =20 typedef struct BonitoState BonitoState; =20 diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c index 03daf40a237..6328e985f81 100644 --- a/hw/pci-host/pnv_phb4.c +++ b/hw/pci-host/pnv_phb4.c @@ -889,7 +889,7 @@ static bool pnv_phb4_resolve_pe(PnvPhb4DMASpace *ds) /* Read RTE */ bus_num =3D pci_bus_num(ds->bus); addr =3D rtt & PHB_RTT_BASE_ADDRESS_MASK; - addr +=3D 2 * ((bus_num << 8) | ds->devfn); + addr +=3D 2 * PCI_BUILD_BDF(bus_num, ds->devfn); if (dma_memory_read(&address_space_memory, addr, &rte, sizeof(rte))) { phb_error(ds->phb, "Failed to read RTT entry at 0x%"PRIx64, addr); /* Set error bits ? fence ? ... */ --=20 2.26.2