From nobody Fri May 10 10:04:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) client-ip=209.85.221.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602508825; cv=none; d=zohomail.com; s=zohoarc; b=VPvdIwfVgtrdOAvN3887PuYSinw3YmtOQvtV/TqHwXcty+SqOxYkcQC4VspyRBAyt/Z2wxOTVTMqWBAwjntyk23qIVNtSpnN3Q6fj5aZ4A8DR0592IDH6Bp42vGIYzF813w1vLj8GBu60TdFp/76M3fFtFoUwcnSUEuQFq+2qic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602508825; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/fQo3DSJb6riAH6KnfckECiEhkMalNL1pPpYvWlbzCc=; b=WJwiguU30EzMGm82v8oT/xqeIKbMJyTTVh9qlxJd84kYDbh0yL5Ohk7yLEkz1GBENxrDV/kBSLuWlRVRYR4DbxkrAuXhjDXRYomL0qWTbnORECLBOjIplQW0q/fsW9AP7dS80Tfm/Meg7N2mwUje6jadvELvHTVXCuSa2VSfkno= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.zohomail.com with SMTPS id 1602508825794678.4583133117028; Mon, 12 Oct 2020 06:20:25 -0700 (PDT) Received: by mail-wr1-f68.google.com with SMTP id b8so5951816wrn.0 for ; Mon, 12 Oct 2020 06:20:25 -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 x3sm14706164wmi.45.2020.10.12.06.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 06:20:23 -0700 (PDT) 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=/fQo3DSJb6riAH6KnfckECiEhkMalNL1pPpYvWlbzCc=; b=W9M3saDT8FdO9DTTtZL7ScRDnDjZOrzx77XE5OY5zBI+QKqGDDz1NuoTyr5k+uFFbm V6un4EeWvUoigDJr8qyfBvyejr6e1h4wDIZZFQQcYakI+Hc+qPBD9COAZ9r7HK76ATRE rOgVJZfLN7SKYxZqAtQ6wKa1Wbdxe64qqApsYpm9rS4jDCseEOUm60QCrloD8PF8KGrE MPeoeWhd710PZ9VLHUZPwPdhHn0/k/dH0Jvjy/kUX6SEtesqUnlYDXgXrngiYy4OnKzo wnWWdPARSPJUK8fVo0C1erD/Fam3Gig+mrwxiYUlv6xXY5wmjjVxDv/G6x8GsZob3owl vpJw== 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=/fQo3DSJb6riAH6KnfckECiEhkMalNL1pPpYvWlbzCc=; b=fD7vofd7nDM7Lcb8pngEWUJZDNa2QwUlAuzxBhSnpPM2Jah979leg9H8Ox2plWCFwo 9yIDWfIjGSEXKFMnDulWA2LtsCEP6bXNZwLbIykGFXdlv32mUizT8j0jplhEj/z8aQwt qa9wdxtcgA4ZQZFN/TfDliJBO2XgfQ38iUMDHnxOrFxupwe6ri1Y4dKYjT8hp/982CWg /W8KBK0HxZ+kVgXGvMdD/hL5MF7W1WNPz9UXT50CdajYOxf775Q2Hmk6FhjVrOl45PcQ sx5OfYi4WZp4gTSS0nxihLbDdBCtwH1hnlRboMMNoVfq8QSVt/Og9dwX5b6o+45uRg2k usoA== X-Gm-Message-State: AOAM5320RvSY+fl1Y/qzAFjQLweFnUSnqUXvOBv+5FnQ1STXbAqBoT/f WpnGBJ+etyeymhWPLa3ltNE= X-Google-Smtp-Source: ABdhPJx5PN9W1V5HEEdVHI+swOhZnNNnlgzDPccxus+wpj40WvUDzg5A0ATbiBUC7xhtSI1Xib96XQ== X-Received: by 2002:adf:edc6:: with SMTP id v6mr4869489wro.273.1602508823892; Mon, 12 Oct 2020 06:20:23 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Peter Maydell , qemu-arm@nongnu.org, Aurelien Jarno , Aleksandar Markovic , Paolo Bonzini , Laurent Vivier , Thomas Huth , "Michael S. Tsirkin" , Marcel Apfelbaum , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/5] hw: Replace magic value by PCI_NUM_PINS definition Date: Mon, 12 Oct 2020 15:20:12 +0200 Message-Id: <20201012132017.3423954-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201012132017.3423954-1-f4bug@amsat.org> References: <20201012132017.3423954-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) Use self-explicit PCI_NUM_PINS definition instead of magic value. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/arm/virt.c | 4 ++-- hw/mips/gt64xxx_pci.c | 2 +- hw/pci-host/versatile.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index e465a988d68..ddad9621f79 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1117,11 +1117,11 @@ static void create_pcie_irq_map(const VirtMachineSt= ate *vms, int first_irq, const char *nodename) { int devfn, pin; - uint32_t full_irq_map[4 * 4 * 10] =3D { 0 }; + uint32_t full_irq_map[4 * PCI_NUM_PINS * 10] =3D { 0 }; uint32_t *irq_map =3D full_irq_map; =20 for (devfn =3D 0; devfn <=3D 0x18; devfn +=3D 0x8) { - for (pin =3D 0; pin < 4; pin++) { + for (pin =3D 0; pin < PCI_NUM_PINS; pin++) { int irq_type =3D GIC_FDT_IRQ_TYPE_SPI; int irq_nr =3D first_irq + ((pin + PCI_SLOT(devfn)) % PCI_NUM_= PINS); int irq_level =3D GIC_FDT_IRQ_FLAGS_LEVEL_HI; diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index e091bc4ed55..ff1a35755f6 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -1018,7 +1018,7 @@ static void gt64120_pci_set_irq(void *opaque, int irq= _num, int level) if (pic_irq < 16) { /* The pic level is the logical OR of all the PCI irqs mapped to i= t. */ pic_level =3D 0; - for (i =3D 0; i < 4; i++) { + for (i =3D 0; i < PCI_NUM_PINS; i++) { if (pic_irq =3D=3D piix4_dev->config[PIIX_PIRQCA + i]) { pic_level |=3D pci_irq_levels[i]; } diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 3553277f941..b4951023f4e 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -75,7 +75,7 @@ enum { struct PCIVPBState { PCIHostState parent_obj; =20 - qemu_irq irq[4]; + qemu_irq irq[PCI_NUM_PINS]; MemoryRegion controlregs; MemoryRegion mem_config; MemoryRegion mem_config2; @@ -412,7 +412,7 @@ static void pci_vpb_realize(DeviceState *dev, Error **e= rrp) =20 object_initialize(&s->pci_dev, sizeof(s->pci_dev), TYPE_VERSATILE_PCI_= HOST); =20 - for (i =3D 0; i < 4; i++) { + for (i =3D 0; i < PCI_NUM_PINS; i++) { sysbus_init_irq(sbd, &s->irq[i]); } =20 @@ -422,7 +422,7 @@ static void pci_vpb_realize(DeviceState *dev, Error **e= rrp) mapfn =3D pci_vpb_map_irq; } =20 - pci_bus_irqs(&s->pci_bus, pci_vpb_set_irq, mapfn, s->irq, 4); + pci_bus_irqs(&s->pci_bus, pci_vpb_set_irq, mapfn, s->irq, PCI_NUM_PINS= ); =20 /* Our memory regions are: * 0 : our control registers --=20 2.26.2 From nobody Fri May 10 10:04:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) client-ip=209.85.221.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602508830; cv=none; d=zohomail.com; s=zohoarc; b=Ehepk1yxyNGyF/aXn8Uv4XoUs6Gv/Tfr1P5zt8vXtDSGVKc+iNR/AKkWBXfNp2Om+2avI7hPyDPjX4u1pOqF1UN3ahqcRfT6AXw2a6vGKgkFkDBAb8hjBwKorjfVM1eWdtCZKFcWgweHkEXbYzKDdbcM4Ju81AgNLseZUfU8Hz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602508830; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JY3Ndr1SwLa4aQQZxdcgHQ230u1S4q1Vxx6foe4GpMc=; b=mrDbVMeM+OgkYlPD+ODC17DJcDhlHauvBQ5ztiDxOzHtrunAKGTBohRid0AnJTL54HdiJxlHm8XGEKONMOLP/3b8uRhXXqPot9+bvFzYDk9dQa64a7IDPLPwGYi7a+WIF4T/4KeCCO6q1T+ciEvA9rJVTaBXBpmiDUWIrbHKRk4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.zohomail.com with SMTPS id 1602508830595625.8286589809233; Mon, 12 Oct 2020 06:20:30 -0700 (PDT) Received: by mail-wr1-f67.google.com with SMTP id n6so18872850wrm.13 for ; Mon, 12 Oct 2020 06:20:30 -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 e15sm24225544wro.13.2020.10.12.06.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 06:20:28 -0700 (PDT) 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=JY3Ndr1SwLa4aQQZxdcgHQ230u1S4q1Vxx6foe4GpMc=; b=UfKIX9DP7TdbRCKdltMfWLSqZVcuaV9jEDALi64LrB2vd/AZCJfsT7/t0Alf+/abJ5 rSp+ZQ6HQcrSrHFUmJDVgvCBF+Zx/whxLcSZzcfcsmRob1bAPJEQsbGul99w/ixzwiF7 zs4EpoAIsfXRmDcFH3Mz2sly0fEtcALfoDQP8PGDg5AUHS9NLyP5YZxbzevn3N8gA+Qd hSGpRXcEfiF73Fsy3tojxiCQl7vRXSYSWx0Zpq243Mh1bBrCnw3icwhEIWaoB5e9otAv d0sVlOdp65XKgUfOVtQUeDZ6fD/RlzVddHZZXbq/AYqIqm2c2QMss+R+v3B+S27i5E50 y8+g== 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=JY3Ndr1SwLa4aQQZxdcgHQ230u1S4q1Vxx6foe4GpMc=; b=Yjiz/n1+IUtMoZr2zPzJwl+iJnPv+cVjeD6+CFAKlJ5tB1ma2AMFAHKpGlKkvi2L/u 9SxYSiuMua4JdHbmKNQydv10RcfKmW1UZ+5x5LWj+/C9Ef5b5DRcrdFy7ih+sRsJD+TR n5rxH/9UV6brAvtuiY2OmmWviFOql85jK4y//mZCQdGB19AssBeDzcfr3LoKDiLPiWmJ becKNeHJsf+VV6TO+KYd7Zru6jfW+Cu4Zn5dfSCb78WbszfP/qIu67/Wwucrayr1UEvr JSDqm+GWoRI0kTOED+phzhM4yYqo1XPxiGbnJnG3mj3gAtqboFc7emWi4/FENcHTEi8K B4AQ== X-Gm-Message-State: AOAM531oL3P4yv0AmNJpWRWCAi2SIwlPhep3rS+tjT0TBVmVwKKgsDbW 405bAI6IUXylXqdjbIEQL5M= X-Google-Smtp-Source: ABdhPJxlJ5+SmRXQ6NUT6GWhDLb5a/5Azd/dn/M6f+cZh+THr/rzhNpfvScN2c9HMTr3Xl141DrgFA== X-Received: by 2002:adf:f10e:: with SMTP id r14mr28581151wro.337.1602508828801; Mon, 12 Oct 2020 06:20:28 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Peter Maydell , qemu-arm@nongnu.org, Aurelien Jarno , Aleksandar Markovic , Paolo Bonzini , Laurent Vivier , Thomas Huth , "Michael S. Tsirkin" , Marcel Apfelbaum , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/5] hw/pci-host/pam: Use ARRAY_SIZE() instead of magic value Date: Mon, 12 Oct 2020 15:20:13 +0200 Message-Id: <20201012132017.3423954-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201012132017.3423954-1-f4bug@amsat.org> References: <20201012132017.3423954-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) Replace the magic '4' by ARRAY_SIZE(mem->alias) which is more explicit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/pci-host/pam.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci-host/pam.c b/hw/pci-host/pam.c index a4962057833..4712260025a 100644 --- a/hw/pci-host/pam.c +++ b/hw/pci-host/pam.c @@ -51,7 +51,7 @@ void init_pam(DeviceState *dev, MemoryRegion *ram_memory, start, size); =20 memory_region_transaction_begin(); - for (i =3D 0; i < 4; ++i) { + for (i =3D 0; i < ARRAY_SIZE(mem->alias); ++i) { memory_region_set_enabled(&mem->alias[i], false); memory_region_add_subregion_overlap(system_memory, start, &mem->alias[i], 1); --=20 2.26.2 From nobody Fri May 10 10:04:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) client-ip=209.85.221.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602508835; cv=none; d=zohomail.com; s=zohoarc; b=Mz8j0zSHGEC2NROv2TIBvNUEzF6iCnRJ2UhIEOpze4rhDpNCbdg2MkbaDabtJVdeRG/OX1Qqaiht97CphcvnzOX+1+qWm2jpDL8kt8FZeZg4PY6a7uDQqbI1x7pLFF7cvGMuWnnaLFa3xaK0HT/63UT55Qr31F8UyZGTte8tOn4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602508835; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5dF+jf9n1DnItLemKMZxZtmjBoHnSoohLjejZPCpzDM=; b=BsiO7BDwF2+pGzCDRzTFoIShylAHZpXMynRQMKtVOl/pVrMgLwkxZhVSNByGLlo8OmUiR0ycrppHck8Z5gd04gzQcmd7vs7nt8ii/jFVDgpG+uV7J0IXXmYt6B/UjgMUFj7BrFXQsYGPv9HVqPXrchvayFQs23U2ALRUSBkGcRo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.zohomail.com with SMTPS id 1602508835859318.56571420376315; Mon, 12 Oct 2020 06:20:35 -0700 (PDT) Received: by mail-wr1-f67.google.com with SMTP id h5so9095042wrv.7 for ; Mon, 12 Oct 2020 06:20:35 -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 t83sm13254247wmf.39.2020.10.12.06.20.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 06:20:33 -0700 (PDT) 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=5dF+jf9n1DnItLemKMZxZtmjBoHnSoohLjejZPCpzDM=; b=Qc0XApVdKVP/lVruFXWfJNtjQXfReFRvr1+4yT68YiQ4PXMXy2VS+Tms8DIHpnd7WY 3IxqXaVf8NHprI9vBRJwHLg/Ir7knP79xD4PqkjT375/jOfMORusBYzhrZZ5RosRb+QD U1SphhdEAsKVfyQdrEqQwYq4OgE0gntIEj6LK1eh4k7kNb5hfU7CyJ6pK2RZ1Iyw+ZIw nBGoGO1Ccz+zkGeAo4+vjit+Ec6fFMWX+VWPe5vtNK/oSSBjXyxB2CXWnIIBww7AUabB MEfKFTTjlMGn3LsS/v5F1YP0iobEE2UXTGxcQwYK8w7IDDqVUMyWngLVYsE84ipnaVNG K2eA== 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=5dF+jf9n1DnItLemKMZxZtmjBoHnSoohLjejZPCpzDM=; b=sYjtIBaVZToiCE1bHNdJ63vMNOTsVjVII4WlUvEPlNAoBs4qBoxDC/ViCqcHiQdlIq wFJVcZ57gov3MD4Jk7urEneO1CGF/wjsSnvhydt4IoHdYVKNGGreSTcgNguXhD4zUvIS WhGupA5u8H9VzNt0hgmQ5i7w+k44HwCZft0q4/orpuxd/dj6mF3PgoNQGnfs9ovHEomO UYFcJwxJJ+5QGnznJnNcqKW5n3KCANT0lwN7SvR4/4VEC9BJN5nK+Qmpj8vkHioPstRw vh0QwzqcKlBgXS2Vwh0GhfnDfZdqN9h3PmCRF0Irzl44UKorLQlW4DmbWDBHH0pwu2jH VuRA== X-Gm-Message-State: AOAM532e2SkzhpnniD190xltO4HvoCtTnXz9RjjQSKukLhJ6ViZvlWnc xkuDx1hN7E8Si/LWIT0sqq4= X-Google-Smtp-Source: ABdhPJzuFfvT/aPXYbIwkUmlO0JDvtpdvDqrzOh3HrkhUhj3xmpcGd7J1NLZmPOoeJ2TBhNxXM61pg== X-Received: by 2002:a5d:6744:: with SMTP id l4mr30409135wrw.18.1602508833958; Mon, 12 Oct 2020 06:20:33 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Peter Maydell , qemu-arm@nongnu.org, Aurelien Jarno , Aleksandar Markovic , Paolo Bonzini , Laurent Vivier , Thomas Huth , "Michael S. Tsirkin" , Marcel Apfelbaum , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/5] hw/pci-host/versatile: Add the MEMORY_WINDOW_COUNT definition Date: Mon, 12 Oct 2020 15:20:14 +0200 Message-Id: <20201012132017.3423954-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201012132017.3423954-1-f4bug@amsat.org> References: <20201012132017.3423954-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) Note from Peter Maydell: The versatile/realview PCI controller has: * three memory windows in the system address space - those are represented by the pci_mem_window[] array - mem_win_size[] holds the size of each window (which is fixed but varies between the different implementations of this controller on different boards) - the device IMAPn registers allow the guest to configure the mapping from "a CPU access to an address in window n" to "a PCI address on the PCI bus, and our imap[] array holds those register values Use self-explicit MEMORY_WINDOW_COUNT definition instead of a magic value. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Reviewed-by: Richard Henderson --- hw/pci-host/versatile.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index b4951023f4e..61465bbbb65 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -72,6 +72,8 @@ enum { PCI_VPB_IRQMAP_FORCE_OK, }; =20 +#define MEMORY_WINDOW_COUNT 3 + struct PCIVPBState { PCIHostState parent_obj; =20 @@ -86,17 +88,17 @@ struct PCIVPBState { * The offsets into pci_mem_space are controlled by the imap registers. */ MemoryRegion pci_io_window; - MemoryRegion pci_mem_window[3]; + MemoryRegion pci_mem_window[MEMORY_WINDOW_COUNT]; PCIBus pci_bus; PCIDevice pci_dev; =20 /* Constant for life of device: */ int realview; - uint32_t mem_win_size[3]; + uint32_t mem_win_size[MEMORY_WINDOW_COUNT]; uint8_t irq_mapping_prop; =20 /* Variable state: */ - uint32_t imap[3]; + uint32_t imap[MEMORY_WINDOW_COUNT]; uint32_t smap[3]; uint32_t selfid; uint32_t flags; @@ -130,7 +132,7 @@ static void pci_vpb_update_all_windows(PCIVPBState *s) /* Update all alias windows based on the current register state */ int i; =20 - for (i =3D 0; i < 3; i++) { + for (i =3D 0; i < MEMORY_WINDOW_COUNT; i++) { pci_vpb_update_window(s, i); } } @@ -148,7 +150,7 @@ static const VMStateDescription pci_vpb_vmstate =3D { .minimum_version_id =3D 1, .post_load =3D pci_vpb_post_load, .fields =3D (VMStateField[]) { - VMSTATE_UINT32_ARRAY(imap, PCIVPBState, 3), + VMSTATE_UINT32_ARRAY(imap, PCIVPBState, MEMORY_WINDOW_COUNT), VMSTATE_UINT32_ARRAY(smap, PCIVPBState, 3), VMSTATE_UINT32(selfid, PCIVPBState), VMSTATE_UINT32(flags, PCIVPBState), @@ -370,10 +372,11 @@ static void pci_vpb_set_irq(void *opaque, int irq_num= , int level) static void pci_vpb_reset(DeviceState *d) { PCIVPBState *s =3D PCI_VPB(d); + int i; =20 - s->imap[0] =3D 0; - s->imap[1] =3D 0; - s->imap[2] =3D 0; + for (i =3D 0; i < MEMORY_WINDOW_COUNT; i++) { + s->imap[i] =3D 0; + } s->smap[0] =3D 0; s->smap[1] =3D 0; s->smap[2] =3D 0; @@ -453,7 +456,7 @@ static void pci_vpb_realize(DeviceState *dev, Error **e= rrp) * PCI memory space. The sizes vary from board to board; the base * offsets are guest controllable via the IMAP registers. */ - for (i =3D 0; i < 3; i++) { + for (i =3D 0; i < MEMORY_WINDOW_COUNT; i++) { memory_region_init_alias(&s->pci_mem_window[i], OBJECT(s), "pci-vb= p-window", &s->pci_mem_space, 0, s->mem_win_size[i]); sysbus_init_mmio(sbd, &s->pci_mem_window[i]); --=20 2.26.2 From nobody Fri May 10 10:04:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) client-ip=209.85.221.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602508840; cv=none; d=zohomail.com; s=zohoarc; b=e/9ydeyIU8KAPvZ5ytopHk+GUFcBXQCnQPhkFHuylh9jANM73AVUZC3MSuUIYQsYEKl8uTOgEsR+y4/osJ0ONzrbN/zo1zXYeHjcz+1diuTF5UQLGTyzdIc6z8LonIcu8ocistaqcof6Ejwb4ASz8zx2fy40NkRW2bLz9KC/ZOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602508840; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l+niQmlVPcXRSqM5Ozit1idIBmWDMllkBN++LzkycMM=; b=W68x8CnL30MULysIDaPyD1XQbM4f80kipAqID678XEq0wX+EmGj67Ro9lRjkw/bvdyIQ8iKWedZzl4k0geLZqvEYiCHswY2UUy5CJOE7+MEVUMNRSkCzrrlKq083XWL6VJ5Il3gsHRGcOztOm18nQOoQmxmimtSXobtfYCuqvvI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.zohomail.com with SMTPS id 1602508840826828.1230550925801; Mon, 12 Oct 2020 06:20:40 -0700 (PDT) Received: by mail-wr1-f67.google.com with SMTP id g12so19154654wrp.10 for ; Mon, 12 Oct 2020 06:20:40 -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 i9sm23447543wma.47.2020.10.12.06.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 06:20:38 -0700 (PDT) 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=l+niQmlVPcXRSqM5Ozit1idIBmWDMllkBN++LzkycMM=; b=KquxXBaZJQJsjqHeRh8a8xfg9wMBDetm89hSuTHIaLujbk5En1t8u4oVSh9nEdiDQG hxUYwnFsozlNAu5TsD3F4cZ1EyqF/llaHAgE8625xciRSPPAtOPJPf5AVEywKTj77cxB V1E2nsPJGIB59I6S1wP9PYzsIi4oXzFo07Mxz5N1Fi+jVPUpbDHi7tlm8uinscJ2A/DF UcYZ+A6QGwA2rM8QdT9Ox1x/SoSHVUOYl7vz8plRAswq1TIN2mSNilravqoy6/khQOrg aao3Zk4hKMeUCiUZr1xOg+nM6Dx1iMKIcTA1DKPmt1Jfs9coZm2V0Tsq1F//4z/p0EYn PAPQ== 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=l+niQmlVPcXRSqM5Ozit1idIBmWDMllkBN++LzkycMM=; b=Q/aMHLkmiKg/TuvokJuL110OBWLa2JjqMH5z8A/b6ngZBRGm1jtE+ynOxDjRaCz9rb 3fXYKg2acEGHHG2XL3pv2lGjic6jeVNLJ8leUjpth3FbM8TIXzUCQiFf1MTl3ld2KuIz rU7YEUhr8UoW4Z0FckHqFgeB9iCodNtsOlo+lWUu1m2dtKJKu2IzNnITvzQBJs6v1EFV vJCtchUpXOmmlMD/ubIEtWYgVumO7DkrJjt15qhsBJRQTk5A+EXd8dkvYJ4crrKCbo0Q LYkrLFITm2fPQgGX48IuMA1EVUpfYLqt79ZXMyi6j6RRXai9ploJTW6uQt4WCAtS5QX5 b31w== X-Gm-Message-State: AOAM532cr574dYCVLDPKAzl6FXrW+yiLP7IrwxGV8Tw4q1n2N2sqyLOQ 5AkFez44cy1CUoKWfaVUu0o= X-Google-Smtp-Source: ABdhPJzQSYeVVj/X0YNkvfLUTK7SSwanonoWkoxrFBU+Bj3edBw7P93YQdbzh8xmcy18e4e27Fj+6Q== X-Received: by 2002:adf:e4c9:: with SMTP id v9mr29257193wrm.375.1602508838768; Mon, 12 Oct 2020 06:20:38 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Peter Maydell , qemu-arm@nongnu.org, Aurelien Jarno , Aleksandar Markovic , Paolo Bonzini , Laurent Vivier , Thomas Huth , "Michael S. Tsirkin" , Marcel Apfelbaum , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/5] hw/pci-host/versatile: Add the PCI_BAR_COUNT definition Date: Mon, 12 Oct 2020 15:20:15 +0200 Message-Id: <20201012132017.3423954-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201012132017.3423954-1-f4bug@amsat.org> References: <20201012132017.3423954-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) Note from Peter Maydell: The versatile/realview PCI controller has: * three PCI BARs which represent memory windows on the PCI bus which bus-master PCI devices can use to write back into the system address space - the device SMAPn registers allow the guest to configure the mapping from "a bus-master access to an address on the PCI bus wherever the guest mapped BAR n" to "a system address", and the smap[] array holds those register values Use self-explicit PCI_BAR_COUNT definition instead of a magic value, and rename some misnamed variables indexing the smap[] array from 'win' to 'bar'. Reported-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Reviewed-by: Richard Henderson --- hw/pci-host/versatile.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 61465bbbb65..f5846b803c0 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -73,6 +73,7 @@ enum { }; =20 #define MEMORY_WINDOW_COUNT 3 +#define PCI_BAR_COUNT 3 =20 struct PCIVPBState { PCIHostState parent_obj; @@ -99,7 +100,7 @@ struct PCIVPBState { =20 /* Variable state: */ uint32_t imap[MEMORY_WINDOW_COUNT]; - uint32_t smap[3]; + uint32_t smap[PCI_BAR_COUNT]; uint32_t selfid; uint32_t flags; uint8_t irq_mapping; @@ -151,7 +152,7 @@ static const VMStateDescription pci_vpb_vmstate =3D { .post_load =3D pci_vpb_post_load, .fields =3D (VMStateField[]) { VMSTATE_UINT32_ARRAY(imap, PCIVPBState, MEMORY_WINDOW_COUNT), - VMSTATE_UINT32_ARRAY(smap, PCIVPBState, 3), + VMSTATE_UINT32_ARRAY(smap, PCIVPBState, PCI_BAR_COUNT), VMSTATE_UINT32(selfid, PCIVPBState), VMSTATE_UINT32(flags, PCIVPBState), VMSTATE_UINT8(irq_mapping, PCIVPBState), @@ -203,8 +204,8 @@ static void pci_vpb_reg_write(void *opaque, hwaddr addr, case PCI_SMAP1: case PCI_SMAP2: { - int win =3D (addr - PCI_SMAP0) >> 2; - s->smap[win] =3D val; + int bar =3D (addr - PCI_SMAP0) >> 2; + s->smap[bar] =3D val; break; } default: @@ -235,8 +236,8 @@ static uint64_t pci_vpb_reg_read(void *opaque, hwaddr a= ddr, case PCI_SMAP1: case PCI_SMAP2: { - int win =3D (addr - PCI_SMAP0) >> 2; - return s->smap[win]; + int bar =3D (addr - PCI_SMAP0) >> 2; + return s->smap[bar]; } default: qemu_log_mask(LOG_GUEST_ERROR, @@ -377,9 +378,9 @@ static void pci_vpb_reset(DeviceState *d) for (i =3D 0; i < MEMORY_WINDOW_COUNT; i++) { s->imap[i] =3D 0; } - s->smap[0] =3D 0; - s->smap[1] =3D 0; - s->smap[2] =3D 0; + for (i =3D 0; i < PCI_BAR_COUNT; i++) { + s->smap[i] =3D 0; + } s->selfid =3D 0; s->flags =3D 0; s->irq_mapping =3D s->irq_mapping_prop; --=20 2.26.2 From nobody Fri May 10 10:04:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) client-ip=209.85.221.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602508845; cv=none; d=zohomail.com; s=zohoarc; b=iRJn4sQNaynA9JoMD1DWELhN0PhjnCjp6skkg01YwZbCJJGwec0oM25pfuOg3A4UsEo5WodMmOT1TkhQf8zCOEe1f9Nz+WkMfWljmqb82pJubXuaFbOtZXNLeHyG6iXOs9HqW2W2lFkd9j7+REAAY6qLNuWGkJ98RDWSVa7pxq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602508845; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=S+qJmTO5tJK+xMnKaeXjrUuhIrSEH6LdhmvHFkUYTME=; b=R/8CJXR/2assPDN+AzOwM68xvFdfIYteDNhkYXgRXOzmUlmx7d3jQ50LKORUhGjFCrIP1P2vibhqIoq+WPMwP+thKSJP7dZdrkGc95+b96ifIh76Ej1/s84eqvXQgl0SXe/R3QZw0ZHetl21myRgerJ4q9UQr0TPNIjio0oLWAY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.zohomail.com with SMTPS id 1602508845859708.9047833255357; Mon, 12 Oct 2020 06:20:45 -0700 (PDT) Received: by mail-wr1-f67.google.com with SMTP id g12so19154979wrp.10 for ; Mon, 12 Oct 2020 06:20:45 -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 z11sm24584887wrh.70.2020.10.12.06.20.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 06:20:43 -0700 (PDT) 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=S+qJmTO5tJK+xMnKaeXjrUuhIrSEH6LdhmvHFkUYTME=; b=NzEihUgmUX90wUWF8yPl3KUdmgxbrrsxWFlwmP01b5/BkqfCq8hq7WOA3Lvb8dzhV5 za57HvFyPDuaKgajcR6oUSZZkCPHmZe19fH762COV58rtDh4Jzuw36FGmSSacc7QJK1I Te+v3sqLptPFly/u060MHQUZjYS0Lxod77ymSbx1Bpv8QULfXMv25RDDEjLbbuw5KKke 2fU/qarmB4O9H2aK9GFIz+icXuXF2OFIfPB0zfHosd0CmbqO4LftlwWlACreJnMIGGkr ZO1z6lu0vyypGjR36kT7jqZsXik6RfZA/kAaWiFj81D7x9/LM4xoXuunay7ik5athDfx tSyA== 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=S+qJmTO5tJK+xMnKaeXjrUuhIrSEH6LdhmvHFkUYTME=; b=YuSpTesYmyWRxBBandU4FjhrVJkLbiJfCeLUD+rphVIdxE3uBUoBuRRs71VlJP06aC AZiUfat4kTBFrKgd7Q0v+denSWVYpxwX8D/LfH5U3qV9StUGOSuTkynrPBMpC3KTLgKt FvAHqV27bWzjNbjisehGvmcuHW/Wo3Vna92Mtl5WJKW+QNFYBxKn1IHpAxyS6xcg7zIg /+jeCQkfx0T1QniV3n3hcqcaiZ3xrd1o7HoIFKUdIt5dxv2SoDhn1WiL1wIiHJC7iHmA s4dYNYpKlf/q0KE/nqgMZUbnt5gLwoe0dWemJeTMdAQpFKUk8FGZ5CYF8X0tngSYVYUn tyTw== X-Gm-Message-State: AOAM531+oFjz62zAHpHuiM4pVI84EdZ9ba9AVIvjrKpOVKmUifULkJ5n /2oARcIdzcj3tOGRy9nywUM= X-Google-Smtp-Source: ABdhPJxGw8nKoBf1Vz8InNroMZ38P9rTS1LCT/KEDodfanlwQgbVkZ20zwoBh17DCknoLjWkm5yVGw== X-Received: by 2002:a5d:568a:: with SMTP id f10mr29542247wrv.30.1602508843929; Mon, 12 Oct 2020 06:20:43 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Peter Maydell , qemu-arm@nongnu.org, Aurelien Jarno , Aleksandar Markovic , Paolo Bonzini , Laurent Vivier , Thomas Huth , "Michael S. Tsirkin" , Marcel Apfelbaum , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 5/5] tests/qtest: Replace magic value by NANOSECONDS_PER_SECOND definition Date: Mon, 12 Oct 2020 15:20:16 +0200 Message-Id: <20201012132017.3423954-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201012132017.3423954-1-f4bug@amsat.org> References: <20201012132017.3423954-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) Use self-explicit NANOSECONDS_PER_SECOND definition instead of a magic value. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tests/qtest/rtc-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/rtc-test.c b/tests/qtest/rtc-test.c index c7af34f6b1b..402ce2c6090 100644 --- a/tests/qtest/rtc-test.c +++ b/tests/qtest/rtc-test.c @@ -292,7 +292,7 @@ static void alarm_time(void) break; } =20 - clock_step(1000000000); + clock_step(NANOSECONDS_PER_SECOND); } =20 g_assert(get_irq(RTC_ISA_IRQ)); --=20 2.26.2