From nobody Tue Jan 21 08:31:48 2025
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: <devel-bounces@lists.libvirt.org>
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 <devel@lists.libvirt.org>; Tue,  3 Sep 2024 11:40:07 -0400 (EDT)
Received: by mail-wm1-f48.google.com with SMTP id
 5b1f17b1804b1-42bbbff40bbso37150235e9.2
        for <devel@lists.libvirt.org>; 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?= <philmd@linaro.org>
To: Samuel Tardieu <sam@rfc1149.net>,
	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 <magnus.damm@gmail.com>,
 qemu-block@nongnu.org, Yoshinori Sato <ysato@users.sourceforge.jp>,
 =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/BSRKEWYPVSKEIJXNBUXSQCEK5DV7657H/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
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 <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
 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 <ysato@users.sourceforge.jp>
 R: Magnus Damm <magnus.damm@gmail.com>
 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
From nobody Tue Jan 21 08:31:48 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
 permitted sender)
  smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
	dmarc=pass(p=none dis=none)  header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1725378072; cv=none;
	d=zohomail.com; s=zohoarc;
	b=iXgMbAJc6X3MtuuELviXkUTb8GLpRuE3IVdQcSucaSCkCod3SEoaHMctejb3RXL3Zs1eGgDHndl9WgKyvG3cLC8xC0/cxYIFpkDeZOv2Tk7Y/EgTBxzsn3V6PO06/H4yOhsTlfBm4ai0wHufttckq8hOvnpUfIUFD6X16H3IY/M=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1725378072;
 h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
	bh=Gq81OzY4iMM1Td9sT8YiUCw5rHsCA7uPrMTvhOIEyE8=;
	b=cdRcHQjKjnNlaztlkY3E7bXL+1Uu2p2fvSFca5GQ75452YJtXhDTlyeFQrcJ/WG4xcHncbgR/RYaQUcsi7+g9MWboNpUPbJgXIapfrCrmnnccn1dpXGrG+eGcZNkplSwgLf5fF1P6xsy/Zwbh6jgbNZ46+diPlknk4Dp4ZIoftk=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
 permitted sender)
  smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
	dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
 mx.zohomail.com
	with SMTPS id 1725378071994317.415452916346;
 Tue, 3 Sep 2024 08:41:11 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <qemu-devel-bounces@nongnu.org>)
	id 1slVdu-0003TM-DG; Tue, 03 Sep 2024 11:40:30 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1slVdq-0003B2-1r
 for qemu-devel@nongnu.org; Tue, 03 Sep 2024 11:40:27 -0400
Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1slVdn-0006RS-Ts
 for qemu-devel@nongnu.org; Tue, 03 Sep 2024 11:40:25 -0400
Received: by mail-wr1-x42e.google.com with SMTP id
 ffacd0b85a97d-374bd059b12so2044529f8f.1
 for <qemu-devel@nongnu.org>; Tue, 03 Sep 2024 08:40:23 -0700 (PDT)
