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.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609707045; cv=none; d=zohomail.com; s=zohoarc; b=EcdIbpxbs1VrAhoNtIc94ma0e6YVRXOdZtYhLvwL/NB0t4fLgnOO6IZr5bzUtbOKwy8YFYr1xprjZbg8PR6n6C75suK1pYH2XmHLM+rIVYd1QcOS8HfDdRGFrwLn2TNr2P0bW4wCdWimfx+lgA/tQafLO+nQkkZIa/p+EO2Wc1s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707045; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mJEfvgkW151yoqlrnwbVD77R8FV2DDiUd+HFwtJzojs=; b=k8VgEDBksZOQNTtE+MnKdLKCtztj/TEl6KQaQ9nKgIdZFm8pj6KDGr4nesyJuGbySy8fS9JDMoL/aamvWypBbSczWTNBRI9/it+9tNjWfqIe9drO6/uzQ6a8yHItjpZuDFDl69UpdwNeU7rbbfUX7zRMQ/YB1V4r49XAHRktWRE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1609707045765627.5831579459692; Sun, 3 Jan 2021 12:50:45 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id 3so16633875wmg.4 for ; Sun, 03 Jan 2021 12:50:45 -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 r16sm90250921wrx.36.2021.01.03.12.50.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:50:43 -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=mJEfvgkW151yoqlrnwbVD77R8FV2DDiUd+HFwtJzojs=; b=WdcEoG0oxwcSelex4dvFqaBNFEa3nZFK2uNicwzSmSG4hh3qge+IZnjIkyA3Pu3uZv GNPyvVgGwABkb/jrMZuH3x0t85yAHy09SQTK+Lb839AiPQ8G+cLtk2A50PchKDsqZydD oCdiOgrLd4rHrkh3Xsgn2xx0JZjnVRFJKzpXcM1tJO9PiAgyxto7Zgx7AEDhYbTWRbgY pJUQLI/d8UDDoVyvSqmU4ss0+tCrh9VDC2A6imGIYAB+6HpOPHwAYmL9vmtUtHqhoJ8C h0sSry+Aw8z8NArZDogVuMLi6InLcwzH861p9jbv3w64lGaCcTnwFpDGZhBDoCkojYdt 2WBA== 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=mJEfvgkW151yoqlrnwbVD77R8FV2DDiUd+HFwtJzojs=; b=S5VO9sGxYp78a291FxeenvOWBC3uTvTe1rc8C8Tnj743vECj7NCyly6KeVFDCmAejU yu3Y9iC46IDSS9T91khVgCsQRLL9ABE3CztT0J5xc6ePg+0zCCEBDxEhu7Ri/UdHF75c gy3utlZ/I4fmZh5bxNA95YFGO9v45SJR69b+L24+sFtyMSBHavf4fCYR04zm3BvtQvp8 dWPnGL1wm32Ec7uTXiGP4B9MJUTGCoGzvXeWWCF7J3MOR/fnuBrxflxh3AYsx6qILlSg mz8si4lXaQkS1PpPHProrYsG5Xj71Fx4wNuwzIGXtZgQpWOSEJ0NAOwp/WoCzst5V1d1 TM8w== X-Gm-Message-State: AOAM5314haLZM681LqfDdyXFkaGmsc/c2eEeAshzStb+CYXlpVlGMk2y zSiY/z6J4xZh+qyvZpwqkBg= X-Google-Smtp-Source: ABdhPJwpovTfdV8FixNNVUx3evK5bqs3G/HloZtnyt3odGRgwzeiv5NrcKpRHI94a1vbk6YGsvHVzg== X-Received: by 2002:a1c:3987:: with SMTP id g129mr23731953wma.86.1609707044035; Sun, 03 Jan 2021 12:50:44 -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 04/35] hw: Use the PCI_DEVFN() macro from 'hw/pci/pci.h' Date: Sun, 3 Jan 2021 21:49:50 +0100 Message-Id: <20210103205021.2837760-5-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_DEVFN() macro in "hw/pci/pci.h" to pack the PCI slot/function identifiers, use it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson Message-Id: <20201012124506.3406909-6-philmd@redhat.com> Reviewed-by: Huacai Chen Message-Id: <20201231224911.1467352-4-f4bug@amsat.org> --- hw/arm/virt.c | 3 ++- hw/pci-host/bonito.c | 2 +- hw/pci-host/uninorth.c | 6 ++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 96985917d3b..bf3a7171118 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1147,7 +1147,8 @@ static void create_pcie_irq_map(const VirtMachineStat= e *vms, full_irq_map, sizeof(full_irq_map)); =20 qemu_fdt_setprop_cells(vms->fdt, nodename, "interrupt-map-mask", - 0x1800, 0, 0, /* devfn (PCI_SLOT(3)) */ + cpu_to_be16(PCI_DEVFN(3, 0)), /* Slot 3 */ + 0, 0, 0x7 /* PCI irq */); } =20 diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index ee8b193e15b..40dda237d8e 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -631,7 +631,7 @@ static void bonito_pcihost_realize(DeviceState *dev, Er= ror **errp) phb->bus =3D pci_register_root_bus(dev, "pci", pci_bonito_set_irq, pci_bonito_map_ir= q, dev, &bs->pci_mem, get_system_io(), - 0x28, 32, TYPE_PCI_BUS); + PCI_DEVFN(5, 0), 32, TYPE_PCI_BUS); =20 for (size_t i =3D 0; i < 3; i++) { char *name =3D g_strdup_printf("pci.lomem%zu", i); diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index f0a4d8c7178..d25b62d6a5b 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -68,10 +68,8 @@ static uint32_t unin_get_config_reg(uint32_t reg, uint32= _t addr) /* ... and then convert them to x86 format */ /* config pointer */ retval =3D (reg & (0xff - 7)) | (addr & 7); - /* slot */ - retval |=3D slot << 11; - /* fn */ - retval |=3D func << 8; + /* slot, fn */ + retval |=3D PCI_DEVFN(slot, func) << 8; } =20 trace_unin_get_config_reg(reg, addr, retval); --=20 2.26.2