From nobody Sun Nov 24 09:26:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1725378052433160.03962709608334; Tue, 3 Sep 2024 08:40:52 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 475D414D7; Tue, 3 Sep 2024 11:40:51 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E58C413D1; Tue, 3 Sep 2024 11:40:22 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9464E1323; Tue, 3 Sep 2024 11:40:18 -0400 (EDT) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 364CD1474 for ; Tue, 3 Sep 2024 11:40:07 -0400 (EDT) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-42bbbff40bbso37150235e9.2 for ; Tue, 03 Sep 2024 08:40:07 -0700 (PDT) Received: from localhost.localdomain ([78.196.4.158]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42bb6df0f36sm175700385e9.16.2024.09.03.08.40.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 03 Sep 2024 08:40:05 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725378006; x=1725982806; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YmFP7qxHZAeN5GH61EDlt1S9+An3S8nE9csQzpz0GyQ=; b=zocuzl6UDEcMUODQvoFjA9Fq8D0z16+ZscVf4niuh0oh583YMRmSn6M2IgDYIjrye9 PqQKMCLDchMGQEbYALERYGBIBNUYaomDGlGy6flMhlhzSZFUXxBc1gySUIoLdCEtZXBy 7yArgMnVnVWQhd4jgnDnZmmPcPvQceHsLWEZf6qnlwYuG8s6/y3FYyrKROTAMYMBsyIu nTtWOnscRNwXDPP/xqTJwr4Alaw1VCD9nNKi+wyEw72KU7jzslI4ibrs483a4zvMP1Yx QqbyqpZuSIPMsnpTVJQomsfqhKrsx2yEmOAv70Cd2SVEUlCzpl7bXPfV36mPikkfKF9b peuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725378006; x=1725982806; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YmFP7qxHZAeN5GH61EDlt1S9+An3S8nE9csQzpz0GyQ=; b=iobBi+8nM01Gx2KO4Av+eG82G/Jj095DDAe0gISbbyhI0ug0xTxumkBDHcNi+96J7O MpX5qzZBbN+/jkrnZThdEgMLziHy7hPxCRq7MYpTNdNEyYGRGf35Y2jXRJIWvro+aKkk 30s6odzy0sganUOip2PJg6MGOT3QvcJpgegtiDx9xcEBBxkb99Wcc8UF4Y5G1XfWbgB6 0GSdjW8FL7voC2C4gJrOn7ZTHNBDyYSo3VovIU+gGE0KLUARWNcsCg/dHh3yYg6kkdAl /9/YxHUGLVWqN+K3cGnQ6yEm374mIVl6s45G4MCSg7XANo6Sf0hcrGSTTMZdTvCNyBBJ KmZg== X-Gm-Message-State: AOJu0Yw2u2Nug2spV8Be7MctRSTmNV6dun08tlk/6Km+58YcipqaHbKo 6zNMcmnrMVwDYY//qZyUT6eZ/2iDQZ5jTd+u2IW/2Gqe9zRVnvo/wrkBux7T3vM= X-Google-Smtp-Source: AGHT+IFTriD7h+oHIYpEIeNtLSMNe24G1bCrHy5prf7RaKqK2Dvwz4cWCPU4sohKbKVSF7z6lUtFWQ== X-Received: by 2002:a05:600c:4683:b0:427:ac40:d4b1 with SMTP id 5b1f17b1804b1-42bbb436e2emr107038485e9.27.1725378005915; Tue, 03 Sep 2024 08:40:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Samuel Tardieu , qemu-devel@nongnu.org Subject: [PATCH 1/3] hw/sh4: Remove the deprecated SHIX machine Date: Tue, 3 Sep 2024 17:39:57 +0200 Message-ID: <20240903153959.18392-2-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240903153959.18392-1-philmd@linaro.org> References: <20240903153959.18392-1-philmd@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: BSRKEWYPVSKEIJXNBUXSQCEK5DV7657H X-Message-ID-Hash: BSRKEWYPVSKEIJXNBUXSQCEK5DV7657H X-MailFrom: philmd@linaro.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 CC: devel@lists.libvirt.org, Magnus Damm , qemu-block@nongnu.org, Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1725378053475116600 Content-Type: text/plain; charset="utf-8" The SHIX machine is deprecated since v9.0 (commit 322b038c94 "target/sh4: Deprecate the shix machine"). Time to remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 7 +- docs/about/deprecated.rst | 6 -- docs/about/removed-features.rst | 5 ++ configs/devices/sh4-softmmu/default.mak | 1 - hw/sh4/shix.c | 86 ------------------------- hw/sh4/Kconfig | 7 -- hw/sh4/meson.build | 1 - 7 files changed, 6 insertions(+), 107 deletions(-) delete mode 100644 hw/sh4/shix.c diff --git a/MAINTAINERS b/MAINTAINERS index 3584d6a6c6..c8e4e3329c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1676,16 +1676,11 @@ F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h F: include/hw/timer/tmu012.h =20 -Shix +TC58128 NAND EEPROM R: Yoshinori Sato R: Magnus Damm S: Odd Fixes F: hw/block/tc58128.c -F: hw/char/sh_serial.c -F: hw/sh4/shix.c -F: hw/intc/sh_intc.c -F: hw/timer/sh_timer.c -F: include/hw/sh4/sh_intc.h =20 SPARC Machines -------------- diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 88f0f03786..2020542a6b 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -232,12 +232,6 @@ These old machine types are quite neglected nowadays a= nd thus might have various pitfalls with regards to live migration. Use a newer machine type instead. =20 -``shix`` (since 9.0) -'''''''''''''''''''' - -The machine is no longer in existence and has been long unmaintained -in QEMU. This also holds for the TC51828 16MiB flash that it uses. - ``pseries-2.1`` up to ``pseries-2.12`` (since 9.0) '''''''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index fc7b28e637..9eaf864004 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -978,6 +978,11 @@ Nios II ``10m50-ghrd`` and ``nios2-generic-nommu`` mac= hines (removed in 9.1) =20 The Nios II architecture was orphan. =20 +``shix`` (removed in 9.2) +''''''''''''''''''''''''' + +The machine was unmaintained. + linux-user mode CPUs -------------------- =20 diff --git a/configs/devices/sh4-softmmu/default.mak b/configs/devices/sh4-= softmmu/default.mak index c06a427053..aa821e4b60 100644 --- a/configs/devices/sh4-softmmu/default.mak +++ b/configs/devices/sh4-softmmu/default.mak @@ -7,4 +7,3 @@ =20 # Boards are selected by default, uncomment to keep out of the build. # CONFIG_R2D=3Dn -# CONFIG_SHIX=3Dn diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c deleted file mode 100644 index eb3150b5bc..0000000000 --- a/hw/sh4/shix.c +++ /dev/null @@ -1,86 +0,0 @@ -/* - * SHIX 2.0 board description - * - * Copyright (c) 2005 Samuel Tardieu - * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN - * THE SOFTWARE. - */ -/* - * Shix 2.0 board by Alexis Polti, described at - * https://web.archive.org/web/20070917001736/perso.enst.fr/~polti/realisa= tions/shix20 - * - * More information in target/sh4/README.sh4 - */ -#include "qemu/osdep.h" -#include "qapi/error.h" -#include "cpu.h" -#include "hw/sh4/sh.h" -#include "sysemu/qtest.h" -#include "hw/boards.h" -#include "hw/loader.h" -#include "qemu/error-report.h" - -#define BIOS_FILENAME "shix_bios.bin" -#define BIOS_ADDRESS 0xA0000000 - -static void shix_init(MachineState *machine) -{ - int ret; - SuperHCPU *cpu; - struct SH7750State *s; - MemoryRegion *sysmem =3D get_system_memory(); - MemoryRegion *rom =3D g_new(MemoryRegion, 1); - MemoryRegion *sdram =3D g_new(MemoryRegion, 2); - const char *bios_name =3D machine->firmware ?: BIOS_FILENAME; - - cpu =3D SUPERH_CPU(cpu_create(machine->cpu_type)); - - /* Allocate memory space */ - memory_region_init_rom(rom, NULL, "shix.rom", 0x4000, &error_fatal); - memory_region_add_subregion(sysmem, 0x00000000, rom); - memory_region_init_ram(&sdram[0], NULL, "shix.sdram1", 0x01000000, - &error_fatal); - memory_region_add_subregion(sysmem, 0x08000000, &sdram[0]); - memory_region_init_ram(&sdram[1], NULL, "shix.sdram2", 0x01000000, - &error_fatal); - memory_region_add_subregion(sysmem, 0x0c000000, &sdram[1]); - - /* Load BIOS in 0 (and access it through P2, 0xA0000000) */ - ret =3D load_image_targphys(bios_name, 0, 0x4000); - if (ret < 0 && !qtest_enabled()) { - error_report("Could not load SHIX bios '%s'", bios_name); - exit(1); - } - - /* Register peripherals */ - s =3D sh7750_init(cpu, sysmem); - /* XXXXX Check success */ - tc58128_init(s, "shix_linux_nand.bin", NULL); -} - -static void shix_machine_init(MachineClass *mc) -{ - mc->desc =3D "shix card"; - mc->init =3D shix_init; - mc->is_default =3D true; - mc->default_cpu_type =3D TYPE_SH7750R_CPU; - mc->deprecation_reason =3D "old and unmaintained"; -} - -DEFINE_MACHINE("shix", shix_machine_init) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 99a76a94c3..1660d292d5 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -13,13 +13,6 @@ config R2D select SH7750 select SH_PCI =20 -config SHIX - bool - default y - depends on SH4 - select SH7750 - select TC58128 - config SH7750 bool select SH_INTC diff --git a/hw/sh4/meson.build b/hw/sh4/meson.build index 70e814c3a2..7d27839fee 100644 --- a/hw/sh4/meson.build +++ b/hw/sh4/meson.build @@ -4,6 +4,5 @@ sh4_ss.add(when: 'CONFIG_SH7750', if_true: files( 'sh7750_regnames.c', )) sh4_ss.add(when: 'CONFIG_R2D', if_true: files('r2d.c')) -sh4_ss.add(when: 'CONFIG_SHIX', if_true: files('shix.c')) =20 hw_arch +=3D {'sh4': sh4_ss} --=20 2.45.2