Received: from localhost.localdomain ([78.196.4.158])
 by smtp.gmail.com with ESMTPSA id
 ffacd0b85a97d-374d00564b6sm4478327f8f.91.2024.09.03.08.40.09
 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
 Tue, 03 Sep 2024 08:40:10 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=linaro.org; s=google; t=1725378011; x=1725982811; darn=nongnu.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=Gq81OzY4iMM1Td9sT8YiUCw5rHsCA7uPrMTvhOIEyE8=;
 b=V7/2v5EalWA+iytdvBT+W4/KFz0udCoePaO6QQWWNxtJ7lIiOGt2qhi9wIOLXcUK+4
 /ohjTvtQIfpgrwOOV0m6uQPprGEzkrT8207xb/UtIL0FxN7jxuM6QRmjDwilYzMnS+PS
 6vawsKJ3CIrIaB8zoxrEm9QQgleq95CNoI8jGviB/4yfdkN2d4ApQaRs0EpxPIgDZbc4
 O0ktckJyJhCvJLDspkr+dfxvrwRiSGvUgcAZtoXEp86ZufWfYq0gYld1WyrZAR/kLgTd
 HBLhhaEQKq/scM55vMxnEXdxszvxrL70I0qqKO4Og/7yv269vLToweZnW4VlgvviI0Vn
 9+1Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1725378011; x=1725982811;
 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=Gq81OzY4iMM1Td9sT8YiUCw5rHsCA7uPrMTvhOIEyE8=;
 b=PECcRhJJDljLmyU1GzKK8aCB4Nmm009ke9+32bwbULP+9BmP2usESi8oa37jGrW2Xv
 o9aehCwL9OnaSW4/xYdAPsnieDZQ3BiD0ymHVeMOQNVlq1WUp/2tNF/Ro00dkTPNm8om
 /ceBMhYAVdksyMTJm53qVdCkON02pG4Py7AAbuk2qJsmnYI1Ymbp4U8bvdMXlp6TfBE0
 EE6DgzPMbACWTdo7jo7/vUOgfyAiztGf4hzccjqsLkX62c+Y9rnv13Jrgobz2YDVqg+c
 +92RMzsLmTNSMd0ZDoQnHWLRhptUKuvCjkCXdXSxir0wn9M9zS2zvGgzjlRlCSmJjzoE
 X6kQ==
X-Forwarded-Encrypted: i=1;
 AJvYcCWYhv2KDrPM7tEgqsloiglToG2T9YBCSi5KwPFl1k7NW+BTdjrQBFpPSaY6S/FXzLRvXctimSiJ7OPA@nongnu.org
X-Gm-Message-State: AOJu0Ywyrx49zjGoBfSaLqNHuIDXLbCVtgkj1Upo4ZYXh9uIIHBYGfyA
 5+BxoD64fH/nfYI3SF9csX1AfOngMem9W40jY8dhONqInlwqMnUPJV+QLRVIdz0=
X-Google-Smtp-Source: 
 AGHT+IGFEW+M9uWXAUG0ZPT7rovqlNfppWr4tOmeYmruBzVExbvlQlIpTNZlUlA7edzwYrMhHmStQw==
X-Received: by 2002:adf:e6ce:0:b0:377:2df4:55f6 with SMTP id
 ffacd0b85a97d-3772df4571fmr115273f8f.17.1725378010531;
 Tue, 03 Sep 2024 08:40:10 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: Samuel Tardieu <sam@rfc1149.net>,
	qemu-devel@nongnu.org
Cc: devel@lists.libvirt.org, Magnus Damm <magnus.damm@gmail.com>,
 qemu-block@nongnu.org, Yoshinori Sato <ysato@users.sourceforge.jp>,
 =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 2/3] hw/block: Remove TC58128 NAND EEPROM
Date: Tue,  3 Sep 2024 17:39:58 +0200
Message-ID: <20240903153959.18392-3-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-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
 as permitted sender) client-ip=209.51.188.17;
 envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
 helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::42e;
 envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
 T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1725378073709116600

The TC58128 NAND EEPROM is not user creatable and
needs to be instanciated in the code via tc58128_init().

Only the SHIX machine was using it, and it was removed
in the previous commit. Since the TC58128 has no more
users, remove it too.

Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
 MAINTAINERS          |   6 --
 include/hw/sh4/sh.h  |   3 -
 hw/block/tc58128.c   | 211 -------------------------------------------
 hw/block/Kconfig     |   3 -
 hw/block/meson.build |   1 -
 5 files changed, 224 deletions(-)
 delete mode 100644 hw/block/tc58128.c

diff --git a/MAINTAINERS b/MAINTAINERS
index c8e4e3329c..55f41ecbc4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1676,12 +1676,6 @@ F: hw/timer/sh_timer.c
 F: include/hw/sh4/sh_intc.h
 F: include/hw/timer/tmu012.h
