From nobody Tue Oct 28 01:53:46 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.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=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751494601957411.27923698782274; Wed, 2 Jul 2025 15:16:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uX5jv-0001tE-AI; Wed, 02 Jul 2025 18:15:39 -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 1uX5jt-0001ro-F6; Wed, 02 Jul 2025 18:15:37 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uX5ji-0006he-6x; Wed, 02 Jul 2025 18:15:37 -0400 Received: from zero.eik.bme.hu (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id 6A0DB55CB66; Thu, 03 Jul 2025 00:09:02 +0200 (CEST) Received: from zero.eik.bme.hu ([127.0.0.1]) by zero.eik.bme.hu (zero.eik.bme.hu [127.0.0.1]) (amavisd-new, port 10028) with ESMTP id ORvdBgbpxQb6; Thu, 3 Jul 2025 00:09:00 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 6E59E55CA62; Thu, 03 Jul 2025 00:09:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at eik.bme.hu Message-ID: <688ac07e52e04f062810e82cf6e3ba3caf06416f.1751493467.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 06/14] hw/pci-host/raven: Simplify direct config access address decoding MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Artyom Tarasenko , Nicholas Piggin Date: Thu, 03 Jul 2025 00:09:00 +0200 (CEST) Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1751494605312116600 Content-Type: text/plain; charset="utf-8" Use ctz instead of an open coded version and rename function to better show what it does. Signed-off-by: BALATON Zoltan --- hw/pci-host/raven.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c index a400a22df3..66dab28a29 100644 --- a/hw/pci-host/raven.c +++ b/hw/pci-host/raven.c @@ -57,16 +57,9 @@ struct PREPPCIState { =20 #define PCI_IO_BASE_ADDR 0x80000000 /* Physical address on main bus */ =20 -static inline uint32_t raven_pci_io_config(hwaddr addr) +static inline uint32_t raven_idsel_to_addr(hwaddr addr) { - int i; - - for (i =3D 0; i < 11; i++) { - if ((addr & (1 << (11 + i))) !=3D 0) { - break; - } - } - return (addr & 0x7ff) | (i << 11); + return (ctz16(addr >> 11) << 11) | (addr & 0x7ff); } =20 static void raven_pci_io_write(void *opaque, hwaddr addr, @@ -74,7 +67,7 @@ static void raven_pci_io_write(void *opaque, hwaddr addr, { PREPPCIState *s =3D opaque; PCIHostState *phb =3D PCI_HOST_BRIDGE(s); - pci_data_write(phb->bus, raven_pci_io_config(addr), val, size); + pci_data_write(phb->bus, raven_idsel_to_addr(addr), val, size); } =20 static uint64_t raven_pci_io_read(void *opaque, hwaddr addr, @@ -82,7 +75,7 @@ static uint64_t raven_pci_io_read(void *opaque, hwaddr ad= dr, { PREPPCIState *s =3D opaque; PCIHostState *phb =3D PCI_HOST_BRIDGE(s); - return pci_data_read(phb->bus, raven_pci_io_config(addr), size); + return pci_data_read(phb->bus, raven_idsel_to_addr(addr), size); } =20 static const MemoryRegionOps raven_pci_io_ops =3D { --=20 2.41.3