From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621276807; cv=none; d=zohomail.com; s=zohoarc; b=IKhGIvQ1g15igMwwvQW9s/FtxhVYp5iqWrjHxGbXtQGaO54WpwPLRx6GYsogcQguSnli9qaE5cVhH03z9Mu8me3sDBegdPfOxkok/WNODMjOFnJ66g1JgVjC+ZPzlUg5QxwiXCgnImW6JM+kyXVmSOwQr0FoeJYRi9G6wx7paGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621276807; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=yIx6qnixzEdCFqcaxOcBVgzeXQKdqlMaGZGGlAdFf2k=; b=besrspQRfsW8Dknsq/2rX/qdLXx7fIBcfMujLo6icUJjoFiFSQXiAo9217KoXLQaONPdvT96znEU2D13K7bp22IkYgUW866KBqAefQ54YB1uLZmOVe7OO+eUfa1H6i9hMwBM6uqe82uLN3dEihNG66ET5SKz788TpDCN0819EYw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621276807563915.6754195936113; Mon, 17 May 2021 11:40:07 -0700 (PDT) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-285-2DJzTRSwNjSjaoGEQF4SAg-1; Mon, 17 May 2021 14:40:02 -0400 Received: by mail-ed1-f70.google.com with SMTP id y15-20020aa7d50f0000b02903885ee98723so4375895edq.16 for ; Mon, 17 May 2021 11:40:02 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id k2sm9202779ejj.30.2021.05.17.11.40.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 11:40:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621276806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yIx6qnixzEdCFqcaxOcBVgzeXQKdqlMaGZGGlAdFf2k=; b=GePwlybGMF1g+LHs1/KelyKwsiT3Kzvvz1+Xz2y49HGrLjHGTE2jnZ0qQwYRmC/Z12rv1Y a5Z5Cj6wxgRvgaYEbr955YjS7HkNgkd6uyG8va3s9TFjQltAD5ADWeIrA+GXAt4M9z80aR zVrS0+9eGKsrPA3Q2xjaTZWngc73TG8= X-MC-Unique: 2DJzTRSwNjSjaoGEQF4SAg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yIx6qnixzEdCFqcaxOcBVgzeXQKdqlMaGZGGlAdFf2k=; b=UqVfCCtLy3AJ864IONuFZ0u4UpIr7KrI1q4zvH2QLDvj/uaE67/4qbVhrMYhUHAAky Hzh2tGY1TKfmkYu69PN55aFdhvRfsyoNI8+guv01lBFFerSFEok4U5+QxUGWZfck1e0q 6Fe5sZ+g7ZiI5wBBaSFNpOyGTRds0Kv1S1mwklohY8zSLt1JpR0CQ+tYLe57UBjI0Uuc bI0S+KOzqzd8102PZ7Fd4ytodTMVbYGA/S0dJ9Ww5ZvOY+P2fIGUhCMo6ayYqgfiRkcN kvAaWcXR6R0SOzjZKjVG8lCTvBkD+iRiOeqWtgas8P287IfU85mRYr9rR+fQWxl4JzZn /csg== X-Gm-Message-State: AOAM5334jNN8pZf2ap0itwDwHchPfIHoZxTzc40sC3ozFA9GRS1SMYjv nPVJr+/BzY0NjkCQc1NyHFKjntP/gCQMiDSbdNsqEiDV0xy0diODd/Wi6ygzkzW3OB3W/rcMdS6 3L4757UHKOgCE6A== X-Received: by 2002:a17:906:c010:: with SMTP id e16mr1403689ejz.214.1621276801215; Mon, 17 May 2021 11:40:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzLUZnW510mcSQ23kx0+z043RTUUa0WDX5e+TNnBDGkdInRzmPVm7Js7rH9h7cVsUo/WHNXXw== X-Received: by 2002:a17:906:c010:: with SMTP id e16mr1403673ejz.214.1621276801103; Mon, 17 May 2021 11:40:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, John Snow Cc: Richard Henderson , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 1/9] hw/isa/Kconfig: Fix missing dependency ISA_SUPERIO -> FDC Date: Mon, 17 May 2021 20:39:46 +0200 Message-Id: <20210517183954.1223193-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517183954.1223193-1-philmd@redhat.com> References: <20210517183954.1223193-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) isa_superio_realize() calls isa_fdc_init_drives(), which is defined in hw/block/fdc.c, so ISA_SUPERIO needs to select the FDC symbol. Reported-by: John Snow Fixes: c0ff3795143 ("Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.= c") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 55e0003ce40..7216f66a54a 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -17,6 +17,7 @@ config ISA_SUPERIO bool select ISA_BUS select PCKBD + select FDC =20 config PC87312 bool --=20 2.26.3 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621276809; cv=none; d=zohomail.com; s=zohoarc; b=d8/EpzI/I/ZXNdaOlZWCnKPB9rdlrt3BCO1xp5b/bV8zNrbkIdw02GpMLe7cL4x8YobZ9ly+93NvADNV5IZfkm/WMYKhxIYH3Q9//jWGDm2DpUeEzU5YpM9D+4N10bC4y95MBNGEDq5yebuiTKI9VJTYfRSyiELtBZem8vHMHEY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621276809; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=wKTvIJltaWyJ3tXssokHbyKTt2E/IQqH3Pybl80dLEU=; b=JjQK9bjZhBqEaY8I1UdV9ADsnThsRLK1m/r/fcGneuGnbof44Kt4CrJPm+/5GZYRzC59UMSSeHV32MrQOwcsfYHirBDS3id4J/IThwWqeGFtJ7csYliaYCSoUlvat6Re9NAO2o3V7CKvXwfbcdQiyiJnxOcJVNkfBWI71nSc648= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1621276809527719.185924693121; Mon, 17 May 2021 11:40:09 -0700 (PDT) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-394-Y3qtbC6YM3uJ4pvIXXdTnQ-1; Mon, 17 May 2021 14:40:07 -0400 Received: by mail-ed1-f69.google.com with SMTP id m6-20020aa7c4860000b029038d4e973878so236119edq.10 for ; Mon, 17 May 2021 11:40:06 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id q16sm8866603edw.87.2021.05.17.11.40.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 11:40:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621276808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wKTvIJltaWyJ3tXssokHbyKTt2E/IQqH3Pybl80dLEU=; b=SdTacydVFveCYVcq9sk2lp+qy0RnwGDzYWf3qdqQZBUaMSvwQiBlEoDjeXZeWuTICKO0FT UipfWUsMWLC6vC5iJTt1+yVz83hf0+k+VpLLK+NL5nqgLBnq4kuIkSX9WjtDZS534GRXdQ JlNI7sEe4a/YHyqMD3hvLe14ntgEYG8= X-MC-Unique: Y3qtbC6YM3uJ4pvIXXdTnQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wKTvIJltaWyJ3tXssokHbyKTt2E/IQqH3Pybl80dLEU=; b=Wwi5BLnqxNWjCzodfVk5UAd7e9p1ezoeBEd+E4bYROqC7AksOcnUD67V9HWexNDAHy hpV/TCatXwZy8aWkJWuzs+fklk6GIpD539D223ai1wNo5Z+A5dULi6rzE9DYK9fQxpuH 9CH1WFALxdJgaaapZ5vLrPp7EKDbPJXn40cGpJ07oCUrtfwy/5LB6kVUh9cFBghQX8ym K6z6xOGrOOd3VNF8nXgYxUmOlyXy5ZNeMEf8bZXum6HngBJQbt5S6hcI8klnovMa5hbI rkKHFGt24eD88azhI25N+3ucjEGQLH0LbnblabvrOLCSLuSdvFXhImf8otHF/qaVG8YZ STXQ== X-Gm-Message-State: AOAM530ZL5SiLa94YEIfItLMy9yS6zQg7iKCmhsoamoYc6kDmDG8NVXd GWM8DjE9m1qAIzRIQMAwUBygItU6D5VXQmgAJbSAau/va0uj1XAYeGr+2wUP4Dq+dilMWAab9OJ 7c/KxYdSa4T7Y5A== X-Received: by 2002:a05:6402:2802:: with SMTP id h2mr1605982ede.243.1621276805860; Mon, 17 May 2021 11:40:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7jyf8vGOqGKZDXd4Jwn8QOQH9iiemYyUvrD4WA2OL7N4ZpGzz+VuDBv5XjUEDWISnYUSl3w== X-Received: by 2002:a05:6402:2802:: with SMTP id h2mr1605968ede.243.1621276805693; Mon, 17 May 2021 11:40:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, John Snow Cc: Richard Henderson , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v4 2/9] hw/block/fdc: Replace disabled fprintf() by trace event Date: Mon, 17 May 2021 20:39:47 +0200 Message-Id: <20210517183954.1223193-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517183954.1223193-1-philmd@redhat.com> References: <20210517183954.1223193-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Reviewed-by: John Snow Acked-by: Mark Cave-Ayland Reviewed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc.c | 7 +------ hw/block/trace-events | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index a825c2acbae..1d3a0473678 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -1242,12 +1242,7 @@ static void fdctrl_external_reset_isa(DeviceState *d) =20 static void fdctrl_handle_tc(void *opaque, int irq, int level) { - //FDCtrl *s =3D opaque; - - if (level) { - // XXX - FLOPPY_DPRINTF("TC pulsed\n"); - } + trace_fdctrl_tc_pulse(level); } =20 /* Change IRQ state */ diff --git a/hw/block/trace-events b/hw/block/trace-events index fa12e3a67a7..306989c193c 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -3,6 +3,7 @@ # fdc.c fdc_ioport_read(uint8_t reg, uint8_t value) "read reg 0x%02x val 0x%02x" fdc_ioport_write(uint8_t reg, uint8_t value) "write reg 0x%02x val 0x%02x" +fdctrl_tc_pulse(int level) "TC pulse: %u" =20 # pflash_cfi01.c # pflash_cfi02.c --=20 2.26.3 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621276814; cv=none; d=zohomail.com; s=zohoarc; b=fWa3ZefxwL7mWeLVx2jR/0xyml/opMuaOeb/KzFkHlNr8UXngvfHxfAlPaJJYgVYmjUdPcO6H3hO4dWrraVOXMEI22XMA7jGSHmDjFAUUL5F3jga4L6hmUQwL2/egYA1RZ5IsLdSpyjBruj/a2uacNfB3AUOqrVpTXH9zcHpSLo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621276814; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tuur5ZsnbARdY5KvIOeccLdQReUN8QEIerCNAY+4WFM=; b=l+RU7pw+A7g0uMtDl/LJKxmyOjPwYyVy/CnBM7L/gJ3gZzgDAGJK42YZR1nBuYjiOpPHtguZDadbTKZNMm0e631jhmG84xx9sR3CiW8UQrnF5Hl7OeZCTegreeK9esRPA0lok/+XpWLgxpc9ZbXbj/9C7YssvWLdJ7AkMevB5Lw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621276814922189.53811156869688; Mon, 17 May 2021 11:40:14 -0700 (PDT) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-161-MBKu_38MM-G0WduQ10OrlQ-1; Mon, 17 May 2021 14:40:12 -0400 Received: by mail-ej1-f71.google.com with SMTP id h18-20020a1709063992b02903d59b32b039so1209590eje.12 for ; Mon, 17 May 2021 11:40:11 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id cw12sm2757173ejc.17.2021.05.17.11.40.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 11:40:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621276813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tuur5ZsnbARdY5KvIOeccLdQReUN8QEIerCNAY+4WFM=; b=fo0kykKmrAW+GHMidYAu+lQ380hlEcIStTQyAyLkgy7gJxtRKVRYvl8mOUF0DJphezfxIg v3kulxHJfT/hkGOxFeGobyuPdps7wtGZxWUY6kcU7PxykHydo4r6AQ/+74JvE+S98pu2Xq Hw2TZj7xcA43I5owm6hQ322Q5I7G2IE= X-MC-Unique: MBKu_38MM-G0WduQ10OrlQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tuur5ZsnbARdY5KvIOeccLdQReUN8QEIerCNAY+4WFM=; b=Bfb8FsFXfs9+sbAFgeb3Gl9vssCMMDG9pfkTemo/soh3IlhUYD74hKbTcmTmh3Ji5i 1R6+kyfoOXV075X4dFkvxOZKVl9mM0mhmZbX6O7I2rcuQFlGHrla05l/YORkAGnVUp6f QR7c2w8/t3fxcknJteiJkUCQpzfMTXH6+LfSJxAJYWnHnso2fha+aTq+zMPEcLWdv9rg A758mvP8Sj8EQgisTmb7Mn4QSe3m97kvbe//zW16/GdVyBnPd/7q0ZU4fuycwqhNpe3W s2L/rX+DNDfCYPcJRIqATJYf7OVpDWm3NKDZATjkBvm32FZptrTwumFsam/0zM2BDu2e iW6A== X-Gm-Message-State: AOAM532+oFAJB6YBvKbp9Kw09J1cZEaELDN9w+VSztJHt+rMo071Jjgq XZ3wXHdDH5uu9d0A7NSaNVDiZBjEp78Y7cFE4jCnkuaIUhemOoOR5JSlJ3BMcn+iGHzEmYa3Ofs o8D4lX7FDrmC5eg== X-Received: by 2002:a17:907:62a7:: with SMTP id nd39mr1371555ejc.502.1621276810775; Mon, 17 May 2021 11:40:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdLfGWQKQjOniXYPjcC/BT7076gGfU9CjSfwpS8LVz5pQxedrA04kTQpG0nVO8mdmy9Y41tA== X-Received: by 2002:a17:907:62a7:: with SMTP id nd39mr1371536ejc.502.1621276810502; Mon, 17 May 2021 11:40:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, John Snow Cc: Richard Henderson , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v4 3/9] hw/block/fdc: Declare shared prototypes in fdc-internal.h Date: Mon, 17 May 2021 20:39:48 +0200 Message-Id: <20210517183954.1223193-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517183954.1223193-1-philmd@redhat.com> References: <20210517183954.1223193-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) We want to extract ISA/SysBus code from the generic fdc.c file. First, declare the prototypes we will access from the new units into a new local header: "fdc-internal.h". Acked-by: Mark Cave-Ayland Reviewed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc-internal.h | 156 ++++++++++++++++++++++++++++++++++++++++ hw/block/fdc.c | 126 +++----------------------------- MAINTAINERS | 1 + 3 files changed, 165 insertions(+), 118 deletions(-) create mode 100644 hw/block/fdc-internal.h diff --git a/hw/block/fdc-internal.h b/hw/block/fdc-internal.h new file mode 100644 index 00000000000..278de725e69 --- /dev/null +++ b/hw/block/fdc-internal.h @@ -0,0 +1,156 @@ +/* + * QEMU Floppy disk emulator (Intel 82078) + * + * Copyright (c) 2003, 2007 Jocelyn Mayer + * Copyright (c) 2008 Herv=C3=A9 Poussineau + * + * 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. + */ +#ifndef HW_BLOCK_FDC_INTERNAL_H +#define HW_BLOCK_FDC_INTERNAL_H + +#include "exec/memory.h" +#include "exec/ioport.h" +#include "hw/block/block.h" +#include "hw/block/fdc.h" +#include "qapi/qapi-types-block.h" + +typedef struct FDCtrl FDCtrl; + +/* Floppy bus emulation */ + +typedef struct FloppyBus { + BusState bus; + FDCtrl *fdc; +} FloppyBus; + +/* Floppy disk drive emulation */ + +typedef enum FDriveRate { + FDRIVE_RATE_500K =3D 0x00, /* 500 Kbps */ + FDRIVE_RATE_300K =3D 0x01, /* 300 Kbps */ + FDRIVE_RATE_250K =3D 0x02, /* 250 Kbps */ + FDRIVE_RATE_1M =3D 0x03, /* 1 Mbps */ +} FDriveRate; + +typedef enum FDriveSize { + FDRIVE_SIZE_UNKNOWN, + FDRIVE_SIZE_350, + FDRIVE_SIZE_525, +} FDriveSize; + +typedef struct FDFormat { + FloppyDriveType drive; + uint8_t last_sect; + uint8_t max_track; + uint8_t max_head; + FDriveRate rate; +} FDFormat; + +typedef enum FDiskFlags { + FDISK_DBL_SIDES =3D 0x01, +} FDiskFlags; + +typedef struct FDrive { + FDCtrl *fdctrl; + BlockBackend *blk; + BlockConf *conf; + /* Drive status */ + FloppyDriveType drive; /* CMOS drive type */ + uint8_t perpendicular; /* 2.88 MB access mode */ + /* Position */ + uint8_t head; + uint8_t track; + uint8_t sect; + /* Media */ + FloppyDriveType disk; /* Current disk type */ + FDiskFlags flags; + uint8_t last_sect; /* Nb sector per track */ + uint8_t max_track; /* Nb of tracks */ + uint16_t bps; /* Bytes per sector */ + uint8_t ro; /* Is read-only */ + uint8_t media_changed; /* Is media changed */ + uint8_t media_rate; /* Data rate of medium */ + + bool media_validated; /* Have we validated the media? */ +} FDrive; + +struct FDCtrl { + MemoryRegion iomem; + qemu_irq irq; + /* Controller state */ + QEMUTimer *result_timer; + int dma_chann; + uint8_t phase; + IsaDma *dma; + /* Controller's identification */ + uint8_t version; + /* HW */ + uint8_t sra; + uint8_t srb; + uint8_t dor; + uint8_t dor_vmstate; /* only used as temp during vmstate */ + uint8_t tdr; + uint8_t dsr; + uint8_t msr; + uint8_t cur_drv; + uint8_t status0; + uint8_t status1; + uint8_t status2; + /* Command FIFO */ + uint8_t *fifo; + int32_t fifo_size; + uint32_t data_pos; + uint32_t data_len; + uint8_t data_state; + uint8_t data_dir; + uint8_t eot; /* last wanted sector */ + /* States kept only to be returned back */ + /* precompensation */ + uint8_t precomp_trk; + uint8_t config; + uint8_t lock; + /* Power down config (also with status regB access mode */ + uint8_t pwrd; + /* Floppy drives */ + FloppyBus bus; + uint8_t num_floppies; + FDrive drives[MAX_FD]; + struct { + FloppyDriveType type; + } qdev_for_drives[MAX_FD]; + int reset_sensei; + FloppyDriveType fallback; /* type=3Dauto failure fallback */ + /* Timers state */ + uint8_t timer0; + uint8_t timer1; + PortioList portio_list; +}; + +extern const FDFormat fd_formats[]; +extern const VMStateDescription vmstate_fdc; + +uint32_t fdctrl_read(void *opaque, uint32_t reg); +void fdctrl_write(void *opaque, uint32_t reg, uint32_t value); +void fdctrl_reset(FDCtrl *fdctrl, int do_irq); +void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl, Error **errp); + +void fdctrl_init_drives(FloppyBus *bus, DriveInfo **fds); + +#endif diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 1d3a0473678..300f39672af 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -48,6 +48,7 @@ #include "qemu/module.h" #include "trace.h" #include "qom/object.h" +#include "fdc-internal.h" =20 /********************************************************/ /* debug Floppy devices */ @@ -68,15 +69,8 @@ #define TYPE_FLOPPY_BUS "floppy-bus" OBJECT_DECLARE_SIMPLE_TYPE(FloppyBus, FLOPPY_BUS) =20 -typedef struct FDCtrl FDCtrl; -typedef struct FDrive FDrive; static FDrive *get_drv(FDCtrl *fdctrl, int unit); =20 -struct FloppyBus { - BusState bus; - FDCtrl *fdc; -}; - static const TypeInfo floppy_bus_info =3D { .name =3D TYPE_FLOPPY_BUS, .parent =3D TYPE_BUS, @@ -93,32 +87,11 @@ static void floppy_bus_create(FDCtrl *fdc, FloppyBus *b= us, DeviceState *dev) /********************************************************/ /* Floppy drive emulation */ =20 -typedef enum FDriveRate { - FDRIVE_RATE_500K =3D 0x00, /* 500 Kbps */ - FDRIVE_RATE_300K =3D 0x01, /* 300 Kbps */ - FDRIVE_RATE_250K =3D 0x02, /* 250 Kbps */ - FDRIVE_RATE_1M =3D 0x03, /* 1 Mbps */ -} FDriveRate; - -typedef enum FDriveSize { - FDRIVE_SIZE_UNKNOWN, - FDRIVE_SIZE_350, - FDRIVE_SIZE_525, -} FDriveSize; - -typedef struct FDFormat { - FloppyDriveType drive; - uint8_t last_sect; - uint8_t max_track; - uint8_t max_head; - FDriveRate rate; -} FDFormat; - /* In many cases, the total sector size of a format is enough to uniquely * identify it. However, there are some total sector collisions between * formats of different physical size, and these are noted below by * highlighting the total sector size for entries with collisions. */ -static const FDFormat fd_formats[] =3D { +const FDFormat fd_formats[] =3D { /* First entry is default format */ /* 1.44 MB 3"1/2 floppy disks */ { FLOPPY_DRIVE_TYPE_144, 18, 80, 1, FDRIVE_RATE_500K, }, /* 3.5" 2880 = */ @@ -186,35 +159,6 @@ static FDriveSize drive_size(FloppyDriveType drive) #define FD_SECTOR_SC 2 /* Sector size code */ #define FD_RESET_SENSEI_COUNT 4 /* Number of sense interrupts on RESET = */ =20 -/* Floppy disk drive emulation */ -typedef enum FDiskFlags { - FDISK_DBL_SIDES =3D 0x01, -} FDiskFlags; - -struct FDrive { - FDCtrl *fdctrl; - BlockBackend *blk; - BlockConf *conf; - /* Drive status */ - FloppyDriveType drive; /* CMOS drive type */ - uint8_t perpendicular; /* 2.88 MB access mode */ - /* Position */ - uint8_t head; - uint8_t track; - uint8_t sect; - /* Media */ - FloppyDriveType disk; /* Current disk type */ - FDiskFlags flags; - uint8_t last_sect; /* Nb sector per track */ - uint8_t max_track; /* Nb of tracks */ - uint16_t bps; /* Bytes per sector */ - uint8_t ro; /* Is read-only */ - uint8_t media_changed; /* Is media changed */ - uint8_t media_rate; /* Data rate of medium */ - - bool media_validated; /* Have we validated the media? */ -}; - =20 static FloppyDriveType get_fallback_drive_type(FDrive *drv); =20 @@ -626,7 +570,6 @@ static const TypeInfo floppy_drive_info =3D { /********************************************************/ /* Intel 82078 floppy disk controller emulation */ =20 -static void fdctrl_reset(FDCtrl *fdctrl, int do_irq); static void fdctrl_to_command_phase(FDCtrl *fdctrl); static int fdctrl_transfer_handler (void *opaque, int nchan, int dma_pos, int dma_len); @@ -828,58 +771,6 @@ enum { #define FD_MULTI_TRACK(state) ((state) & FD_STATE_MULTI) #define FD_FORMAT_CMD(state) ((state) & FD_STATE_FORMAT) =20 -struct FDCtrl { - MemoryRegion iomem; - qemu_irq irq; - /* Controller state */ - QEMUTimer *result_timer; - int dma_chann; - uint8_t phase; - IsaDma *dma; - /* Controller's identification */ - uint8_t version; - /* HW */ - uint8_t sra; - uint8_t srb; - uint8_t dor; - uint8_t dor_vmstate; /* only used as temp during vmstate */ - uint8_t tdr; - uint8_t dsr; - uint8_t msr; - uint8_t cur_drv; - uint8_t status0; - uint8_t status1; - uint8_t status2; - /* Command FIFO */ - uint8_t *fifo; - int32_t fifo_size; - uint32_t data_pos; - uint32_t data_len; - uint8_t data_state; - uint8_t data_dir; - uint8_t eot; /* last wanted sector */ - /* States kept only to be returned back */ - /* precompensation */ - uint8_t precomp_trk; - uint8_t config; - uint8_t lock; - /* Power down config (also with status regB access mode */ - uint8_t pwrd; - /* Floppy drives */ - FloppyBus bus; - uint8_t num_floppies; - FDrive drives[MAX_FD]; - struct { - FloppyDriveType type; - } qdev_for_drives[MAX_FD]; - int reset_sensei; - FloppyDriveType fallback; /* type=3Dauto failure fallback */ - /* Timers state */ - uint8_t timer0; - uint8_t timer1; - PortioList portio_list; -}; - static FloppyDriveType get_fallback_drive_type(FDrive *drv) { return drv->fdctrl->fallback; @@ -909,7 +800,7 @@ struct FDCtrlISABus { int32_t bootindexB; }; =20 -static uint32_t fdctrl_read (void *opaque, uint32_t reg) +uint32_t fdctrl_read(void *opaque, uint32_t reg) { FDCtrl *fdctrl =3D opaque; uint32_t retval; @@ -946,7 +837,7 @@ static uint32_t fdctrl_read (void *opaque, uint32_t reg) return retval; } =20 -static void fdctrl_write (void *opaque, uint32_t reg, uint32_t value) +void fdctrl_write(void *opaque, uint32_t reg, uint32_t value) { FDCtrl *fdctrl =3D opaque; =20 @@ -1178,7 +1069,7 @@ static const VMStateDescription vmstate_fdc_phase =3D= { } }; =20 -static const VMStateDescription vmstate_fdc =3D { +const VMStateDescription vmstate_fdc =3D { .name =3D "fdc", .version_id =3D 2, .minimum_version_id =3D 2, @@ -1268,7 +1159,7 @@ static void fdctrl_raise_irq(FDCtrl *fdctrl) } =20 /* Reset controller */ -static void fdctrl_reset(FDCtrl *fdctrl, int do_irq) +void fdctrl_reset(FDCtrl *fdctrl, int do_irq) { int i; =20 @@ -2484,7 +2375,7 @@ static void fdctrl_result_timer(void *opaque) =20 /* Init functions */ =20 -static void fdctrl_init_drives(FloppyBus *bus, DriveInfo **fds) +void fdctrl_init_drives(FloppyBus *bus, DriveInfo **fds) { DeviceState *dev; int i; @@ -2542,8 +2433,7 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, fdctrl_init_drives(&sys->state.bus, fds); } =20 -static void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl, - Error **errp) +void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl, Error **errp) { int i, j; FDrive *drive; diff --git a/MAINTAINERS b/MAINTAINERS index 78561a223f9..b1b50c6c334 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1659,6 +1659,7 @@ M: John Snow L: qemu-block@nongnu.org S: Supported F: hw/block/fdc.c +F: hw/block/fdc-internal.h F: include/hw/block/fdc.h F: tests/qtest/fdc-test.c T: git https://gitlab.com/jsnow/qemu.git ide --=20 2.26.3 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621276821; cv=none; d=zohomail.com; s=zohoarc; b=ERg3iAPYmOkx9AGJy5gRnSCSaoH71g1VRDhrk9quJ8etJDJfD3l7XMaUBsSyC67P+C3OdBGyEfQZgo5Q7ht4aVCKzNSRiYeG1x0w1rySSvYGLL5hk9SOG7rKQIkGYoC/1gRUEFAibIKpD/IBM68MHTxvRWEhoBtNsb7rDJK5pgo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621276821; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ZDA2enpDk/sW9Kb8YoN+eJY7j7JzlA1IjP+YMqQY+a4=; b=d6VCAxu5gRSC0i3CyU77nUNZAuTGyl6qmUAYxJ7nw0O0A2IKdXVJ8fNKnjpr9U6os992tMdPrK9al6N0NHO+HHVg731bF7v43eeFrRyZxEppssj3vd0LurDFCk0ZkFSg42HVhqba5muL5LwYo8pcFCDttxBz8vgnnb8dhonRD7M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 16212768211077.333958586199856; Mon, 17 May 2021 11:40:21 -0700 (PDT) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-489-2lHra6sLPAqLpzhFRwMZWQ-1; Mon, 17 May 2021 14:40:17 -0400 Received: by mail-ej1-f70.google.com with SMTP id n25-20020a170906b319b02903d4dc1bc46cso1407826ejz.2 for ; Mon, 17 May 2021 11:40:16 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id i5sm4993488edt.11.2021.05.17.11.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 11:40:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621276819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZDA2enpDk/sW9Kb8YoN+eJY7j7JzlA1IjP+YMqQY+a4=; b=DVOOkIafszyz4NxS+BAOfZpSECm4B9hrbrSBJZZyLyLRslWci8Cyu41jtXU8HFIoN9mP2a nbcqQ0TUeeZifAiOV5Knn+AmToVz/Ni7CwmSz7Be9sLVhRQ8aQUJn9CD3PMO6O8WkKYJx7 9KicVWjLozR7xpG8TlEsH6+iVY8l7e0= X-MC-Unique: 2lHra6sLPAqLpzhFRwMZWQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZDA2enpDk/sW9Kb8YoN+eJY7j7JzlA1IjP+YMqQY+a4=; b=bO5TpoGnd7X0CMusB4ZIEl/bm74eCz4IUB2WNOy9KvrBNrEiPCy48SS/P8LnezuCHn 1W2MaHIVlX2tjpAf4s4I2wX9qhKDaC/+VDsEtldugevPMMVY0G+M/p0L9/pAKwUCWy3o J8WhvqykXbuLTMoao6pFkd83YREEjW3kYJS0pDgRTs7VEt83hP9UgSE2d4sjFx/dyH8v U9pove+MFc+RGNJVs61wXb74NjylX6Mi1zYnjBne8nmH3QXm42eaMIrw8KWEuvJ60vVp BrV8gZqytZeaGu/1Ms27lpj5vKUyNsvEmLeWzYZA1quOwWWf4NC3UuEsmX6aoa9pWDNQ dHBg== X-Gm-Message-State: AOAM532mn0Vpw2U3Y7R9ri9xlyl4MtWajLpN7VSSjh/G1AqSwRoIxB01 mtuGmnqhEB0BwSWTVQT7LTTIxFzsGFpCvNanr3TF+w3XEumIeT7Pb5UoiyOUSBEDrSf9Bp7UqTR JwKNFpm/d2K9fww== X-Received: by 2002:a17:907:105e:: with SMTP id oy30mr1361013ejb.258.1621276815575; Mon, 17 May 2021 11:40:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvYrCopwfomk/L2p4Z5MZGhUZEZD8LTxShB7ahMeef4hmMS3n8WPCqUWuZTNVjVdKSJGUtNA== X-Received: by 2002:a17:907:105e:: with SMTP id oy30mr1360985ejb.258.1621276815294; Mon, 17 May 2021 11:40:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, John Snow Cc: Richard Henderson , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v4 4/9] hw/block/fdc: Extract ISA floppy controllers to fdc-isa.c Date: Mon, 17 May 2021 20:39:49 +0200 Message-Id: <20210517183954.1223193-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517183954.1223193-1-philmd@redhat.com> References: <20210517183954.1223193-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Some machines use floppy controllers via the SysBus interface, and don't need to pull in all the ISA code. Extract the ISA specific code to a new unit: fdc-isa.c, and add a new Kconfig symbol: "FDC_ISA". Reviewed-by: John Snow Acked-by: Mark Cave-Ayland Reviewed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc-isa.c | 313 +++++++++++++++++++++++++++++++++++++++++++ hw/block/fdc.c | 257 ----------------------------------- MAINTAINERS | 1 + hw/block/Kconfig | 4 + hw/block/meson.build | 1 + hw/i386/Kconfig | 2 +- hw/isa/Kconfig | 8 +- hw/sparc64/Kconfig | 2 +- 8 files changed, 325 insertions(+), 263 deletions(-) create mode 100644 hw/block/fdc-isa.c diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c new file mode 100644 index 00000000000..97f3f9e5c0a --- /dev/null +++ b/hw/block/fdc-isa.c @@ -0,0 +1,313 @@ +/* + * QEMU Floppy disk emulator (Intel 82078) + * + * Copyright (c) 2003, 2007 Jocelyn Mayer + * Copyright (c) 2008 Herv=C3=A9 Poussineau + * + * 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. + */ +/* + * The controller is used in Sun4m systems in a slightly different + * way. There are changes in DOR register and DMA is not available. + */ + +#include "qemu/osdep.h" +#include "hw/block/fdc.h" +#include "qapi/error.h" +#include "qemu/error-report.h" +#include "qemu/timer.h" +#include "hw/acpi/aml-build.h" +#include "hw/irq.h" +#include "hw/isa/isa.h" +#include "hw/qdev-properties.h" +#include "hw/qdev-properties-system.h" +#include "migration/vmstate.h" +#include "hw/block/block.h" +#include "sysemu/block-backend.h" +#include "sysemu/blockdev.h" +#include "sysemu/sysemu.h" +#include "qemu/log.h" +#include "qemu/main-loop.h" +#include "qemu/module.h" +#include "trace.h" +#include "qom/object.h" +#include "fdc-internal.h" + +OBJECT_DECLARE_SIMPLE_TYPE(FDCtrlISABus, ISA_FDC) + +struct FDCtrlISABus { + ISADevice parent_obj; + + uint32_t iobase; + uint32_t irq; + uint32_t dma; + struct FDCtrl state; + int32_t bootindexA; + int32_t bootindexB; +}; + +static void fdctrl_external_reset_isa(DeviceState *d) +{ + FDCtrlISABus *isa =3D ISA_FDC(d); + FDCtrl *s =3D &isa->state; + + fdctrl_reset(s, 0); +} + +void isa_fdc_init_drives(ISADevice *fdc, DriveInfo **fds) +{ + fdctrl_init_drives(&ISA_FDC(fdc)->state.bus, fds); +} + +static const MemoryRegionPortio fdc_portio_list[] =3D { + { 1, 5, 1, .read =3D fdctrl_read, .write =3D fdctrl_write }, + { 7, 1, 1, .read =3D fdctrl_read, .write =3D fdctrl_write }, + PORTIO_END_OF_LIST(), +}; + +static void isabus_fdc_realize(DeviceState *dev, Error **errp) +{ + ISADevice *isadev =3D ISA_DEVICE(dev); + FDCtrlISABus *isa =3D ISA_FDC(dev); + FDCtrl *fdctrl =3D &isa->state; + Error *err =3D NULL; + + isa_register_portio_list(isadev, &fdctrl->portio_list, + isa->iobase, fdc_portio_list, fdctrl, + "fdc"); + + isa_init_irq(isadev, &fdctrl->irq, isa->irq); + fdctrl->dma_chann =3D isa->dma; + if (fdctrl->dma_chann !=3D -1) { + fdctrl->dma =3D isa_get_dma(isa_bus_from_device(isadev), isa->dma); + if (!fdctrl->dma) { + error_setg(errp, "ISA controller does not support DMA"); + return; + } + } + + qdev_set_legacy_instance_id(dev, isa->iobase, 2); + + fdctrl_realize_common(dev, fdctrl, &err); + if (err !=3D NULL) { + error_propagate(errp, err); + return; + } +} + +FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i) +{ + FDCtrlISABus *isa =3D ISA_FDC(fdc); + + return isa->state.drives[i].drive; +} + +static void isa_fdc_get_drive_max_chs(FloppyDriveType type, uint8_t *maxc, + uint8_t *maxh, uint8_t *maxs) +{ + const FDFormat *fdf; + + *maxc =3D *maxh =3D *maxs =3D 0; + for (fdf =3D fd_formats; fdf->drive !=3D FLOPPY_DRIVE_TYPE_NONE; fdf++= ) { + if (fdf->drive !=3D type) { + continue; + } + if (*maxc < fdf->max_track) { + *maxc =3D fdf->max_track; + } + if (*maxh < fdf->max_head) { + *maxh =3D fdf->max_head; + } + if (*maxs < fdf->last_sect) { + *maxs =3D fdf->last_sect; + } + } + (*maxc)--; +} + +static Aml *build_fdinfo_aml(int idx, FloppyDriveType type) +{ + Aml *dev, *fdi; + uint8_t maxc, maxh, maxs; + + isa_fdc_get_drive_max_chs(type, &maxc, &maxh, &maxs); + + dev =3D aml_device("FLP%c", 'A' + idx); + + aml_append(dev, aml_name_decl("_ADR", aml_int(idx))); + + fdi =3D aml_package(16); + aml_append(fdi, aml_int(idx)); /* Drive Number */ + aml_append(fdi, + aml_int(cmos_get_fd_drive_type(type))); /* Device Type */ + /* + * the values below are the limits of the drive, and are thus independ= ent + * of the inserted media + */ + aml_append(fdi, aml_int(maxc)); /* Maximum Cylinder Number */ + aml_append(fdi, aml_int(maxs)); /* Maximum Sector Number */ + aml_append(fdi, aml_int(maxh)); /* Maximum Head Number */ + /* + * SeaBIOS returns the below values for int 0x13 func 0x08 regardless = of + * the drive type, so shall we + */ + aml_append(fdi, aml_int(0xAF)); /* disk_specify_1 */ + aml_append(fdi, aml_int(0x02)); /* disk_specify_2 */ + aml_append(fdi, aml_int(0x25)); /* disk_motor_wait */ + aml_append(fdi, aml_int(0x02)); /* disk_sector_siz */ + aml_append(fdi, aml_int(0x12)); /* disk_eot */ + aml_append(fdi, aml_int(0x1B)); /* disk_rw_gap */ + aml_append(fdi, aml_int(0xFF)); /* disk_dtl */ + aml_append(fdi, aml_int(0x6C)); /* disk_formt_gap */ + aml_append(fdi, aml_int(0xF6)); /* disk_fill */ + aml_append(fdi, aml_int(0x0F)); /* disk_head_sttl */ + aml_append(fdi, aml_int(0x08)); /* disk_motor_strt */ + + aml_append(dev, aml_name_decl("_FDI", fdi)); + return dev; +} + +int cmos_get_fd_drive_type(FloppyDriveType fd0) +{ + int val; + + switch (fd0) { + case FLOPPY_DRIVE_TYPE_144: + /* 1.44 Mb 3"5 drive */ + val =3D 4; + break; + case FLOPPY_DRIVE_TYPE_288: + /* 2.88 Mb 3"5 drive */ + val =3D 5; + break; + case FLOPPY_DRIVE_TYPE_120: + /* 1.2 Mb 5"5 drive */ + val =3D 2; + break; + case FLOPPY_DRIVE_TYPE_NONE: + default: + val =3D 0; + break; + } + return val; +} + +static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope) +{ + Aml *dev; + Aml *crs; + int i; + +#define ACPI_FDE_MAX_FD 4 + uint32_t fde_buf[5] =3D { + 0, 0, 0, 0, /* presence of floppy drives #0 - #3 */ + cpu_to_le32(2) /* tape presence (2 =3D=3D never present) */ + }; + + crs =3D aml_resource_template(); + aml_append(crs, aml_io(AML_DECODE16, 0x03F2, 0x03F2, 0x00, 0x04)); + aml_append(crs, aml_io(AML_DECODE16, 0x03F7, 0x03F7, 0x00, 0x01)); + aml_append(crs, aml_irq_no_flags(6)); + aml_append(crs, + aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2)); + + dev =3D aml_device("FDC0"); + aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0700"))); + aml_append(dev, aml_name_decl("_CRS", crs)); + + for (i =3D 0; i < MIN(MAX_FD, ACPI_FDE_MAX_FD); i++) { + FloppyDriveType type =3D isa_fdc_get_drive_type(isadev, i); + + if (type < FLOPPY_DRIVE_TYPE_NONE) { + fde_buf[i] =3D cpu_to_le32(1); /* drive present */ + aml_append(dev, build_fdinfo_aml(i, type)); + } + } + aml_append(dev, aml_name_decl("_FDE", + aml_buffer(sizeof(fde_buf), (uint8_t *)fde_buf))); + + aml_append(scope, dev); +} + +static const VMStateDescription vmstate_isa_fdc =3D { + .name =3D "fdc", + .version_id =3D 2, + .minimum_version_id =3D 2, + .fields =3D (VMStateField[]) { + VMSTATE_STRUCT(state, FDCtrlISABus, 0, vmstate_fdc, FDCtrl), + VMSTATE_END_OF_LIST() + } +}; + +static Property isa_fdc_properties[] =3D { + DEFINE_PROP_UINT32("iobase", FDCtrlISABus, iobase, 0x3f0), + DEFINE_PROP_UINT32("irq", FDCtrlISABus, irq, 6), + DEFINE_PROP_UINT32("dma", FDCtrlISABus, dma, 2), + DEFINE_PROP_SIGNED("fdtypeA", FDCtrlISABus, state.qdev_for_drives[0].t= ype, + FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, + FloppyDriveType), + DEFINE_PROP_SIGNED("fdtypeB", FDCtrlISABus, state.qdev_for_drives[1].t= ype, + FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, + FloppyDriveType), + DEFINE_PROP_SIGNED("fallback", FDCtrlISABus, state.fallback, + FLOPPY_DRIVE_TYPE_288, qdev_prop_fdc_drive_type, + FloppyDriveType), + DEFINE_PROP_END_OF_LIST(), +}; + +static void isabus_fdc_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + ISADeviceClass *isa =3D ISA_DEVICE_CLASS(klass); + + dc->realize =3D isabus_fdc_realize; + dc->fw_name =3D "fdc"; + dc->reset =3D fdctrl_external_reset_isa; + dc->vmsd =3D &vmstate_isa_fdc; + isa->build_aml =3D fdc_isa_build_aml; + device_class_set_props(dc, isa_fdc_properties); + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); +} + +static void isabus_fdc_instance_init(Object *obj) +{ + FDCtrlISABus *isa =3D ISA_FDC(obj); + + device_add_bootindex_property(obj, &isa->bootindexA, + "bootindexA", "/floppy@0", + DEVICE(obj)); + device_add_bootindex_property(obj, &isa->bootindexB, + "bootindexB", "/floppy@1", + DEVICE(obj)); +} + +static const TypeInfo isa_fdc_info =3D { + .name =3D TYPE_ISA_FDC, + .parent =3D TYPE_ISA_DEVICE, + .instance_size =3D sizeof(FDCtrlISABus), + .class_init =3D isabus_fdc_class_init, + .instance_init =3D isabus_fdc_instance_init, +}; + +static void isa_fdc_register_types(void) +{ + type_register_static(&isa_fdc_info); +} + +type_init(isa_fdc_register_types) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 300f39672af..50567d972ff 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -32,7 +32,6 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" -#include "hw/acpi/aml-build.h" #include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" @@ -787,19 +786,6 @@ struct FDCtrlSysBus { struct FDCtrl state; }; =20 -OBJECT_DECLARE_SIMPLE_TYPE(FDCtrlISABus, ISA_FDC) - -struct FDCtrlISABus { - ISADevice parent_obj; - - uint32_t iobase; - uint32_t irq; - uint32_t dma; - struct FDCtrl state; - int32_t bootindexA; - int32_t bootindexB; -}; - uint32_t fdctrl_read(void *opaque, uint32_t reg) { FDCtrl *fdctrl =3D opaque; @@ -1123,14 +1109,6 @@ static void fdctrl_external_reset_sysbus(DeviceState= *d) fdctrl_reset(s, 0); } =20 -static void fdctrl_external_reset_isa(DeviceState *d) -{ - FDCtrlISABus *isa =3D ISA_FDC(d); - FDCtrl *s =3D &isa->state; - - fdctrl_reset(s, 0); -} - static void fdctrl_handle_tc(void *opaque, int irq, int level) { trace_fdctrl_tc_pulse(level); @@ -2392,11 +2370,6 @@ void fdctrl_init_drives(FloppyBus *bus, DriveInfo **= fds) } } =20 -void isa_fdc_init_drives(ISADevice *fdc, DriveInfo **fds) -{ - fdctrl_init_drives(&ISA_FDC(fdc)->state.bus, fds); -} - void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, hwaddr mmio_base, DriveInfo **fds) { @@ -2485,41 +2458,6 @@ void fdctrl_realize_common(DeviceState *dev, FDCtrl = *fdctrl, Error **errp) } } =20 -static const MemoryRegionPortio fdc_portio_list[] =3D { - { 1, 5, 1, .read =3D fdctrl_read, .write =3D fdctrl_write }, - { 7, 1, 1, .read =3D fdctrl_read, .write =3D fdctrl_write }, - PORTIO_END_OF_LIST(), -}; - -static void isabus_fdc_realize(DeviceState *dev, Error **errp) -{ - ISADevice *isadev =3D ISA_DEVICE(dev); - FDCtrlISABus *isa =3D ISA_FDC(dev); - FDCtrl *fdctrl =3D &isa->state; - Error *err =3D NULL; - - isa_register_portio_list(isadev, &fdctrl->portio_list, - isa->iobase, fdc_portio_list, fdctrl, - "fdc"); - - isa_init_irq(isadev, &fdctrl->irq, isa->irq); - fdctrl->dma_chann =3D isa->dma; - if (fdctrl->dma_chann !=3D -1) { - fdctrl->dma =3D isa_get_dma(isa_bus_from_device(isadev), isa->dma); - if (!fdctrl->dma) { - error_setg(errp, "ISA controller does not support DMA"); - return; - } - } - - qdev_set_legacy_instance_id(dev, isa->iobase, 2); - fdctrl_realize_common(dev, fdctrl, &err); - if (err !=3D NULL) { - error_propagate(errp, err); - return; - } -} - static void sysbus_fdc_initfn(Object *obj) { SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); @@ -2567,200 +2505,6 @@ static void sysbus_fdc_common_realize(DeviceState *= dev, Error **errp) fdctrl_realize_common(dev, fdctrl, errp); } =20 -FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i) -{ - FDCtrlISABus *isa =3D ISA_FDC(fdc); - - return isa->state.drives[i].drive; -} - -static void isa_fdc_get_drive_max_chs(FloppyDriveType type, uint8_t *maxc, - uint8_t *maxh, uint8_t *maxs) -{ - const FDFormat *fdf; - - *maxc =3D *maxh =3D *maxs =3D 0; - for (fdf =3D fd_formats; fdf->drive !=3D FLOPPY_DRIVE_TYPE_NONE; fdf++= ) { - if (fdf->drive !=3D type) { - continue; - } - if (*maxc < fdf->max_track) { - *maxc =3D fdf->max_track; - } - if (*maxh < fdf->max_head) { - *maxh =3D fdf->max_head; - } - if (*maxs < fdf->last_sect) { - *maxs =3D fdf->last_sect; - } - } - (*maxc)--; -} - -static Aml *build_fdinfo_aml(int idx, FloppyDriveType type) -{ - Aml *dev, *fdi; - uint8_t maxc, maxh, maxs; - - isa_fdc_get_drive_max_chs(type, &maxc, &maxh, &maxs); - - dev =3D aml_device("FLP%c", 'A' + idx); - - aml_append(dev, aml_name_decl("_ADR", aml_int(idx))); - - fdi =3D aml_package(16); - aml_append(fdi, aml_int(idx)); /* Drive Number */ - aml_append(fdi, - aml_int(cmos_get_fd_drive_type(type))); /* Device Type */ - /* - * the values below are the limits of the drive, and are thus independ= ent - * of the inserted media - */ - aml_append(fdi, aml_int(maxc)); /* Maximum Cylinder Number */ - aml_append(fdi, aml_int(maxs)); /* Maximum Sector Number */ - aml_append(fdi, aml_int(maxh)); /* Maximum Head Number */ - /* - * SeaBIOS returns the below values for int 0x13 func 0x08 regardless = of - * the drive type, so shall we - */ - aml_append(fdi, aml_int(0xAF)); /* disk_specify_1 */ - aml_append(fdi, aml_int(0x02)); /* disk_specify_2 */ - aml_append(fdi, aml_int(0x25)); /* disk_motor_wait */ - aml_append(fdi, aml_int(0x02)); /* disk_sector_siz */ - aml_append(fdi, aml_int(0x12)); /* disk_eot */ - aml_append(fdi, aml_int(0x1B)); /* disk_rw_gap */ - aml_append(fdi, aml_int(0xFF)); /* disk_dtl */ - aml_append(fdi, aml_int(0x6C)); /* disk_formt_gap */ - aml_append(fdi, aml_int(0xF6)); /* disk_fill */ - aml_append(fdi, aml_int(0x0F)); /* disk_head_sttl */ - aml_append(fdi, aml_int(0x08)); /* disk_motor_strt */ - - aml_append(dev, aml_name_decl("_FDI", fdi)); - return dev; -} - -int cmos_get_fd_drive_type(FloppyDriveType fd0) -{ - int val; - - switch (fd0) { - case FLOPPY_DRIVE_TYPE_144: - /* 1.44 Mb 3"5 drive */ - val =3D 4; - break; - case FLOPPY_DRIVE_TYPE_288: - /* 2.88 Mb 3"5 drive */ - val =3D 5; - break; - case FLOPPY_DRIVE_TYPE_120: - /* 1.2 Mb 5"5 drive */ - val =3D 2; - break; - case FLOPPY_DRIVE_TYPE_NONE: - default: - val =3D 0; - break; - } - return val; -} - -static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope) -{ - Aml *dev; - Aml *crs; - int i; - -#define ACPI_FDE_MAX_FD 4 - uint32_t fde_buf[5] =3D { - 0, 0, 0, 0, /* presence of floppy drives #0 - #3 */ - cpu_to_le32(2) /* tape presence (2 =3D=3D never present) */ - }; - - crs =3D aml_resource_template(); - aml_append(crs, aml_io(AML_DECODE16, 0x03F2, 0x03F2, 0x00, 0x04)); - aml_append(crs, aml_io(AML_DECODE16, 0x03F7, 0x03F7, 0x00, 0x01)); - aml_append(crs, aml_irq_no_flags(6)); - aml_append(crs, - aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2)); - - dev =3D aml_device("FDC0"); - aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0700"))); - aml_append(dev, aml_name_decl("_CRS", crs)); - - for (i =3D 0; i < MIN(MAX_FD, ACPI_FDE_MAX_FD); i++) { - FloppyDriveType type =3D isa_fdc_get_drive_type(isadev, i); - - if (type < FLOPPY_DRIVE_TYPE_NONE) { - fde_buf[i] =3D cpu_to_le32(1); /* drive present */ - aml_append(dev, build_fdinfo_aml(i, type)); - } - } - aml_append(dev, aml_name_decl("_FDE", - aml_buffer(sizeof(fde_buf), (uint8_t *)fde_buf))); - - aml_append(scope, dev); -} - -static const VMStateDescription vmstate_isa_fdc =3D{ - .name =3D "fdc", - .version_id =3D 2, - .minimum_version_id =3D 2, - .fields =3D (VMStateField[]) { - VMSTATE_STRUCT(state, FDCtrlISABus, 0, vmstate_fdc, FDCtrl), - VMSTATE_END_OF_LIST() - } -}; - -static Property isa_fdc_properties[] =3D { - DEFINE_PROP_UINT32("iobase", FDCtrlISABus, iobase, 0x3f0), - DEFINE_PROP_UINT32("irq", FDCtrlISABus, irq, 6), - DEFINE_PROP_UINT32("dma", FDCtrlISABus, dma, 2), - DEFINE_PROP_SIGNED("fdtypeA", FDCtrlISABus, state.qdev_for_drives[0].t= ype, - FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, - FloppyDriveType), - DEFINE_PROP_SIGNED("fdtypeB", FDCtrlISABus, state.qdev_for_drives[1].t= ype, - FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, - FloppyDriveType), - DEFINE_PROP_SIGNED("fallback", FDCtrlISABus, state.fallback, - FLOPPY_DRIVE_TYPE_288, qdev_prop_fdc_drive_type, - FloppyDriveType), - DEFINE_PROP_END_OF_LIST(), -}; - -static void isabus_fdc_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - ISADeviceClass *isa =3D ISA_DEVICE_CLASS(klass); - - dc->realize =3D isabus_fdc_realize; - dc->fw_name =3D "fdc"; - dc->reset =3D fdctrl_external_reset_isa; - dc->vmsd =3D &vmstate_isa_fdc; - isa->build_aml =3D fdc_isa_build_aml; - device_class_set_props(dc, isa_fdc_properties); - set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); -} - -static void isabus_fdc_instance_init(Object *obj) -{ - FDCtrlISABus *isa =3D ISA_FDC(obj); - - device_add_bootindex_property(obj, &isa->bootindexA, - "bootindexA", "/floppy@0", - DEVICE(obj)); - device_add_bootindex_property(obj, &isa->bootindexB, - "bootindexB", "/floppy@1", - DEVICE(obj)); -} - -static const TypeInfo isa_fdc_info =3D { - .name =3D TYPE_ISA_FDC, - .parent =3D TYPE_ISA_DEVICE, - .instance_size =3D sizeof(FDCtrlISABus), - .class_init =3D isabus_fdc_class_init, - .instance_init =3D isabus_fdc_instance_init, -}; - static const VMStateDescription vmstate_sysbus_fdc =3D{ .name =3D "fdc", .version_id =3D 2, @@ -2844,7 +2588,6 @@ static const TypeInfo sysbus_fdc_type_info =3D { =20 static void fdc_register_types(void) { - type_register_static(&isa_fdc_info); type_register_static(&sysbus_fdc_type_info); type_register_static(&sysbus_fdc_info); type_register_static(&sun4m_fdc_info); diff --git a/MAINTAINERS b/MAINTAINERS index b1b50c6c334..0590cbde003 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1660,6 +1660,7 @@ L: qemu-block@nongnu.org S: Supported F: hw/block/fdc.c F: hw/block/fdc-internal.h +F: hw/block/fdc-isa.c F: include/hw/block/fdc.h F: tests/qtest/fdc-test.c T: git https://gitlab.com/jsnow/qemu.git ide diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 4fcd1521668..0a2c046fa6c 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -1,5 +1,9 @@ config FDC bool + +config FDC_ISA + bool + select FDC # FIXME: there is no separate file for the MMIO floppy disk controller= , so # select ISA_BUS here instead of polluting each board that requires one select ISA_BUS diff --git a/hw/block/meson.build b/hw/block/meson.build index 5b4a7699f98..f33a665c945 100644 --- a/hw/block/meson.build +++ b/hw/block/meson.build @@ -5,6 +5,7 @@ )) softmmu_ss.add(when: 'CONFIG_ECC', if_true: files('ecc.c')) softmmu_ss.add(when: 'CONFIG_FDC', if_true: files('fdc.c')) +softmmu_ss.add(when: 'CONFIG_FDC_ISA', if_true: files('fdc-isa.c')) softmmu_ss.add(when: 'CONFIG_NAND', if_true: files('nand.c')) softmmu_ss.add(when: 'CONFIG_ONENAND', if_true: files('onenand.c')) softmmu_ss.add(when: 'CONFIG_PFLASH_CFI01', if_true: files('pflash_cfi01.c= ')) diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 7f91f30877f..bb475648c97 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -23,7 +23,7 @@ config PC imply TPM_TIS_ISA imply VGA_PCI imply VIRTIO_VGA - select FDC + select FDC_ISA select I8259 select I8254 select PCKBD diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 7216f66a54a..96db170eff3 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -17,7 +17,7 @@ config ISA_SUPERIO bool select ISA_BUS select PCKBD - select FDC + select FDC_ISA =20 config PC87312 bool @@ -28,7 +28,7 @@ config PC87312 select MC146818RTC select SERIAL_ISA select PARALLEL - select FDC + select FDC_ISA select IDE_ISA =20 config PIIX3 @@ -47,7 +47,7 @@ config VT82C686 select ISA_SUPERIO select ACPI_SMBUS select SERIAL_ISA - select FDC + select FDC_ISA select USB_UHCI select APM =20 @@ -56,7 +56,7 @@ config SMC37C669 select ISA_SUPERIO select SERIAL_ISA select PARALLEL - select FDC + select FDC_ISA =20 config LPC_ICH9 bool diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index 980a201bb73..7e557ad17b0 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -6,7 +6,7 @@ config SUN4U imply PARALLEL select M48T59 select ISA_BUS - select FDC + select FDC_ISA select SERIAL_ISA select PCI_SABRE select IDE_CMD646 --=20 2.26.3 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621276824; cv=none; d=zohomail.com; s=zohoarc; b=m8TzGBVbawVfwlfO3our3gkJfQToctLqfxNXe3Py7jgJwlcbnTQt7n+FNT1K+wL8mOuIwLQfc3i/AUC7BGzY0DxAtDW8ja+NawlC0M/JSsX5XfHdjzAP/mw3qlszRi3K/qV0Ss24BzVQQoPqkhcOGFx/sH29j+PNgEboLjgXfVQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621276824; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=qsjVmNyt2RvJZpbgrVA73zwoNPAL1GWOK/xDhDEI+0c=; b=L0pv7ozWBAjN/mEJCRvbXY8MzQ6g11AgT7zhrhjkw8Kvhwkq3CLmsBh+0o9lKo0U/z475OQmYqq3JA46TYH1yPzIKL/YpLTLQXYq6ap3Nas6l/7942FH0fhM6bDAJQoObCSdKnAU0eSocnpvxHp4wPvNUkeIlpR/tzt9U7de0Es= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621276824436444.2682067317056; Mon, 17 May 2021 11:40:24 -0700 (PDT) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-593-tggKJR_lPhSTKECcxnzWbw-1; Mon, 17 May 2021 14:40:21 -0400 Received: by mail-ed1-f71.google.com with SMTP id d4-20020aa7ce040000b029038d1d0524d0so3648660edv.3 for ; Mon, 17 May 2021 11:40:21 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id k14sm8007535eds.0.2021.05.17.11.40.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 11:40:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621276823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qsjVmNyt2RvJZpbgrVA73zwoNPAL1GWOK/xDhDEI+0c=; b=Ki0u75to0U4CCGC0rZCQj0x7bxJ7QcruoOIs7LLHKihmOsD5pWc1Pp0PXLSiISrWlr4WCP 3Wb6YkbvX2/dFiSoagncTyjHZ/RL1Y1mlmD1MYBw+4/Dw2eck4GqbEBU9LIqzLJKQPAq/A RPRmz5N9KtQoJR878o8bfmERJlI5lI8= X-MC-Unique: tggKJR_lPhSTKECcxnzWbw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qsjVmNyt2RvJZpbgrVA73zwoNPAL1GWOK/xDhDEI+0c=; b=iE5cr6WCpdbv0ExVwoj/YeMh9hJve73IPhCFx856NdmyhHpS2kXUX8dJYjYwt7gBPc vtwP3JfL3iZnsdKD+k/+3nr4q8I/wvuxa5LwsCO3quvpAWBZ2KnDnjG9RQGEh/BTq4lX Lsn6clhVzdr7kRH/AW6hBA82pXsbS9Td34DkiDTisWT1UP+nHSnS2GaD8o4EZETY83S/ kLQpkBLUoiC4DKLQeTLv5M4gEd9YhuJLZv+g3DjdJS62N3U2VaYaTVksn4tzKxL0RZ6h rIE8JAyQQ1VsThfpTFo/fgaNGBnaAr+xqlsKVzM0IKE7blB3txoJwejjbvkamzz96Fwy GRhQ== X-Gm-Message-State: AOAM532ph5YuSZ7AoZyhiA3Y+rsGM/b8ped6+G2qUpghk/oxDaT7HH4u U5UJPyUddyqmVzwusSNtCcaaYoNDBAo3MO312swkPyi0VscFSK8XNTSnr+4IUUA0U3Z9miE24qH pPsJfr8MPF233rw== X-Received: by 2002:a17:907:98a9:: with SMTP id ju9mr1327724ejc.257.1621276820512; Mon, 17 May 2021 11:40:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0+ku/3aEiIUG1J3mAURNdwCMukk/bxePu6hsNlwM/a8sDMQj8548kSmigjIGZ6/6NyxVRfg== X-Received: by 2002:a17:907:98a9:: with SMTP id ju9mr1327698ejc.257.1621276820205; Mon, 17 May 2021 11:40:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, John Snow Cc: Richard Henderson , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v4 5/9] hw/block/fdc: Extract SysBus floppy controllers to fdc-sysbus.c Date: Mon, 17 May 2021 20:39:50 +0200 Message-Id: <20210517183954.1223193-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517183954.1223193-1-philmd@redhat.com> References: <20210517183954.1223193-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Some machines use floppy controllers via the SysBus interface, and don't need to pull in all the SysBus code. Extract the SysBus specific code to a new unit: fdc-sysbus.c, and add a new Kconfig symbol: "FDC_SYSBUS". Reviewed-by: John Snow Acked-by: Mark Cave-Ayland Reviewed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc-sysbus.c | 252 ++++++++++++++++++++++++++++++++++++++++++ hw/block/fdc.c | 220 ------------------------------------ MAINTAINERS | 1 + hw/block/Kconfig | 4 + hw/block/meson.build | 1 + hw/block/trace-events | 2 + hw/mips/Kconfig | 2 +- hw/sparc/Kconfig | 2 +- 8 files changed, 262 insertions(+), 222 deletions(-) create mode 100644 hw/block/fdc-sysbus.c diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c new file mode 100644 index 00000000000..71755fd6ae4 --- /dev/null +++ b/hw/block/fdc-sysbus.c @@ -0,0 +1,252 @@ +/* + * QEMU Floppy disk emulator (Intel 82078) + * + * Copyright (c) 2003, 2007 Jocelyn Mayer + * Copyright (c) 2008 Herv=C3=A9 Poussineau + * + * 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. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qom/object.h" +#include "hw/sysbus.h" +#include "hw/block/fdc.h" +#include "migration/vmstate.h" +#include "fdc-internal.h" +#include "trace.h" + +#define TYPE_SYSBUS_FDC "base-sysbus-fdc" +typedef struct FDCtrlSysBusClass FDCtrlSysBusClass; +typedef struct FDCtrlSysBus FDCtrlSysBus; +DECLARE_OBJ_CHECKERS(FDCtrlSysBus, FDCtrlSysBusClass, + SYSBUS_FDC, TYPE_SYSBUS_FDC) + +struct FDCtrlSysBusClass { + /*< private >*/ + SysBusDeviceClass parent_class; + /*< public >*/ + + bool use_strict_io; +}; + +struct FDCtrlSysBus { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + + struct FDCtrl state; +}; + +static uint64_t fdctrl_read_mem(void *opaque, hwaddr reg, unsigned ize) +{ + return fdctrl_read(opaque, (uint32_t)reg); +} + +static void fdctrl_write_mem(void *opaque, hwaddr reg, + uint64_t value, unsigned size) +{ + fdctrl_write(opaque, (uint32_t)reg, value); +} + +static const MemoryRegionOps fdctrl_mem_ops =3D { + .read =3D fdctrl_read_mem, + .write =3D fdctrl_write_mem, + .endianness =3D DEVICE_NATIVE_ENDIAN, +}; + +static const MemoryRegionOps fdctrl_mem_strict_ops =3D { + .read =3D fdctrl_read_mem, + .write =3D fdctrl_write_mem, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 1, + .max_access_size =3D 1, + }, +}; + +static void fdctrl_external_reset_sysbus(DeviceState *d) +{ + FDCtrlSysBus *sys =3D SYSBUS_FDC(d); + FDCtrl *s =3D &sys->state; + + fdctrl_reset(s, 0); +} + +static void fdctrl_handle_tc(void *opaque, int irq, int level) +{ + trace_fdctrl_tc_pulse(level); +} + +void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, + hwaddr mmio_base, DriveInfo **fds) +{ + FDCtrl *fdctrl; + DeviceState *dev; + SysBusDevice *sbd; + FDCtrlSysBus *sys; + + dev =3D qdev_new("sysbus-fdc"); + sys =3D SYSBUS_FDC(dev); + fdctrl =3D &sys->state; + fdctrl->dma_chann =3D dma_chann; /* FIXME */ + sbd =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(sbd, &error_fatal); + sysbus_connect_irq(sbd, 0, irq); + sysbus_mmio_map(sbd, 0, mmio_base); + + fdctrl_init_drives(&sys->state.bus, fds); +} + +void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, + DriveInfo **fds, qemu_irq *fdc_tc) +{ + DeviceState *dev; + FDCtrlSysBus *sys; + + dev =3D qdev_new("sun-fdtwo"); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sys =3D SYSBUS_FDC(dev); + sysbus_connect_irq(SYS_BUS_DEVICE(sys), 0, irq); + sysbus_mmio_map(SYS_BUS_DEVICE(sys), 0, io_base); + *fdc_tc =3D qdev_get_gpio_in(dev, 0); + + fdctrl_init_drives(&sys->state.bus, fds); +} + +static void sysbus_fdc_common_initfn(Object *obj) +{ + DeviceState *dev =3D DEVICE(obj); + FDCtrlSysBusClass *sbdc =3D SYSBUS_FDC_GET_CLASS(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); + FDCtrlSysBus *sys =3D SYSBUS_FDC(obj); + FDCtrl *fdctrl =3D &sys->state; + + fdctrl->dma_chann =3D -1; + + qdev_set_legacy_instance_id(dev, 0 /* io */, 2); /* FIXME */ + + memory_region_init_io(&fdctrl->iomem, obj, + sbdc->use_strict_io ? &fdctrl_mem_strict_ops + : &fdctrl_mem_ops, + fdctrl, "fdc", 0x08); + sysbus_init_mmio(sbd, &fdctrl->iomem); + + sysbus_init_irq(sbd, &fdctrl->irq); + qdev_init_gpio_in(dev, fdctrl_handle_tc, 1); +} + +static void sysbus_fdc_common_realize(DeviceState *dev, Error **errp) +{ + FDCtrlSysBus *sys =3D SYSBUS_FDC(dev); + FDCtrl *fdctrl =3D &sys->state; + + fdctrl_realize_common(dev, fdctrl, errp); +} + +static const VMStateDescription vmstate_sysbus_fdc =3D { + .name =3D "fdc", + .version_id =3D 2, + .minimum_version_id =3D 2, + .fields =3D (VMStateField[]) { + VMSTATE_STRUCT(state, FDCtrlSysBus, 0, vmstate_fdc, FDCtrl), + VMSTATE_END_OF_LIST() + } +}; + +static Property sysbus_fdc_properties[] =3D { + DEFINE_PROP_SIGNED("fdtypeA", FDCtrlSysBus, state.qdev_for_drives[0].t= ype, + FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, + FloppyDriveType), + DEFINE_PROP_SIGNED("fdtypeB", FDCtrlSysBus, state.qdev_for_drives[1].t= ype, + FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, + FloppyDriveType), + DEFINE_PROP_SIGNED("fallback", FDCtrlSysBus, state.fallback, + FLOPPY_DRIVE_TYPE_144, qdev_prop_fdc_drive_type, + FloppyDriveType), + DEFINE_PROP_END_OF_LIST(), +}; + +static void sysbus_fdc_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + device_class_set_props(dc, sysbus_fdc_properties); + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); +} + +static const TypeInfo sysbus_fdc_info =3D { + .name =3D "sysbus-fdc", + .parent =3D TYPE_SYSBUS_FDC, + .class_init =3D sysbus_fdc_class_init, +}; + +static void sysbus_fdc_common_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->realize =3D sysbus_fdc_common_realize; + dc->reset =3D fdctrl_external_reset_sysbus; + dc->vmsd =3D &vmstate_sysbus_fdc; +} + +static const TypeInfo sysbus_fdc_type_info =3D { + .name =3D TYPE_SYSBUS_FDC, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(FDCtrlSysBus), + .instance_init =3D sysbus_fdc_common_initfn, + .abstract =3D true, + .class_init =3D sysbus_fdc_common_class_init, + .class_size =3D sizeof(FDCtrlSysBusClass), +}; + +static Property sun4m_fdc_properties[] =3D { + DEFINE_PROP_SIGNED("fdtype", FDCtrlSysBus, state.qdev_for_drives[0].ty= pe, + FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, + FloppyDriveType), + DEFINE_PROP_SIGNED("fallback", FDCtrlSysBus, state.fallback, + FLOPPY_DRIVE_TYPE_144, qdev_prop_fdc_drive_type, + FloppyDriveType), + DEFINE_PROP_END_OF_LIST(), +}; + +static void sun4m_fdc_class_init(ObjectClass *klass, void *data) +{ + FDCtrlSysBusClass *sbdc =3D SYSBUS_FDC_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); + + sbdc->use_strict_io =3D true; + device_class_set_props(dc, sun4m_fdc_properties); + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); +} + +static const TypeInfo sun4m_fdc_info =3D { + .name =3D "sun-fdtwo", + .parent =3D TYPE_SYSBUS_FDC, + .class_init =3D sun4m_fdc_class_init, +}; + +static void sysbus_fdc_register_types(void) +{ + type_register_static(&sun4m_fdc_info); + type_register_static(&sysbus_fdc_type_info); + type_register_static(&sysbus_fdc_info); +} + +type_init(sysbus_fdc_register_types) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 50567d972ff..64af4d194ce 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -36,7 +36,6 @@ #include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" -#include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/block/block.h" #include "sysemu/block-backend.h" @@ -775,17 +774,6 @@ static FloppyDriveType get_fallback_drive_type(FDrive = *drv) return drv->fdctrl->fallback; } =20 -#define TYPE_SYSBUS_FDC "base-sysbus-fdc" -OBJECT_DECLARE_SIMPLE_TYPE(FDCtrlSysBus, SYSBUS_FDC) - -struct FDCtrlSysBus { - /*< private >*/ - SysBusDevice parent_obj; - /*< public >*/ - - struct FDCtrl state; -}; - uint32_t fdctrl_read(void *opaque, uint32_t reg) { FDCtrl *fdctrl =3D opaque; @@ -850,34 +838,6 @@ void fdctrl_write(void *opaque, uint32_t reg, uint32_t= value) } } =20 -static uint64_t fdctrl_read_mem (void *opaque, hwaddr reg, - unsigned ize) -{ - return fdctrl_read(opaque, (uint32_t)reg); -} - -static void fdctrl_write_mem (void *opaque, hwaddr reg, - uint64_t value, unsigned size) -{ - fdctrl_write(opaque, (uint32_t)reg, value); -} - -static const MemoryRegionOps fdctrl_mem_ops =3D { - .read =3D fdctrl_read_mem, - .write =3D fdctrl_write_mem, - .endianness =3D DEVICE_NATIVE_ENDIAN, -}; - -static const MemoryRegionOps fdctrl_mem_strict_ops =3D { - .read =3D fdctrl_read_mem, - .write =3D fdctrl_write_mem, - .endianness =3D DEVICE_NATIVE_ENDIAN, - .valid =3D { - .min_access_size =3D 1, - .max_access_size =3D 1, - }, -}; - static bool fdrive_media_changed_needed(void *opaque) { FDrive *drive =3D opaque; @@ -1101,19 +1061,6 @@ const VMStateDescription vmstate_fdc =3D { } }; =20 -static void fdctrl_external_reset_sysbus(DeviceState *d) -{ - FDCtrlSysBus *sys =3D SYSBUS_FDC(d); - FDCtrl *s =3D &sys->state; - - fdctrl_reset(s, 0); -} - -static void fdctrl_handle_tc(void *opaque, int irq, int level) -{ - trace_fdctrl_tc_pulse(level); -} - /* Change IRQ state */ static void fdctrl_reset_irq(FDCtrl *fdctrl) { @@ -2370,42 +2317,6 @@ void fdctrl_init_drives(FloppyBus *bus, DriveInfo **= fds) } } =20 -void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, - hwaddr mmio_base, DriveInfo **fds) -{ - FDCtrl *fdctrl; - DeviceState *dev; - SysBusDevice *sbd; - FDCtrlSysBus *sys; - - dev =3D qdev_new("sysbus-fdc"); - sys =3D SYSBUS_FDC(dev); - fdctrl =3D &sys->state; - fdctrl->dma_chann =3D dma_chann; /* FIXME */ - sbd =3D SYS_BUS_DEVICE(dev); - sysbus_realize_and_unref(sbd, &error_fatal); - sysbus_connect_irq(sbd, 0, irq); - sysbus_mmio_map(sbd, 0, mmio_base); - - fdctrl_init_drives(&sys->state.bus, fds); -} - -void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, - DriveInfo **fds, qemu_irq *fdc_tc) -{ - DeviceState *dev; - FDCtrlSysBus *sys; - - dev =3D qdev_new("sun-fdtwo"); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); - sys =3D SYSBUS_FDC(dev); - sysbus_connect_irq(SYS_BUS_DEVICE(sys), 0, irq); - sysbus_mmio_map(SYS_BUS_DEVICE(sys), 0, io_base); - *fdc_tc =3D qdev_get_gpio_in(dev, 0); - - fdctrl_init_drives(&sys->state.bus, fds); -} - void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl, Error **errp) { int i, j; @@ -2458,139 +2369,8 @@ void fdctrl_realize_common(DeviceState *dev, FDCtrl= *fdctrl, Error **errp) } } =20 -static void sysbus_fdc_initfn(Object *obj) -{ - SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); - FDCtrlSysBus *sys =3D SYSBUS_FDC(obj); - FDCtrl *fdctrl =3D &sys->state; - - fdctrl->dma_chann =3D -1; - - memory_region_init_io(&fdctrl->iomem, obj, &fdctrl_mem_ops, fdctrl, - "fdc", 0x08); - sysbus_init_mmio(sbd, &fdctrl->iomem); -} - -static void sun4m_fdc_initfn(Object *obj) -{ - SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); - FDCtrlSysBus *sys =3D SYSBUS_FDC(obj); - FDCtrl *fdctrl =3D &sys->state; - - fdctrl->dma_chann =3D -1; - - memory_region_init_io(&fdctrl->iomem, obj, &fdctrl_mem_strict_ops, - fdctrl, "fdctrl", 0x08); - sysbus_init_mmio(sbd, &fdctrl->iomem); -} - -static void sysbus_fdc_common_initfn(Object *obj) -{ - DeviceState *dev =3D DEVICE(obj); - SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); - FDCtrlSysBus *sys =3D SYSBUS_FDC(obj); - FDCtrl *fdctrl =3D &sys->state; - - qdev_set_legacy_instance_id(dev, 0 /* io */, 2); /* FIXME */ - - sysbus_init_irq(sbd, &fdctrl->irq); - qdev_init_gpio_in(dev, fdctrl_handle_tc, 1); -} - -static void sysbus_fdc_common_realize(DeviceState *dev, Error **errp) -{ - FDCtrlSysBus *sys =3D SYSBUS_FDC(dev); - FDCtrl *fdctrl =3D &sys->state; - - fdctrl_realize_common(dev, fdctrl, errp); -} - -static const VMStateDescription vmstate_sysbus_fdc =3D{ - .name =3D "fdc", - .version_id =3D 2, - .minimum_version_id =3D 2, - .fields =3D (VMStateField[]) { - VMSTATE_STRUCT(state, FDCtrlSysBus, 0, vmstate_fdc, FDCtrl), - VMSTATE_END_OF_LIST() - } -}; - -static Property sysbus_fdc_properties[] =3D { - DEFINE_PROP_SIGNED("fdtypeA", FDCtrlSysBus, state.qdev_for_drives[0].t= ype, - FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, - FloppyDriveType), - DEFINE_PROP_SIGNED("fdtypeB", FDCtrlSysBus, state.qdev_for_drives[1].t= ype, - FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, - FloppyDriveType), - DEFINE_PROP_SIGNED("fallback", FDCtrlSysBus, state.fallback, - FLOPPY_DRIVE_TYPE_144, qdev_prop_fdc_drive_type, - FloppyDriveType), - DEFINE_PROP_END_OF_LIST(), -}; - -static void sysbus_fdc_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - - device_class_set_props(dc, sysbus_fdc_properties); - set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); -} - -static const TypeInfo sysbus_fdc_info =3D { - .name =3D "sysbus-fdc", - .parent =3D TYPE_SYSBUS_FDC, - .instance_init =3D sysbus_fdc_initfn, - .class_init =3D sysbus_fdc_class_init, -}; - -static Property sun4m_fdc_properties[] =3D { - DEFINE_PROP_SIGNED("fdtype", FDCtrlSysBus, state.qdev_for_drives[0].ty= pe, - FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, - FloppyDriveType), - DEFINE_PROP_SIGNED("fallback", FDCtrlSysBus, state.fallback, - FLOPPY_DRIVE_TYPE_144, qdev_prop_fdc_drive_type, - FloppyDriveType), - DEFINE_PROP_END_OF_LIST(), -}; - -static void sun4m_fdc_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - - device_class_set_props(dc, sun4m_fdc_properties); - set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); -} - -static const TypeInfo sun4m_fdc_info =3D { - .name =3D "sun-fdtwo", - .parent =3D TYPE_SYSBUS_FDC, - .instance_init =3D sun4m_fdc_initfn, - .class_init =3D sun4m_fdc_class_init, -}; - -static void sysbus_fdc_common_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - - dc->realize =3D sysbus_fdc_common_realize; - dc->reset =3D fdctrl_external_reset_sysbus; - dc->vmsd =3D &vmstate_sysbus_fdc; -} - -static const TypeInfo sysbus_fdc_type_info =3D { - .name =3D TYPE_SYSBUS_FDC, - .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(FDCtrlSysBus), - .instance_init =3D sysbus_fdc_common_initfn, - .abstract =3D true, - .class_init =3D sysbus_fdc_common_class_init, -}; - static void fdc_register_types(void) { - type_register_static(&sysbus_fdc_type_info); - type_register_static(&sysbus_fdc_info); - type_register_static(&sun4m_fdc_info); type_register_static(&floppy_bus_info); type_register_static(&floppy_drive_info); } diff --git a/MAINTAINERS b/MAINTAINERS index 0590cbde003..b3c1242efcf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1661,6 +1661,7 @@ S: Supported F: hw/block/fdc.c F: hw/block/fdc-internal.h F: hw/block/fdc-isa.c +F: hw/block/fdc-sysbus.c F: include/hw/block/fdc.h F: tests/qtest/fdc-test.c T: git https://gitlab.com/jsnow/qemu.git ide diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 0a2c046fa6c..d50be837666 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -8,6 +8,10 @@ config FDC_ISA # select ISA_BUS here instead of polluting each board that requires one select ISA_BUS =20 +config FDC_SYSBUS + bool + select FDC + config SSI_M25P80 bool =20 diff --git a/hw/block/meson.build b/hw/block/meson.build index f33a665c945..c3935350485 100644 --- a/hw/block/meson.build +++ b/hw/block/meson.build @@ -6,6 +6,7 @@ softmmu_ss.add(when: 'CONFIG_ECC', if_true: files('ecc.c')) softmmu_ss.add(when: 'CONFIG_FDC', if_true: files('fdc.c')) softmmu_ss.add(when: 'CONFIG_FDC_ISA', if_true: files('fdc-isa.c')) +softmmu_ss.add(when: 'CONFIG_FDC_SYSBUS', if_true: files('fdc-sysbus.c')) softmmu_ss.add(when: 'CONFIG_NAND', if_true: files('nand.c')) softmmu_ss.add(when: 'CONFIG_ONENAND', if_true: files('onenand.c')) softmmu_ss.add(when: 'CONFIG_PFLASH_CFI01', if_true: files('pflash_cfi01.c= ')) diff --git a/hw/block/trace-events b/hw/block/trace-events index 306989c193c..266b34393a3 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -3,6 +3,8 @@ # fdc.c fdc_ioport_read(uint8_t reg, uint8_t value) "read reg 0x%02x val 0x%02x" fdc_ioport_write(uint8_t reg, uint8_t value) "write reg 0x%02x val 0x%02x" + +# fdc-sysbus.c fdctrl_tc_pulse(int level) "TC pulse: %u" =20 # pflash_cfi01.c diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index aadd436bf4e..c245e881a2b 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -20,7 +20,7 @@ config JAZZ select G364FB select DP8393X select ESP - select FDC + select FDC_SYSBUS select MC146818RTC select PCKBD select SERIAL diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig index 8dcb10086fd..79d58beb7a6 100644 --- a/hw/sparc/Kconfig +++ b/hw/sparc/Kconfig @@ -8,7 +8,7 @@ config SUN4M select UNIMP select ESCC select ESP - select FDC + select FDC_SYSBUS select SLAVIO select LANCE select M48T59 --=20 2.26.3 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621276829; cv=none; d=zohomail.com; s=zohoarc; b=OQ7WJj7ChXPXa4H0nFOzWWTOJ/eJwMXgoPo+yZhuv3BoVw5xV1FDRfnU8mZ/e4EKvCC0nmMC86Od/lIH+dRnJ+qc5UkwrnJr7NZ1NzKu0n44ld+urlNahdluLDNP/tl4Ob2zi+nC6fZGG7tGRUICgyGNdl9KnCyTlYgxWClvfqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621276829; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Fhf+AVXUBClcrbXUaAt1JBIAw3G0Rh6YDh+yCprkS/g=; b=ZYO/bBKRpGP8cJxlAIrxEZwHhjanRpbRZNGMigcQiAV9bMptUXyiYVQntXg3zKPm1S9vOnXLmqNzZR0ryGe5bJcP59KP22PMMYfcW9zWmYMEFBSJz2gtmvcBnS4qN+d0Ko3/62pZ43q2lpIW5jS/7yt/OhRyUCSNljXJfnH5hQo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 162127682948435.57720563548537; Mon, 17 May 2021 11:40:29 -0700 (PDT) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-218-GjO7hVtFMgigp_7IcN9Bag-1; Mon, 17 May 2021 14:40:27 -0400 Received: by mail-ej1-f70.google.com with SMTP id z1-20020a1709068141b02903cd421d7803so1381157ejw.22 for ; Mon, 17 May 2021 11:40:26 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id by20sm8910082ejc.74.2021.05.17.11.40.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 11:40:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621276828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fhf+AVXUBClcrbXUaAt1JBIAw3G0Rh6YDh+yCprkS/g=; b=LexeYyRaQvmW4sZ9jeoXIeIr7SMXdQCu1M9VGD7+rmfvjku6g/NGW9qdl9L5pyiLVv1XvX 3dexVbPreZSloM1fVKyilUIHBBkLah0QBLDnvayMWhcPdQbfW2VHdWhAv0bDPDIPq0nauu +2w9kGcWmxtJmZNMPsJ1Q3dr4x6AZUg= X-MC-Unique: GjO7hVtFMgigp_7IcN9Bag-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Fhf+AVXUBClcrbXUaAt1JBIAw3G0Rh6YDh+yCprkS/g=; b=RVjt6gpUDgn6Pnlr7bYZMzHXnR6nHRBfS5wmHW17Jvs45LHWeVrtXju+oMY6ceZmPP vqS2+jleJiYQ9eUAjIWyjJyTv2o22ezNT4ntS3cjz8wI1MliJ38FbyPywtJh3/krP1Zi 3JoFQttjqaUJi2/FSM30ppMx2Junml21FEjcLH+HEzEX6WeAqG+6URwfWlu4BfKlpTrS k4VoVOi/Z4jQljZ5Al/VpPEWDnCu9lQQcCAqhWBx5SzjsrTSe8vcsM1Dv2lPpeLJlObL pB2G6FEeqzZXwU5ZkA2O+PsF4gsHfXpZpGhMlM2XzOzUGDbhkB1ry99Riu0NYmIblzT0 /P9Q== X-Gm-Message-State: AOAM531mQ/e8MBHx+bUt62T63j9OoWF9m8TYIH4/6c6nHwDnf/e+TJ+4 XV0AsHO+Oad7ahsunm/saTCCsupG1N2BkrurLxHmSCia2cIMpcIVTF7kZQ9TPVDRJ0PHGSyeMpI yXfPmkTGXeeSTnA== X-Received: by 2002:a17:906:8504:: with SMTP id i4mr1341110ejx.515.1621276826013; Mon, 17 May 2021 11:40:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwI25QZdGx5K5036VJZ1wQnYc07b3av8RE1OIQJVkNO3YY4aybrEVSrm5HkmE2BY8Ws/E5S8Q== X-Received: by 2002:a17:906:8504:: with SMTP id i4mr1341094ejx.515.1621276825893; Mon, 17 May 2021 11:40:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, John Snow Cc: Richard Henderson , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v4 6/9] hw/block/fdc: Add sysbus_fdc_init_drives() method Date: Mon, 17 May 2021 20:39:51 +0200 Message-Id: <20210517183954.1223193-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517183954.1223193-1-philmd@redhat.com> References: <20210517183954.1223193-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) FDCtrlSysBus's FDCtrl state is a private field. However it is accessed by the public fdctrl_init_sysbus() and sun4m_fdctrl_init() methods. To be able to move them out of fdc-sysbus.c, first add the sysbus_fdc_init_drives() method and use it in these 2 functions. Reviewed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/block/fdc.h | 2 ++ hw/block/fdc-sysbus.c | 23 ++++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index 1ecca7cac7f..52e45c53078 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -3,6 +3,7 @@ =20 #include "exec/hwaddr.h" #include "qapi/qapi-types-block.h" +#include "hw/sysbus.h" =20 /* fdc.c */ #define MAX_FD 2 @@ -10,6 +11,7 @@ #define TYPE_ISA_FDC "isa-fdc" =20 void isa_fdc_init_drives(ISADevice *fdc, DriveInfo **fds); +void sysbus_fdc_init_drives(SysBusDevice *dev, DriveInfo **fds); void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, hwaddr mmio_base, DriveInfo **fds); void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c index 71755fd6ae4..1163e53165d 100644 --- a/hw/block/fdc-sysbus.c +++ b/hw/block/fdc-sysbus.c @@ -94,6 +94,15 @@ static void fdctrl_handle_tc(void *opaque, int irq, int = level) trace_fdctrl_tc_pulse(level); } =20 +void sysbus_fdc_init_drives(SysBusDevice *dev, DriveInfo **fds) +{ + FDCtrlSysBus *fdc; + + fdc =3D SYSBUS_FDC(dev); + + fdctrl_init_drives(&fdc->state.bus, fds); +} + void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, hwaddr mmio_base, DriveInfo **fds) { @@ -111,23 +120,23 @@ void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, sysbus_connect_irq(sbd, 0, irq); sysbus_mmio_map(sbd, 0, mmio_base); =20 - fdctrl_init_drives(&sys->state.bus, fds); + sysbus_fdc_init_drives(sbd, fds); } =20 void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, DriveInfo **fds, qemu_irq *fdc_tc) { DeviceState *dev; - FDCtrlSysBus *sys; + SysBusDevice *sbd; =20 dev =3D qdev_new("sun-fdtwo"); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); - sys =3D SYSBUS_FDC(dev); - sysbus_connect_irq(SYS_BUS_DEVICE(sys), 0, irq); - sysbus_mmio_map(SYS_BUS_DEVICE(sys), 0, io_base); + sbd =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(sbd, &error_fatal); + sysbus_connect_irq(sbd, 0, irq); + sysbus_mmio_map(sbd, 0, io_base); *fdc_tc =3D qdev_get_gpio_in(dev, 0); =20 - fdctrl_init_drives(&sys->state.bus, fds); + sysbus_fdc_init_drives(sbd, fds); } =20 static void sysbus_fdc_common_initfn(Object *obj) --=20 2.26.3 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621276835; cv=none; d=zohomail.com; s=zohoarc; b=HUrCo+17zx5uKmPXt0TNwcc/Ulx0X10YMWEIbz4Katp58HpDHOKQx5mWleEKZ0DT+V+YQYLLmt4c78Z2jvmO4czIBPJASKyOu11/AuP6jRY4KccO0oZ03Y61dEqbzeSTFSRj2B/PUk7VASRr9Lukdwn75Tidy3eCdF+QKBjgT58= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621276835; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Mwkhq1zzg8MDDjVW8AOR0NelXXYM0Xsfxsfa4jWuzBw=; b=AWEYwyI7tvVgs14DlzB1zJO+DY5ETQDo9rUrwXfHX1TMCW4MSqZwT76InR/60IRNa2t0ltuyTU6dtaFqGdyUoFZKjw87NViA7lLgdnlHZ/6NK1OiLGoDqT3kN8vAtS11HE6DWhNrerj9LJHruVVxdhl85yXNoMNTWjYQTopzwN4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621276835619104.48363435838155; Mon, 17 May 2021 11:40:35 -0700 (PDT) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-321-G2Lu4sGpNXejf7181eAx2Q-1; Mon, 17 May 2021 14:40:32 -0400 Received: by mail-ed1-f71.google.com with SMTP id y19-20020a0564022713b029038a9f36060dso4401975edd.4 for ; Mon, 17 May 2021 11:40:32 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id h9sm11495572ede.93.2021.05.17.11.40.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 11:40:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621276834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Mwkhq1zzg8MDDjVW8AOR0NelXXYM0Xsfxsfa4jWuzBw=; b=BTjbrUIPyI/k4/hSOsmLxINJvFnQ3AF0fEor+cn8lZwGO81kyy3gMI8pzfVzTJscxBOSGD o0xLGqxdbJZXIKy2uSV8+aEkoWMhCV/Gmuvu2/Y3jUDqLCVi39BjlyqLhCQu9gtI3wyHIr NyDANYnDOQWCgx1vCIGU/FmfmMNxaCU= X-MC-Unique: G2Lu4sGpNXejf7181eAx2Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mwkhq1zzg8MDDjVW8AOR0NelXXYM0Xsfxsfa4jWuzBw=; b=KrAWRLeeF4L2P/CUygE3lUSU9u+DrJQdfuLodAVNd/DdhAnIA+a8UP1HvPuvLRmlk0 mgcgPqU8zeIscBB8TwbToyZKaAAqRlIo3MBPvBcwNkfZYz6GzP2bUH4frwrHIXYZTt8c f/LUp4RJ6rJWN1nAjJ7A+KzZpocnuAQecmOIdcAYGC2Ked+2yLHbgAxGVo1bl+epEfVF 3rBKcNa+TkF0Md9ThKVmseyvqx43jT0heeRLV9YXyb66SymRsOwSdR421Apyh20EVKeG AO7ZMcwWQEYGSBgFrvG0JrSXISKe8PdfaBKgLY67uqa7jdi5bLxkhvzemzvWrpbS5HFZ JUIw== X-Gm-Message-State: AOAM531k7wfpX6/KExaU8IenduGMRQPMG+ZvlYXSoBjTKZEGohZZVOlb Hl7Ioys/Kold9MGVKfnoZYN8AAsjov9goUH7SEfGNprRvK7knDWfHtxxURzHEnntw2GmdYe8R8a l4J0tjIBNiVIobA== X-Received: by 2002:a17:906:e210:: with SMTP id gf16mr1395497ejb.472.1621276830904; Mon, 17 May 2021 11:40:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3FyylJz9rEUQeR+rcxPghET00Zy2irTsEucFBAYrxDLoOU5LMCTH4kqnD9dgishQm5kAKdw== X-Received: by 2002:a17:906:e210:: with SMTP id gf16mr1395478ejb.472.1621276830669; Mon, 17 May 2021 11:40:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, John Snow Cc: Richard Henderson , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v4 7/9] hw/sparc/sun4m: Inline sun4m_fdctrl_init() Date: Mon, 17 May 2021 20:39:52 +0200 Message-Id: <20210517183954.1223193-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517183954.1223193-1-philmd@redhat.com> References: <20210517183954.1223193-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) There is only one call site for sun4m_fdctrl_init(), and this function is specific to the sun4m machines, not part of the SYSBUS_FDC API. Move it locally with the machine code, and remove its declaration in "hw/block/fdc.h". Suggested-by: Mark Cave-Ayland Reviewed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/block/fdc.h | 2 -- hw/block/fdc-sysbus.c | 16 ---------------- hw/sparc/sun4m.c | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index 52e45c53078..06612218630 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -14,8 +14,6 @@ void isa_fdc_init_drives(ISADevice *fdc, DriveInfo **fds); void sysbus_fdc_init_drives(SysBusDevice *dev, DriveInfo **fds); void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, hwaddr mmio_base, DriveInfo **fds); -void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, - DriveInfo **fds, qemu_irq *fdc_tc); =20 FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i); int cmos_get_fd_drive_type(FloppyDriveType fd0); diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c index 1163e53165d..8f94c2efb63 100644 --- a/hw/block/fdc-sysbus.c +++ b/hw/block/fdc-sysbus.c @@ -123,22 +123,6 @@ void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, sysbus_fdc_init_drives(sbd, fds); } =20 -void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, - DriveInfo **fds, qemu_irq *fdc_tc) -{ - DeviceState *dev; - SysBusDevice *sbd; - - dev =3D qdev_new("sun-fdtwo"); - sbd =3D SYS_BUS_DEVICE(dev); - sysbus_realize_and_unref(sbd, &error_fatal); - sysbus_connect_irq(sbd, 0, irq); - sysbus_mmio_map(sbd, 0, io_base); - *fdc_tc =3D qdev_get_gpio_in(dev, 0); - - sysbus_fdc_init_drives(sbd, fds); -} - static void sysbus_fdc_common_initfn(Object *obj) { DeviceState *dev =3D DEVICE(obj); diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 42e139849ed..c08c650da72 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -816,6 +816,22 @@ static void dummy_fdc_tc(void *opaque, int irq, int le= vel) { } =20 +static void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, + DriveInfo **fds, qemu_irq *fdc_tc) +{ + DeviceState *dev; + SysBusDevice *sbd; + + dev =3D qdev_new("sun-fdtwo"); + sbd =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(sbd, &error_fatal); + sysbus_connect_irq(sbd, 0, irq); + sysbus_mmio_map(sbd, 0, io_base); + *fdc_tc =3D qdev_get_gpio_in(dev, 0); + + sysbus_fdc_init_drives(sbd, fds); +} + static void sun4m_hw_init(MachineState *machine) { const struct sun4m_hwdef *hwdef =3D SUN4M_MACHINE_GET_CLASS(machine)->= hwdef; --=20 2.26.3 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621276840; cv=none; d=zohomail.com; s=zohoarc; b=dnL6x2EukikT3h5Ry+e0O9CjUaQstWwYxXRyswUUujJtIEIl1wz7BMQK+Sza85T1wF9mBn8toYibz/Apj98OJ4PfCFOmYOImEvRSRvSmLr3/g9TgF/9QHh1wKvxD9w7QBn4aECqoVrMdrj2Em0AODEVP1Kouop24CU7h5SsfSVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621276840; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Z14YRAeNHkM20zQ1K99pTtwaHYhMgqGiS7m7zkt7SV4=; b=FS3BkWaUckv0xUZKp7g+NiCbyMiWD9PU/PQ9P1flxXJD+d5yRZS7jku9rdN21Srbooald67Mitbz0KLVvMgsDQeCYxGMcxmvRqDQT+iMMMcgOtI134Iqbq2vWGR2z0rchVfwbU7DKsXRNYjapufLwhc3pxhRdOmOWy5SsNCBXnw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 162127684055865.1991898012526; Mon, 17 May 2021 11:40:40 -0700 (PDT) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-579-EDJcCCD7N8GK-2INNflDcA-1; Mon, 17 May 2021 14:40:38 -0400 Received: by mail-ej1-f71.google.com with SMTP id m18-20020a1709062352b02903d2d831f9baso1381406eja.20 for ; Mon, 17 May 2021 11:40:37 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id bw16sm9166863ejb.50.2021.05.17.11.40.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 11:40:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621276839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z14YRAeNHkM20zQ1K99pTtwaHYhMgqGiS7m7zkt7SV4=; b=QahpLHbBRRrGQUEy07GUtlBVojaxNt8XWyuDvWC1oxJXBMQYtPnYwJXpqL4bLFihLNE/y/ +XckHYgsDRscQII2Eah/K63Q2iSdvlFCL77OnZfuHEvWpQlhBUTdOtPOrvMrwVTYYbQL/o w5T4T12UweIMHQ2nAEF9kjLlOK35CFk= X-MC-Unique: EDJcCCD7N8GK-2INNflDcA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z14YRAeNHkM20zQ1K99pTtwaHYhMgqGiS7m7zkt7SV4=; b=gDXvrBHOIGmx5pliTcZ4X1PTfpQFJB0lTma+Eztx+PQsM0JfOyLUfVLszGiv8qAXPq POrxV1b84gx2trqMK10keaG0B8V6iOWc28zgbZFucj8s8Bc3O2V+kkVKZ7SJz/puDHb6 nj7Otc5yPTZ5q4u/zIEf57JizNZZwvSkqwWufNnTIQ/z1F3kg/nYIXBGf3C5u7lPjRSd UCCpTEZIb2yM9d9R1FpcekkeyEVzN+3lF+QjedMwIwmJcE0HZ6qpxXdlaRJ112AAaK0B RzmGFPvDhuY8kPbYj8l/7iF672J8gWY+3v5wZjO3LJMRwT/07Mw0vsy+u89172/4N79I IeTw== X-Gm-Message-State: AOAM533XZbxunBgCYK7lGkfi9H/ogkPA2aVbpgnS9spreUCqPJ7JO/dw 3sNIVwasvK9WfKKH/vY2DupYDV2aleKflBzwUQXVrI5SijWTUuTfCpBCmaNS8qrthURU9k6NoZS VU3xdKUaab4+NMg== X-Received: by 2002:aa7:db48:: with SMTP id n8mr1725970edt.11.1621276835602; Mon, 17 May 2021 11:40:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYLL+ze476YMflHqPfYWNsGren6lsk0H51u5x+5cROb+/Ydta/5Vg8NooW6UKSLfn+rd6t8g== X-Received: by 2002:aa7:db48:: with SMTP id n8mr1725959edt.11.1621276835452; Mon, 17 May 2021 11:40:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, John Snow Cc: Richard Henderson , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v4 8/9] hw/block/fdc-sysbus: Add 'dma-channel' property Date: Mon, 17 May 2021 20:39:53 +0200 Message-Id: <20210517183954.1223193-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517183954.1223193-1-philmd@redhat.com> References: <20210517183954.1223193-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) QDev properties to be set before the device is realized should be exposed as a Property with a DEFINE_PROP_XXX() macro, then accessed with the equivalent qdev_prop_set_xxx() API. Do this with the FDCtrlSysBus 'dma-channel' property: convert it to int32_t, default-initialize with DEFINE_PROP_INT32() and use qdev_prop_set_int32() to set its value in fdctrl_init_sysbus(). Reviewed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc-internal.h | 2 +- hw/block/fdc-sysbus.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/block/fdc-internal.h b/hw/block/fdc-internal.h index 278de725e69..29b318f7525 100644 --- a/hw/block/fdc-internal.h +++ b/hw/block/fdc-internal.h @@ -96,7 +96,7 @@ struct FDCtrl { qemu_irq irq; /* Controller state */ QEMUTimer *result_timer; - int dma_chann; + int32_t dma_chann; uint8_t phase; IsaDma *dma; /* Controller's identification */ diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c index 8f94c2efb63..74c7c8f2e01 100644 --- a/hw/block/fdc-sysbus.c +++ b/hw/block/fdc-sysbus.c @@ -106,15 +106,11 @@ void sysbus_fdc_init_drives(SysBusDevice *dev, DriveI= nfo **fds) void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, hwaddr mmio_base, DriveInfo **fds) { - FDCtrl *fdctrl; DeviceState *dev; SysBusDevice *sbd; - FDCtrlSysBus *sys; =20 dev =3D qdev_new("sysbus-fdc"); - sys =3D SYSBUS_FDC(dev); - fdctrl =3D &sys->state; - fdctrl->dma_chann =3D dma_chann; /* FIXME */ + qdev_prop_set_int32(dev, "dma-channel", dma_chann); sbd =3D SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(sbd, &error_fatal); sysbus_connect_irq(sbd, 0, irq); @@ -131,8 +127,6 @@ static void sysbus_fdc_common_initfn(Object *obj) FDCtrlSysBus *sys =3D SYSBUS_FDC(obj); FDCtrl *fdctrl =3D &sys->state; =20 - fdctrl->dma_chann =3D -1; - qdev_set_legacy_instance_id(dev, 0 /* io */, 2); /* FIXME */ =20 memory_region_init_io(&fdctrl->iomem, obj, @@ -173,6 +167,7 @@ static Property sysbus_fdc_properties[] =3D { DEFINE_PROP_SIGNED("fallback", FDCtrlSysBus, state.fallback, FLOPPY_DRIVE_TYPE_144, qdev_prop_fdc_drive_type, FloppyDriveType), + DEFINE_PROP_INT32("dma-channel", FDCtrlSysBus, state.dma_chann, -1), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.26.3 From nobody Fri May 17 11:05:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621276845; cv=none; d=zohomail.com; s=zohoarc; b=DztONETEzD1bzwGnGQJQIUTx33odEA2AychI5TULrvkm+P1rkUXDRfoy0ynbMt9JDUb1vv2Vk1O1w7JCMqn1Bl5UofEuYq7N9R/tuIFFwGCLlM/niH/mTzZQv81HG65VJDzM2GDNoQuy5+aXwMucbqyrEvsrW8vzmKAC6ZwauZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621276845; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=hRToPB7aVX8q9xnZeseUZTykg3nheLziCrX7lqUCi3Q=; b=hVKJfBn8OxszMiW1PekR9AILH3E5n2c2NiSOxHhob5VMJq5AyPMFQgudvJ7YCJNnxZqC8kqvw2f3mrgSdlhNf5MWn7g2NpcNkaxYGztpl08WzJjMu/RkHifrqmwod+TvqF5Qw07taj7eU2JjVQYsu9iL0ek7Bq26T6YrQzSxbcQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1621276845560465.23368677715814; Mon, 17 May 2021 11:40:45 -0700 (PDT) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-50-xVTpty86MZqxkWaPONb0tg-1; Mon, 17 May 2021 14:40:42 -0400 Received: by mail-ed1-f71.google.com with SMTP id ba15-20020a0564021acfb029038d3b33d7ffso1715558edb.23 for ; Mon, 17 May 2021 11:40:42 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id ga12sm8836619ejc.13.2021.05.17.11.40.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 11:40:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621276844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hRToPB7aVX8q9xnZeseUZTykg3nheLziCrX7lqUCi3Q=; b=a7QDNEUwzFeD/pkOOfWultyDnZSTdq/Z2QT/Vqgl5aU5IKjqss4jKOrcPOqCk3OJbMb350 37UVBHLCzb7O28Jt3JMX4qxr2oTDiEwOEi8Gim5JpIRcwmYZZsbBjSbifT0O7WB/dYU8Wv +b5vwYkB47ITVQIHOQEPt7KGBbfb/WE= X-MC-Unique: xVTpty86MZqxkWaPONb0tg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hRToPB7aVX8q9xnZeseUZTykg3nheLziCrX7lqUCi3Q=; b=OrdSf5G5ayJwSZSJqgVix6nvR2hr9lh3vXqA+fkmcHbeh0adSdsdDqQkfKwQ8Xn3jD 3+0wVpH2wKCjGutyUxg3AvAtayYhq8udhN4gdrumXiQAadwX3TJW/N1xPnaqz5/1Mugu S/jSdcuu0nAs1mg6kSUb74tvJmDHd7kkUZSovzIqlL0BrfonkZ1ssd/Hu4D9XXATzQkn X8LcgSlptTpVJZl9m9cVbOFo2ES0BRZALTYL5zKvfNoLyOzPNEZYhS9vZrY7eTTLsozV vSZVIgZk7N+SeuiKNoEx5k+NcmObumDGwhXJTJHx8MhdMjF5fjbjy1+ttpvO1El5ppHL s+mw== X-Gm-Message-State: AOAM533/Ri/ONfl2a5NXtmIWdgKI/Gu3dVOXsPC90Ex0dMUMcrYVTgQq 7fqQCbzGHuqnjaNNd4vxMrC8IZM5dsdaoAEIWvAjJUE6swbIhi3T+9nmITBMCC5PLPQUA3+PPGj +VEDKz/dP0McD8g== X-Received: by 2002:a17:906:1dd1:: with SMTP id v17mr1349790ejh.31.1621276840332; Mon, 17 May 2021 11:40:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy47C71qqphxP/m5hmrbMM0c2VhuMaTMKADjwFRORuo27RCg2jH33FlWdrzBPVIKkiADctGAA== X-Received: by 2002:a17:906:1dd1:: with SMTP id v17mr1349773ejh.31.1621276840209; Mon, 17 May 2021 11:40:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, John Snow Cc: Richard Henderson , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v4 9/9] hw/mips/jazz: Inline fdctrl_init_sysbus() Date: Mon, 17 May 2021 20:39:54 +0200 Message-Id: <20210517183954.1223193-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517183954.1223193-1-philmd@redhat.com> References: <20210517183954.1223193-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) There is only one call site for fdctrl_init_sysbus(), and this function is specific to the jazz machines, not part of the SYSBUS_FDC API. Move it locally with the machine code, and remove its declaration in "hw/block/fdc.h". Suggested-by: Mark Cave-Ayland Reviewed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/block/fdc.h | 3 --- hw/block/fdc-sysbus.c | 16 ---------------- hw/mips/jazz.c | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index 06612218630..ac99d6bcaa0 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -1,7 +1,6 @@ #ifndef HW_FDC_H #define HW_FDC_H =20 -#include "exec/hwaddr.h" #include "qapi/qapi-types-block.h" #include "hw/sysbus.h" =20 @@ -12,8 +11,6 @@ =20 void isa_fdc_init_drives(ISADevice *fdc, DriveInfo **fds); void sysbus_fdc_init_drives(SysBusDevice *dev, DriveInfo **fds); -void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, - hwaddr mmio_base, DriveInfo **fds); =20 FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i); int cmos_get_fd_drive_type(FloppyDriveType fd0); diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c index 74c7c8f2e01..5c7e49bcc3f 100644 --- a/hw/block/fdc-sysbus.c +++ b/hw/block/fdc-sysbus.c @@ -103,22 +103,6 @@ void sysbus_fdc_init_drives(SysBusDevice *dev, DriveIn= fo **fds) fdctrl_init_drives(&fdc->state.bus, fds); } =20 -void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, - hwaddr mmio_base, DriveInfo **fds) -{ - DeviceState *dev; - SysBusDevice *sbd; - - dev =3D qdev_new("sysbus-fdc"); - qdev_prop_set_int32(dev, "dma-channel", dma_chann); - sbd =3D SYS_BUS_DEVICE(dev); - sysbus_realize_and_unref(sbd, &error_fatal); - sysbus_connect_irq(sbd, 0, irq); - sysbus_mmio_map(sbd, 0, mmio_base); - - sysbus_fdc_init_drives(sbd, fds); -} - static void sysbus_fdc_common_initfn(Object *obj) { DeviceState *dev =3D DEVICE(obj); diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index dba2088ed1a..13f26c5991f 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -143,6 +143,22 @@ static void mips_jazz_do_transaction_failed(CPUState *= cs, hwaddr physaddr, } #endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 +static void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, + hwaddr mmio_base, DriveInfo **fds) +{ + DeviceState *dev; + SysBusDevice *sbd; + + dev =3D qdev_new("sysbus-fdc"); + qdev_prop_set_int32(dev, "dma-channel", dma_chann); + sbd =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(sbd, &error_fatal); + sysbus_connect_irq(sbd, 0, irq); + sysbus_mmio_map(sbd, 0, mmio_base); + + sysbus_fdc_init_drives(sbd, fds); +} + static void mips_jazz_init(MachineState *machine, enum jazz_model_e jazz_model) { --=20 2.26.3