=20
-TC58128 NAND EEPROM
-R: Yoshinori Sato <ysato@users.sourceforge.jp>
-R: Magnus Damm <magnus.damm@gmail.com>
-S: Odd Fixes
-F: hw/block/tc58128.c
-
 SPARC Machines
 --------------
 Sun4m
diff --git a/include/hw/sh4/sh.h b/include/hw/sh4/sh.h
index ec716cdd45..b726b987cc 100644
--- a/include/hw/sh4/sh.h
+++ b/include/hw/sh4/sh.h
@@ -60,7 +60,4 @@ int sh7750_register_io_device(struct SH7750State *s,
 /* sh7750.c */
 qemu_irq sh7750_irl(struct SH7750State *s);
=20
-/* tc58128.c */
-int tc58128_init(struct SH7750State *s, const char *zone1, const char *zon=
e2);
-
 #endif
diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c
deleted file mode 100644
index 0984e37417..0000000000
--- a/hw/block/tc58128.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * TC58128 NAND EEPROM emulation
- *
- * 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 (including the ne=
xt
- * paragraph) shall be included in all copies or substantial portions of t=
he
- * 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.
- *
- * SPDX-License-Identifier: MIT
- */
-#include "qemu/osdep.h"
-#include "qemu/units.h"
-#include "hw/sh4/sh.h"
-#include "hw/loader.h"
-#include "sysemu/qtest.h"
-#include "qemu/error-report.h"
-
-#define CE1  0x0100
-#define CE2  0x0200
-#define RE   0x0400
-#define WE   0x0800
-#define ALE  0x1000
-#define CLE  0x2000
-#define RDY1 0x4000
-#define RDY2 0x8000
-#define RDY(n) ((n) =3D=3D 0 ? RDY1 : RDY2)
-
-typedef enum { WAIT, READ1, READ2, READ3 } state_t;
-
-typedef struct {
-    uint8_t *flash_contents;
-    state_t state;
-    uint32_t address;
-    uint8_t address_cycle;
-} tc58128_dev;
-
-static tc58128_dev tc58128_devs[2];
-
-#define FLASH_SIZE (16 * MiB)
-
-static void init_dev(tc58128_dev * dev, const char *filename)
-{
-    int ret, blocks;
-
-    dev->state =3D WAIT;
-    dev->flash_contents =3D g_malloc(FLASH_SIZE);
-    memset(dev->flash_contents, 0xff, FLASH_SIZE);
-    if (filename) {
-        /* Load flash image skipping the first block */
-        ret =3D load_image_size(filename, dev->flash_contents + 528 * 32,
-                              FLASH_SIZE - 528 * 32);
-        if (ret < 0) {
-            if (!qtest_enabled()) {
-                error_report("Could not load flash image %s", filename);
-                exit(1);
-            }
-        } else {
-            /* Build first block with number of blocks */
-            blocks =3D DIV_ROUND_UP(ret, 528 * 32);
-            dev->flash_contents[0] =3D blocks & 0xff;
-            dev->flash_contents[1] =3D (blocks >> 8) & 0xff;
-            dev->flash_contents[2] =3D (blocks >> 16) & 0xff;
-            dev->flash_contents[3] =3D (blocks >> 24) & 0xff;
-            fprintf(stderr, "loaded %d bytes for %s into flash\n", ret,
-                    filename);
-        }
-    }
-}
-
-static void handle_command(tc58128_dev * dev, uint8_t command)
-{
-    switch (command) {
-    case 0xff:
-        fprintf(stderr, "reset flash device\n");
-        dev->state =3D WAIT;
-        break;
-    case 0x00:
-        fprintf(stderr, "read mode 1\n");
-        dev->state =3D READ1;
-        dev->address_cycle =3D 0;
-        break;
-    case 0x01:
-        fprintf(stderr, "read mode 2\n");
-        dev->state =3D READ2;
-        dev->address_cycle =3D 0;
-        break;
-    case 0x50:
-        fprintf(stderr, "read mode 3\n");
-        dev->state =3D READ3;
-        dev->address_cycle =3D 0;
-        break;
-    default:
-        fprintf(stderr, "unknown flash command 0x%02x\n", command);
-        abort();
-    }
-}
-
-static void handle_address(tc58128_dev * dev, uint8_t data)
-{
-    switch (dev->state) {
-    case READ1:
-    case READ2:
-    case READ3:
-        switch (dev->address_cycle) {
-        case 0:
-            dev->address =3D data;
-            if (dev->state =3D=3D READ2)
-                dev->address |=3D 0x100;
-            else if (dev->state =3D=3D READ3)
-                dev->address |=3D 0x200;
-            break;
-        case 1:
-            dev->address +=3D data * 528 * 0x100;
-            break;
-        case 2:
-            dev->address +=3D data * 528;
-            fprintf(stderr, "address pointer in flash: 0x%08x\n",
-                    dev->address);
-            break;
-        default:
-            /* Invalid data */
-            abort();
-        }
-        dev->address_cycle++;
-        break;
-    default:
-        abort();
-    }
-}
-
-static uint8_t handle_read(tc58128_dev * dev)
-{
-#if 0
-    if (dev->address % 0x100000 =3D=3D 0)
-        fprintf(stderr, "reading flash at address 0x%08x\n", dev->address);
-#endif
-    return dev->flash_contents[dev->address++];
-}
-
-/* We never mark the device as busy, so interrupts cannot be triggered
-   XXXXX */
-
-static int tc58128_cb(uint16_t porta, uint16_t portb,
-                      uint16_t * periph_pdtra, uint16_t * periph_portadir,
-                      uint16_t * periph_pdtrb, uint16_t * periph_portbdir)
-{
-    int dev;
-
-    if ((porta & CE1) =3D=3D 0)
-        dev =3D 0;
-    else if ((porta & CE2) =3D=3D 0)
-        dev =3D 1;
-    else
-        return 0;        /* No device selected */
-
-    if ((porta & RE) && (porta & WE)) {
-        /* Nothing to do, assert ready and return to input state */
-        *periph_portadir &=3D 0xff00;
-        *periph_portadir |=3D RDY(dev);
-        *periph_pdtra |=3D RDY(dev);
-        return 1;
-    }
-
-    if (porta & CLE) {
-        /* Command */
-        assert((porta & WE) =3D=3D 0);
-        handle_command(&tc58128_devs[dev], porta & 0x00ff);
-    } else if (porta & ALE) {
-        assert((porta & WE) =3D=3D 0);
-        handle_address(&tc58128_devs[dev], porta & 0x00ff);
-    } else if ((porta & RE) =3D=3D 0) {
-        *periph_portadir |=3D 0x00ff;
-        *periph_pdtra &=3D 0xff00;
-        *periph_pdtra |=3D handle_read(&tc58128_devs[dev]);
-    } else {
-        abort();
-    }
-    return 1;
-}
-
-static sh7750_io_device tc58128 =3D {
-    RE | WE,            /* Port A triggers */
-    0,                  /* Port B triggers */
-    tc58128_cb          /* Callback */
-};
-
-int tc58128_init(struct SH7750State *s, const char *zone1, const char *zon=
e2)
-{
-    if (!qtest_enabled()) {
-        warn_report_once("The TC58128 flash device is deprecated");
-    }
-    init_dev(&tc58128_devs[0], zone1);
-    init_dev(&tc58128_devs[1], zone2);
-    return sh7750_register_io_device(s, &tc58128);
-}
diff --git a/hw/block/Kconfig b/hw/block/Kconfig
index 9e8f28f982..ef6709b106 100644
--- a/hw/block/Kconfig
+++ b/hw/block/Kconfig
@@ -28,9 +28,6 @@ config ECC
 config ONENAND
     bool
=20
-config TC58128
-    bool
-
 config VIRTIO_BLK
     bool
     default y
diff --git a/hw/block/meson.build b/hw/block/meson.build
index 8aa4dc3893..0fb0f41f42 100644
--- a/hw/block/meson.build
+++ b/hw/block/meson.build
@@ -15,7 +15,6 @@ system_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('=
m25p80.c'))
 system_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80_sfdp.c'))
 system_ss.add(when: 'CONFIG_SWIM', if_true: files('swim.c'))
 system_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen-block.c'))
-system_ss.add(when: 'CONFIG_TC58128', if_true: files('tc58128.c'))
=20
 specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c', =
'virtio-blk-common.c'))
 specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-=
