From nobody Tue May 7 18:23:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) client-ip=209.85.221.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1600079069; cv=none; d=zohomail.com; s=zohoarc; b=ffztNkG2LpXwdFl0yowzpSxenV+vkbcRjyxpk02ccJF++p/BZCUulqx/82kaTXpN+3Vpkyqn+KbPTeb6oDaGP36HWKIvt0XIeeapzbkF7jk+jm4GvyztrNYp4I9bSgTxYi9TKE+MGPu9FqtDdm4Hjb0+RmiYV2rrU5DgNbZ2eSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600079069; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=xdg3/apUjZJVOlOfnD/BCFpWvd7I8+hMge8okefApw8=; b=BaizK5n4i2UagLNgO+Xxudjij+zCMlRf2POGzzmqpLonwfYqZkTHKgBFvoWBz8I6yr2r9A2e+QWAxsMpdTENXMn6eqnHLebsuJORGkJhm9LsqezFzNFHYe5cH/nULh3+PbVCiBUQ7yMP4RAvJqBIdEHbrQ0v7qqoAUbnMbt1KVg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.zohomail.com with SMTPS id 1600079069792271.21464494040345; Mon, 14 Sep 2020 03:24:29 -0700 (PDT) Received: by mail-wr1-f65.google.com with SMTP id c18so18069606wrm.9 for ; Mon, 14 Sep 2020 03:24:29 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id y6sm19949427wrn.41.2020.09.14.03.24.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2020 03:24:27 -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:mime-version :content-transfer-encoding; bh=xdg3/apUjZJVOlOfnD/BCFpWvd7I8+hMge8okefApw8=; b=LLQzDrtbolAP58qXEfMDXnXdeehVqPXF927w/ej9VNt5PlBoX6iFuO8QwRpew5qtH9 UNhE/y2FJNjK+WbXPgpgjqtPcPiNhrcaMVBnJcQJezcaBGlVDZEzJzPtR9HfMm8JaHJH tk2H932yaNHff7v0EGJLxNsDcSPx1UietwZm96foNV3h5LP8vCJE2f69huJpKc36Z/2U BaHDbohFZ0HlE29FNHfDapoIlL0d1+gwWNdug429NWxSn/7oVmY7H/FllQpI9nMoLnbb yZAgj6DUwH6xQzba+TUPKpyXg6zUHzC5iuiVehYo9qBeMK/+ulhbpdwZfPCQY7HG/NbW q5Bg== 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 :mime-version:content-transfer-encoding; bh=xdg3/apUjZJVOlOfnD/BCFpWvd7I8+hMge8okefApw8=; b=L5haMVJQQhfkhvTAa34rbXDxH+f8ES/kWVkOwtcolZ29CPYzBZ/GMLJaZGZpfr97s/ DTt1kXpuQE+MMGyCpbQaa3dBTsq1bvXBtwSPXb9u4Imd+utkEltHsqpT4QvFipxkSj82 nMLjbuXwhBrF0Jg47fwCQ1/ZzNCFIjZiTAVXqd8SM01TjIZCWdKktLHY30utRW1rOI2C fVNAshPJGpj/alT1xkPM6oXb8dPeZEAzYm3beSFn8mly7XUVE2XjQp4bNxnG7Oq0LhN3 M16NViiMWhCsQl4YGeXgIrXWmyXx81F4dBf0KUs96XkqGMFmfHNTmh7yPlVmbsG3b28d NyhQ== X-Gm-Message-State: AOAM531DhmMP2FXCTsIG0g9uGSiQZE20MsFU/w5U/y3vClcxAaRdDgaL u+5NLUjrU2d/OGE0t/f6GBZaQpXpQZg= X-Google-Smtp-Source: ABdhPJw4tpOwP678ZA/c2uO1eEhmKtOGTtnK96uKN5O/i2S5TqO/v3mKhjNzUP6WrVCTwohdxiCMAw== X-Received: by 2002:adf:f852:: with SMTP id d18mr15134677wrq.245.1600079067975; Mon, 14 Sep 2020 03:24:27 -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: qemu-ppc@nongnu.org, qemu-trivial@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Artyom Tarasenko , David Gibson , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] hw/rtc/m48t59: Simplify m48t59_init() Date: Mon, 14 Sep 2020 12:24:25 +0200 Message-Id: <20200914102425.1152962-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) As the 'io_base' argument of m48t59_init() is unused (set to 0), remove it to simplify. To create a device on the ISA bus, m48t59_init_isa() is the preferred function to use. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson Reviewed-by: Mark Cave-Ayland --- include/hw/rtc/m48t59.h | 2 +- hw/ppc/ppc405_boards.c | 2 +- hw/rtc/m48t59.c | 10 ++-------- hw/sparc/sun4m.c | 2 +- hw/sparc64/sun4u.c | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/include/hw/rtc/m48t59.h b/include/hw/rtc/m48t59.h index 04abedf3b2b..62297ee0db1 100644 --- a/include/hw/rtc/m48t59.h +++ b/include/hw/rtc/m48t59.h @@ -50,7 +50,7 @@ struct NvramClass { Nvram *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size, int base_year, int type); Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base, - uint32_t io_base, uint16_t size, int base_year, + uint16_t size, int base_year, int type); =20 #endif /* HW_M48T59_H */ diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index 6198ec1035b..93ffee801a3 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -227,7 +227,7 @@ static void ref405ep_init(MachineState *machine) /* Register FPGA */ ref405ep_fpga_init(sysmem, 0xF0300000); /* Register NVRAM */ - m48t59_init(NULL, 0xF0000000, 0, 8192, 1968, 8); + m48t59_init(NULL, 0xF0000000, 8192, 1968, 8); /* Load kernel */ linux_boot =3D (kernel_filename !=3D NULL); if (linux_boot) { diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c index 6525206976b..2d6a095c4e4 100644 --- a/hw/rtc/m48t59.c +++ b/hw/rtc/m48t59.c @@ -566,7 +566,7 @@ const MemoryRegionOps m48t59_io_ops =3D { =20 /* Initialisation routine */ Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base, - uint32_t io_base, uint16_t size, int base_year, + uint16_t size, int base_year, int model) { DeviceState *dev; @@ -584,13 +584,7 @@ Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base, s =3D SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(s, &error_fatal); sysbus_connect_irq(s, 0, IRQ); - if (io_base !=3D 0) { - memory_region_add_subregion(get_system_io(), io_base, - sysbus_mmio_get_region(s, 1)); - } - if (mem_base !=3D 0) { - sysbus_mmio_map(s, 0, mem_base); - } + sysbus_mmio_map(s, 0, mem_base); =20 return NVRAM(s); } diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 947b69d1597..56a0d38f274 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -970,7 +970,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwd= ef, create_unimplemented_device("SUNW,sx", hwdef->sx_base, 0x2000); } =20 - nvram =3D m48t59_init(slavio_irq[0], hwdef->nvram_base, 0, 0x2000, 196= 8, 8); + nvram =3D m48t59_init(slavio_irq[0], hwdef->nvram_base, 0x2000, 1968, = 8); =20 slavio_timer_init_all(hwdef->counter_base, slavio_irq[19], slavio_cpu_= irq, smp_cpus); =20 diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index b4aabfc076f..1cc57b030a7 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -675,7 +675,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, pci_ide_create_devs(pci_dev); =20 /* Map NVRAM into I/O (ebus) space */ - nvram =3D m48t59_init(NULL, 0, 0, NVRAM_SIZE, 1968, 59); + nvram =3D m48t59_init(NULL, 0, NVRAM_SIZE, 1968, 59); s =3D SYS_BUS_DEVICE(nvram); memory_region_add_subregion(pci_address_space_io(ebus), 0x2000, sysbus_mmio_get_region(s, 0)); --=20 2.26.2