From nobody Mon Feb 9 10:29:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602506726; cv=none; d=zohomail.com; s=zohoarc; b=LuQ02CehCxk7MxTY6VdDiTJHOvCbG/YvIXtFxJkjLtiHjtuMZ/G0RtqslnILHSTI4ABq8uuXR46yta9vZS1paWFljfD7wgJeahB/YFwlNfA8QZCaElbJU0RN70TUjQWYckwfgZld0xudh6xx6Ah20UyQiOfMGWbEfDyBGHK+CeE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602506726; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=uEfJTmQm7IfbaNLnhhKiUk3mZKxHaYrO9aWEgNYf1LY=; b=ObLyNbZ+OG8y5CjHhxnFb3OAIqLtgt81aGq27n1WCbKl96PN/lvZ4wnjG5N4B14UTp69Lk+gBPBHTXcZ/L/+5nSWb25Gslt+QCvH6tVmqWClruOQ3lftlA8whv/iYqc9OK48pTDq3mp2dD/6WH3zcwWcf7lPvie/dOV5mTRJpdg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1602506726615913.550816577611; Mon, 12 Oct 2020 05:45:26 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-525-TSWEYvGjMJeFHn4kBtaG3A-1; Mon, 12 Oct 2020 08:45:22 -0400 Received: by mail-wr1-f69.google.com with SMTP id t3so2761639wrq.2 for ; Mon, 12 Oct 2020 05:45:21 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id b5sm2564766wrs.97.2020.10.12.05.45.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 05:45:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602506725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uEfJTmQm7IfbaNLnhhKiUk3mZKxHaYrO9aWEgNYf1LY=; b=i6qZgCEQ875udRWEeba6AQZW5gTzAMKjtYhajRPEjKMQ4u3b6eTEJp/VWh4k9e3Mr6ap39 86oVu9j4naArs7/i20TvK4KRyKXXclSczvdeDyuFAFdzzMVMH+o9Ay0NGV0sNHerO20VZV qng19FfoUj02qLtBJW8Na7otXYahs0I= X-MC-Unique: TSWEYvGjMJeFHn4kBtaG3A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uEfJTmQm7IfbaNLnhhKiUk3mZKxHaYrO9aWEgNYf1LY=; b=UXECjdtn3qaYN9HUQn6FZj+TxquKZo5LogSRMvOLl7fn8NS0F9E2iI8hPLK9GVhV8a IOMIIulWSDRDJWaDVaeoTHlIrhfrw+Io/SZuA1CHF6u6OZoEZAlxFIInXfTfdLVVkD31 6FiU4ZtssrF4Nnc5aBSziKUXqcdtSC51T2XZpe4fbn0ZtCMW7iQP5/1MEDx7H4JFKtpb 5tAkYURkyyI3F15K3l6+gAmHj7MGK5DaYXFCrgBJFoo/upcwMZFHrDtzMDVB0IW11ouS 9ut25KMUOThUXgiofuiKXbWZ5iNljLMM9AVyDzPdt2SobWlk54H13Fngphfq3LqtLOog Pvzw== X-Gm-Message-State: AOAM533sjmecvd7m5KqoF6VzPUGiqxgvtaQ9UcU9xA45O9IL3XbbjpzQ CZktOruc+I+HtutBU3zg/3hMUQmmMkMFjBl9n6LQZ2A1Akg9g9eBVPoMCCf7H6qYqe7SIkuEvMr zvmBkrb5VgGhkBQ== X-Received: by 2002:adf:8b85:: with SMTP id o5mr16319170wra.104.1602506720840; Mon, 12 Oct 2020 05:45:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUet7a3+icknkdXIUBYsqHO/fz4MbL6X5ByiZqEc6CjjMuhyc0L0IjJS+YtIXZM/ET90duwQ== X-Received: by 2002:adf:8b85:: with SMTP id o5mr16319151wra.104.1602506720677; Mon, 12 Oct 2020 05:45:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-ppc@nongnu.org, qemu-trivial@nongnu.org, Paul Durrant , Aurelien Jarno , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Eduardo Habkost , Jiaxun Yang , Yoshinori Sato , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson , Stefano Stabellini , Helge Deller , Anthony Perard , Richard Henderson , Aleksandar Markovic , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Marcel Apfelbaum , Mark Cave-Ayland , Paolo Bonzini , Huacai Chen Subject: [PATCH 2/5] hw/pci-host: Use the PCI_BUILD_BDF() macro from 'hw/pci/pci.h' Date: Mon, 12 Oct 2020 14:45:03 +0200 Message-Id: <20201012124506.3406909-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201012124506.3406909-1-philmd@redhat.com> References: <20201012124506.3406909-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Philippe Mathieu-Daud=C3=A9 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 --- 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 abb3ee86769..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) << 8) & 0xff00) + (((devno) << 3) & 0xf8) + \ - (((funno) & 0x7) << 8) + (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