blk.c', 'virtio-blk-common.c'))
--=20
2.45.2


From nobody Tue Jan 21 08:31:48 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
 permitted sender)
  smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
	dmarc=pass(p=none dis=none)  header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1725378073; cv=none;
	d=zohomail.com; s=zohoarc;
	b=UYyfOnODk/KesW5Zz0eLZQuJ0ndpfkyLObsEcpvgdzxo7LZxF8jIaoaYFwrxnnCwkjVaV8GvN+DU7QrgkJcPt46bdZ8mlQWj4lfHFKCgLH6zmfLA+F/4IlTMG7bsFWv69ou2qcSaQYy/zQNl04nhv85LpPtAAACe/6TULJYVpQY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1725378073;
 h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
	bh=Wuy63rQA82RKd97+v08/nlvdm3U3xnXpwkNWTWLl3/8=;
	b=S+FAjrtP3r5eNjKArIkbPQjhqbC7rAvSx9kr3OG4uBoe721Oj57EJGwogtdDrcXTMotoV7rsXdeUs9WZmhrqtZTYS0sCLiWebhp9hGzD05FtUz03C2DdysYbQUrlHuyTJAWMLgIkm0Rx6hMp5x5LFbMfJjMIP7tzw6SzwBvwcE8=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
 permitted sender)
  smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
	dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
 mx.zohomail.com
	with SMTPS id 1725378073305565.2107165500769;
 Tue, 3 Sep 2024 08:41:13 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <qemu-devel-bounces@nongnu.org>)
	id 1slVdu-0003S5-6J; Tue, 03 Sep 2024 11:40:30 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1slVdr-0003Gc-BE
 for qemu-devel@nongnu.org; Tue, 03 Sep 2024 11:40:27 -0400
Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1slVdo-0006XK-1l
 for qemu-devel@nongnu.org; Tue, 03 Sep 2024 11:40:27 -0400
Received: by mail-wm1-x32c.google.com with SMTP id
 5b1f17b1804b1-42bbffe38e6so30346505e9.0
 for <qemu-devel@nongnu.org>; Tue, 03 Sep 2024 08:40:23 -0700 (PDT)
Received: from localhost.localdomain ([78.196.4.158])
 by smtp.gmail.com with ESMTPSA id
 ffacd0b85a97d-374c90c6c06sm6793002f8f.84.2024.09.03.08.40.14
 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
 Tue, 03 Sep 2024 08:40:14 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=linaro.org; s=google; t=1725378015; x=1725982815; darn=nongnu.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=Wuy63rQA82RKd97+v08/nlvdm3U3xnXpwkNWTWLl3/8=;
 b=W8riVIH2+D6aApWw0pmko5Ev0vIOuyOyuRwJw0V1+kMJDCaNJ+c1mwpqgHuFWdd8qk
 TyOl144wn8zfsJ3Q8FEIHToNM25R3IZ9n2B5R02gChysYT6MWNrXAd6M6b2ZJWbLVvnS
 AulIMLhZ1jhWer1zqxHWhTN9RPKVbsxdSpDn25F7ZrAMb+227knwy75athhsomqfqUFV
 8Ee49/2oBjd2qCC0aR+J17Kxbp5dwcuAQlHXwbpXZB3zxgM16IHQIxDWPipM83Vm/Dbs
 KIIvheTUgziyMfpen3wLK5lj4LoZodLysQbzpkRU1K+EPbrKidxT7d3AYg9qxT26VRgP
 0x1g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1725378015; x=1725982815;
 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=Wuy63rQA82RKd97+v08/nlvdm3U3xnXpwkNWTWLl3/8=;
 b=eLMQRBB1TKFxvGVzM8/yChEpa7nuIdSZFG972m5OnfBpxtO+7TLjs/oR+wTAICYSY+
 ULW4KxOZswhDDqjunLGI6MXpM6jukCR+XcajgH19z+MegawYNEhgSDe7oRn11gFS6VfW
 IVZvl5IN0vz+pm8ulEFLElc0dqEEXkEpNsePiBDKwX/q2BPdwD5bOS1Zk/mkTlbSKekc
 +DtcBIWzD0Ij7jQsB6FlTijH7LgNGiTdP0qtd5bz0AsY3ETRbJRJwZVXcM8CuQ0FivGH
 uQh+NzHw+zesdvd7mJm+u8E90I1r/ZjCdQZsFSqWaAzL59/50DqtyNGctpVSacILSmSr
 bjBw==
X-Forwarded-Encrypted: i=1;
 AJvYcCW39KntmLKKhqdc5nDqHrABWcTMUViwpoArVyUKQnqYJriDASZx8KdgsVE4VZnU1o3zSLr9AXmoYFyJ@nongnu.org
X-Gm-Message-State: AOJu0YwEMaM15+27p0x5hjksHR+H0lxuO0Bzs9oFlB/3/palxCMsYQ24
 TXkihWeVuNg93KTSSFgJPeng2ZISVMUvUK+FXLpOacLj+shxzcEQXuhXrPrJs4s=
X-Google-Smtp-Source: 
 AGHT+IGyevKnzVu803RSdMfgNKlamGBAX7wFk9WO2mvIAhDDOSHpMM8FUWiSsUaxuwijRnfk+WlUpA==
X-Received: by 2002:adf:e5d2:0:b0:374:baf1:41bb with SMTP id
 ffacd0b85a97d-374baf14276mr6864469f8f.3.1725378015148;
 Tue, 03 Sep 2024 08:40:15 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: Samuel Tardieu <sam@rfc1149.net>,
	qemu-devel@nongnu.org
Cc: devel@lists.libvirt.org, Magnus Damm <magnus.damm@gmail.com>,
 qemu-block@nongnu.org, Yoshinori Sato <ysato@users.sourceforge.jp>,
 =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 3/3] hw/sh4: Remove sh7750_register_io_device() helper
Date: Tue,  3 Sep 2024 17:39:59 +0200
Message-ID: <20240903153959.18392-4-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-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
 as permitted sender) client-ip=209.51.188.17;
 envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
 helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32c;
 envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
 T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1725378073596116600

sh7750_register_io_device() was only used by the TC58128
NAND EEPROM which has been removed in the previous commit.
Remove it as unused code.

Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
 include/hw/sh4/sh.h | 16 -------------
 hw/sh4/sh7750.c     | 57 ++-------------------------------------------
 2 files changed, 2 insertions(+), 71 deletions(-)

diff --git a/include/hw/sh4/sh.h b/include/hw/sh4/sh.h
index b726b987cc..c82feef8d0 100644
--- a/include/hw/sh4/sh.h
+++ b/include/hw/sh4/sh.h
@@ -38,22 +38,6 @@ struct SH7750State;
=20
 struct SH7750State *sh7750_init(SuperHCPU *cpu, MemoryRegion *sysmem);
=20
-typedef struct {
-    /* The callback will be triggered if any of the designated lines chang=
e */
-    uint16_t portamask_trigger;
-    uint16_t portbmask_trigger;
-    /* Return 0 if no action was taken */
-    int (*port_change_cb) (uint16_t porta, uint16_t portb,
-                           uint16_t *periph_pdtra,
-                           uint16_t *periph_portdira,
-                           uint16_t *periph_pdtrb,
-                           uint16_t *periph_portdirb);
-} sh7750_io_device;
-
-int sh7750_register_io_device(struct SH7750State *s,
-                              sh7750_io_device *device);
-
-/* sh_serial.c */
 #define TYPE_SH_SERIAL "sh-serial"
 #define SH_SERIAL_FEAT_SCIF (1 << 0)
=20
diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index ebe0fd96d9..8041b3b651 100644
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -38,8 +38,6 @@
 #include "exec/exec-all.h"
 #include "trace.h"
=20
-#define NB_DEVICES 4
-
 typedef struct SH7750State {
     MemoryRegion iomem;
     MemoryRegion iomem_1f0;
@@ -75,7 +73,6 @@ typedef struct SH7750State {
     uint16_t periph_portdira; /* Direction seen from the peripherals */
     uint16_t periph_pdtrb;    /* Imposed by the peripherals */
     uint16_t periph_portdirb; /* Direction seen from the peripherals */
-    sh7750_io_device *devices[NB_DEVICES]; /* External peripherals */
=20
     /* Cache */
     uint32_t ccr;
@@ -92,19 +89,6 @@ static inline int has_bcr3_and_bcr4(SH7750State *s)
  * I/O ports
  */
=20
-int sh7750_register_io_device(SH7750State *s, sh7750_io_device *device)
-{
-    int i;
-
-    for (i =3D 0; i < NB_DEVICES; i++) {
-        if (s->devices[i] =3D=3D NULL) {
-            s->devices[i] =3D device;
-            return 0;
-        }
-    }
-    return -1;
-}
-
 static uint16_t portdir(uint32_t v)
 {
 #define EVENPORTMASK(n) ((v & (1 << ((n) << 1))) >> (n))
@@ -142,63 +126,26 @@ static uint16_t portb_lines(SH7750State *s)
         (~(s->portdirb | s->periph_portdirb) & s->portpullupb); /* Pullups=
 */
 }
=20
-static void gen_port_interrupts(SH7750State *s)
-{
-    /* XXXXX interrupts not generated */
-}
-
 static void porta_changed(SH7750State *s, uint16_t prev)
 {
-    uint16_t currenta, changes;
-    int i, r =3D 0;
+    uint16_t currenta;
=20
     currenta =3D porta_lines(s);
     if (currenta =3D=3D prev) {
         return;
     }
     trace_sh7750_porta(prev, currenta, s->pdtra, s->pctra);
-    changes =3D currenta ^ prev;
-
-    for (i =3D 0; i < NB_DEVICES; i++) {
-        if (s->devices[i] && (s->devices[i]->portamask_trigger & changes))=
 {
-            r |=3D s->devices[i]->port_change_cb(currenta, portb_lines(s),
-                                               &s->periph_pdtra,
-                                               &s->periph_portdira,
-                                               &s->periph_pdtrb,
-                                               &s->periph_portdirb);
-        }
-    }
-
-    if (r) {
-        gen_port_interrupts(s);
-    }
 }
=20
 static void portb_changed(SH7750State *s, uint16_t prev)
 {
-    uint16_t currentb, changes;
-    int i, r =3D 0;
+    uint16_t currentb;
=20
     currentb =3D portb_lines(s);
     if (currentb =3D=3D prev) {
         return;
     }
     trace_sh7750_portb(prev, currentb, s->pdtrb, s->pctrb);
-    changes =3D currentb ^ prev;
-
-    for (i =3D 0; i < NB_DEVICES; i++) {
-        if (s->devices[i] && (s->devices[i]->portbmask_trigger & changes))=
 {
-            r |=3D s->devices[i]->port_change_cb(portb_lines(s), currentb,
-                                               &s->periph_pdtra,
-                                               &s->periph_portdira,
-                                               &s->periph_pdtrb,
-                                               &s->periph_portdirb);
-        }
-    }
-
-    if (r) {
-        gen_port_interrupts(s);
-    }
 }
=20
 /*
--=20
2.45.2