hw/block/fdc: Allow Kconfig-selecting ISA bus/SysBus floppy controllers
v4 cover hw/block/fdc: Allow Kconfig-selecting ISA bus/SysBus floppy controllers
Missing review: #1
Hi,
The floppy disc controllers pulls in irrelevant devices (sysbus in an ISA-only machine, ISA bus + isa devices on a sysbus-only machine).
This series clean that by extracting each device in its own file, adding the corresponding Kconfig symbols: FDC_ISA and FDC_SYSBUS.
Since v3:
- Fix ISA_SUPERIO -> FDC Kconfig dependency (jsnow)
Since v2:
- rebased
Since v1:
- added missing "hw/block/block.h" header (jsnow)
- inlined hardware specific calls (Mark)
- added R-b/A-b tags
Regards,
Phil.
Philippe Mathieu-Daudé (9):
hw/isa/Kconfig: Fix missing dependency ISA_SUPERIO -> FDC hw/block/fdc: Replace disabled fprintf() by trace event hw/block/fdc: Declare shared prototypes in fdc-internal.h hw/block/fdc: Extract ISA floppy controllers to fdc-isa.c hw/block/fdc: Extract SysBus floppy controllers to fdc-sysbus.c hw/block/fdc: Add sysbus_fdc_init_drives() method hw/sparc/sun4m: Inline sun4m_fdctrl_init() hw/block/fdc-sysbus: Add 'dma-channel' property hw/mips/jazz: Inline fdctrl_init_sysbus()
hw/block/fdc-internal.h | 156 +++++++++++ include/hw/block/fdc.h | 7 +- hw/block/fdc-isa.c | 313 +++++++++++++++++++++ hw/block/fdc-sysbus.c | 224 +++++++++++++++ hw/block/fdc.c | 608 +--------------------------------------- hw/mips/jazz.c | 16 ++ hw/sparc/sun4m.c | 16 ++ MAINTAINERS | 3 + hw/block/Kconfig | 8 + hw/block/meson.build | 2 + hw/block/trace-events | 3 + hw/i386/Kconfig | 2 +- hw/isa/Kconfig | 7 +- hw/mips/Kconfig | 2 +- hw/sparc/Kconfig | 2 +- hw/sparc64/Kconfig | 2 +- 16 files changed, 759 insertions(+), 612 deletions(-) create mode 100644 hw/block/fdc-internal.h create mode 100644 hw/block/fdc-isa.c create mode 100644 hw/block/fdc-sysbus.c
Signature · 1 line
2.26.3
PATCH v4 1/9 hw/isa/Kconfig: Fix missing dependency ISA_SUPERIO -> FDC
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.
--- hw/isa/Kconfig | 1 + 1 file changed, 1 insertion(+)
hw/isa/Kconfig +1 -0
@@ -17,6 +17,7 @@ config ISA_SUPERIO bool select ISA_BUS select PCKBD + select FDC config PC87312 bool
Signature · 1 line
2.26.3
PATCH v4 2/9 hw/block/fdc: Replace disabled fprintf() by trace event
In reply to Philippe Mathieu-Daudé--- hw/block/fdc.c | 7 +------ hw/block/trace-events | 1 + 2 files changed, 2 insertions(+), 6 deletions(-)
hw/block/fdc.c +1 -6
@@ -1242,12 +1242,7 @@ static void fdctrl_external_reset_isa(DeviceState *d)static void fdctrl_handle_tc (void *opaque,int irq,int level) { -//FDCtrl *s = opaque; - -if (level) { -// XXX -FLOPPY_DPRINTF ("TC pulsed\n" ); - } +trace_fdctrl_tc_pulse (level); }/* Change IRQ state */
hw/block/trace-events +1 -0
@@ -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" # pflash_cfi01.c # pflash_cfi02.c
Signature · 1 line
2.26.3
PATCH v4 3/9 hw/block/fdc: Declare shared prototypes in fdc-internal.h
In reply to Philippe Mathieu-Daudé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".
--- 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
hw/block/fdc-internal.h new file +156 -0
@@ -0,0 +1,156 @@ +/* +* QEMU Floppy disk emulator (Intel 82078) +* +* Copyright (c) 2003, 2007 Jocelyn Mayer +* Copyright (c) 2008 Hervé Poussineau +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* 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 OTHER +* 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 =0x00 ,/* 500 Kbps */ +FDRIVE_RATE_300K =0x01 ,/* 300 Kbps */ +FDRIVE_RATE_250K =0x02 ,/* 250 Kbps */ +FDRIVE_RATE_1M =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 =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=auto 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
hw/block/fdc.c +8 -118
204 lines not on this page · raw message
MAINTAINERS +1 -0
@@ -1659,6 +1659,7 @@ M: John Snow <[email protected]> L: [email protected] 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
Signature · 1 line
2.26.3
PATCH v4 4/9 hw/block/fdc: Extract ISA floppy controllers to fdc-isa.c
In reply to Philippe Mathieu-Daudé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".
--- 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
hw/block/fdc-isa.c new file +313 -0
@@ -0,0 +1,313 @@ +/* +* QEMU Floppy disk emulator (Intel 82078) +* +* Copyright (c) 2003, 2007 Jocelyn Mayer +* Copyright (c) 2008 Hervé Poussineau +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* 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 OTHER +* 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 =ISA_FDC (d); +FDCtrl *s = &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[] = { + {1 ,5 ,1 , .read = fdctrl_read, .write = fdctrl_write }, + {7 ,1 ,1 , .read = fdctrl_read, .write = fdctrl_write }, +PORTIO_END_OF_LIST (), +}; + +static void isabus_fdc_realize (DeviceState *dev,Error **errp) +{ +ISADevice *isadev =ISA_DEVICE (dev); +FDCtrlISABus *isa =ISA_FDC (dev); +FDCtrl *fdctrl = &isa->state; +Error *err =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 = isa->dma; +if (fdctrl->dma_chann !=-1 ) { + fdctrl->dma =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 !=NULL ) { +error_propagate (errp, err); +return ; + } +} + +FloppyDriveType isa_fdc_get_drive_type (ISADevice *fdc,int i) +{ +FDCtrlISABus *isa =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 = *maxh = *maxs =0 ; +for (fdf = fd_formats; fdf->drive !=FLOPPY_DRIVE_TYPE_NONE ; fdf++) { +if (fdf->drive != type) { +continue ; + } +if (*maxc < fdf->max_track) { + *maxc = fdf->max_track; + } +if (*maxh < fdf->max_head) { + *maxh = fdf->max_head; + } +if (*maxs < fdf->last_sect) { + *maxs = 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 =aml_device ("FLP%c" ,'A' + idx); + +aml_append (dev,aml_name_decl ("_ADR" ,aml_int (idx))); + + fdi =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 independent +* 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 =4 ; +break ; +case FLOPPY_DRIVE_TYPE_288 : +/* 2.88 Mb 3"5 drive */ + val =5 ; +break ; +case FLOPPY_DRIVE_TYPE_120 : +/* 1.2 Mb 5"5 drive */ + val =2 ; +break ; +case FLOPPY_DRIVE_TYPE_NONE : +default : + val =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 ] = { +0 ,0 ,0 ,0 ,/* presence of floppy drives #0 - #3 */ +cpu_to_le32 (2 )/* tape presence (2 == never present) */ + }; + + crs =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 =aml_device ("FDC0" ); +aml_append (dev,aml_name_decl ("_HID" ,aml_eisaid ("PNP0700" ))); +aml_append (dev,aml_name_decl ("_CRS" , crs)); + +for (i =0 ; i <MIN (MAX_FD ,ACPI_FDE_MAX_FD ); i++) { +FloppyDriveType type =isa_fdc_get_drive_type (isadev, i); + +if (type <FLOPPY_DRIVE_TYPE_NONE ) { + fde_buf[i] =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 = { + .name ="fdc" , + .version_id =2 , + .minimum_version_id =2 , + .fields = (VMStateField []) { +VMSTATE_STRUCT (state, FDCtrlISABus,0 , vmstate_fdc, FDCtrl), +VMSTATE_END_OF_LIST () + } +}; + +static Property isa_fdc_properties[] = { +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 ].type, +FLOPPY_DRIVE_TYPE_AUTO , qdev_prop_fdc_drive_type, + FloppyDriveType), +DEFINE_PROP_SIGNED ("fdtypeB" , FDCtrlISABus, state.qdev_for_drives[1 ].type, +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 =DEVICE_CLASS (klass); +ISADeviceClass *isa =ISA_DEVICE_CLASS (klass); + + dc->realize = isabus_fdc_realize; + dc->fw_name ="fdc" ; + dc->reset = fdctrl_external_reset_isa; + dc->vmsd = &vmstate_isa_fdc; + isa->build_aml = 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 =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 = { + .name =TYPE_ISA_FDC , + .parent =TYPE_ISA_DEVICE , + .instance_size =sizeof (FDCtrlISABus), + .class_init = isabus_fdc_class_init, + .instance_init = isabus_fdc_instance_init, +}; + +static void isa_fdc_register_types (void ) +{ +type_register_static (&isa_fdc_info); +} + +type_init (isa_fdc_register_types)
hw/block/fdc.c +0 -257
299 lines not on this page · raw message
MAINTAINERS +1 -0
@@ -1660,6 +1660,7 @@ L: [email protected] 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
hw/block/Kconfig +4 -0
@@ -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
hw/block/meson.build +1 -0
@@ -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'))
hw/i386/Kconfig +1 -1
@@ -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
hw/isa/Kconfig +4 -4
@@ -17,7 +17,7 @@ config ISA_SUPERIO bool select ISA_BUS select PCKBD - select FDC + select FDC_ISA config PC87312 bool
@@ -28,7 +28,7 @@ config PC87312 select MC146818RTC select SERIAL_ISA select PARALLEL - select FDC + select FDC_ISA select IDE_ISA 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
@@ -56,7 +56,7 @@ config SMC37C669 select ISA_SUPERIO select SERIAL_ISA select PARALLEL - select FDC + select FDC_ISA config LPC_ICH9 bool
hw/sparc64/Kconfig +1 -1
@@ -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
Signature · 1 line
2.26.3
PATCH v4 5/9 hw/block/fdc: Extract SysBus floppy controllers to fdc-sysbus.c
In reply to Philippe Mathieu-Daudé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".
--- 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
hw/block/fdc-sysbus.c new file +252 -0
@@ -0,0 +1,252 @@ +/* +* QEMU Floppy disk emulator (Intel 82078) +* +* Copyright (c) 2003, 2007 Jocelyn Mayer +* Copyright (c) 2008 Hervé Poussineau +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* 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 OTHER +* 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 = { + .read = fdctrl_read_mem, + .write = fdctrl_write_mem, + .endianness =DEVICE_NATIVE_ENDIAN , +}; + +static const MemoryRegionOps fdctrl_mem_strict_ops = { + .read = fdctrl_read_mem, + .write = fdctrl_write_mem, + .endianness =DEVICE_NATIVE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =1 , + }, +}; + +static void fdctrl_external_reset_sysbus (DeviceState *d) +{ +FDCtrlSysBus *sys =SYSBUS_FDC (d); +FDCtrl *s = &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 =qdev_new ("sysbus-fdc" ); + sys =SYSBUS_FDC (dev); + fdctrl = &sys->state; + fdctrl->dma_chann = dma_chann;/* FIXME */ + sbd =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 =qdev_new ("sun-fdtwo" ); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); + sys =SYSBUS_FDC (dev); +sysbus_connect_irq (SYS_BUS_DEVICE (sys),0 , irq); +sysbus_mmio_map (SYS_BUS_DEVICE (sys),0 , io_base); + *fdc_tc =qdev_get_gpio_in (dev,0 ); + +fdctrl_init_drives (&sys->state.bus, fds); +} + +static void sysbus_fdc_common_initfn (Object *obj) +{ +DeviceState *dev =DEVICE (obj); +FDCtrlSysBusClass *sbdc =SYSBUS_FDC_GET_CLASS (obj); +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); +FDCtrlSysBus *sys =SYSBUS_FDC (obj); +FDCtrl *fdctrl = &sys->state; + + fdctrl->dma_chann =-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 =SYSBUS_FDC (dev); +FDCtrl *fdctrl = &sys->state; + +fdctrl_realize_common (dev, fdctrl, errp); +} + +static const VMStateDescription vmstate_sysbus_fdc = { + .name ="fdc" , + .version_id =2 , + .minimum_version_id =2 , + .fields = (VMStateField []) { +VMSTATE_STRUCT (state, FDCtrlSysBus,0 , vmstate_fdc, FDCtrl), +VMSTATE_END_OF_LIST () + } +}; + +static Property sysbus_fdc_properties[] = { +DEFINE_PROP_SIGNED ("fdtypeA" , FDCtrlSysBus, state.qdev_for_drives[0 ].type, +FLOPPY_DRIVE_TYPE_AUTO , qdev_prop_fdc_drive_type, + FloppyDriveType), +DEFINE_PROP_SIGNED ("fdtypeB" , FDCtrlSysBus, state.qdev_for_drives[1 ].type, +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 =DEVICE_CLASS (klass); + +device_class_set_props (dc, sysbus_fdc_properties); +set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); +} + +static const TypeInfo sysbus_fdc_info = { + .name ="sysbus-fdc" , + .parent =TYPE_SYSBUS_FDC , + .class_init = sysbus_fdc_class_init, +}; + +static void sysbus_fdc_common_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->realize = sysbus_fdc_common_realize; + dc->reset = fdctrl_external_reset_sysbus; + dc->vmsd = &vmstate_sysbus_fdc; +} + +static const TypeInfo sysbus_fdc_type_info = { + .name =TYPE_SYSBUS_FDC , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (FDCtrlSysBus), + .instance_init = sysbus_fdc_common_initfn, + .abstract = true, + .class_init = sysbus_fdc_common_class_init, + .class_size =sizeof (FDCtrlSysBusClass), +}; + +static Property sun4m_fdc_properties[] = { +DEFINE_PROP_SIGNED ("fdtype" , FDCtrlSysBus, state.qdev_for_drives[0 ].type, +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 =SYSBUS_FDC_CLASS (klass); +DeviceClass *dc =DEVICE_CLASS (klass); + + sbdc->use_strict_io = true; +device_class_set_props (dc, sun4m_fdc_properties); +set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); +} + +static const TypeInfo sun4m_fdc_info = { + .name ="sun-fdtwo" , + .parent =TYPE_SYSBUS_FDC , + .class_init = 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)
hw/block/fdc.c +0 -220
258 lines not on this page · raw message
MAINTAINERS +1 -0
@@ -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
hw/block/Kconfig +4 -0
@@ -8,6 +8,10 @@ config FDC_ISA # select ISA_BUS here instead of polluting each board that requires one select ISA_BUS +config FDC_SYSBUS + bool + select FDC + config SSI_M25P80 bool
hw/block/meson.build +1 -0
@@ -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'))
hw/block/trace-events +2 -0
@@ -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" # pflash_cfi01.c
hw/mips/Kconfig +1 -1
@@ -20,7 +20,7 @@ config JAZZ select G364FB select DP8393X select ESP - select FDC + select FDC_SYSBUS select MC146818RTC select PCKBD select SERIAL
hw/sparc/Kconfig +1 -1
@@ -8,7 +8,7 @@ config SUN4M select UNIMP select ESCC select ESP - select FDC + select FDC_SYSBUS select SLAVIO select LANCE select M48T59
Signature · 1 line
2.26.3
PATCH v4 6/9 hw/block/fdc: Add sysbus_fdc_init_drives() method
In reply to Philippe Mathieu-Daudé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.
--- include/hw/block/fdc.h | 2 ++ hw/block/fdc-sysbus.c | 23 ++++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-)
include/hw/block/fdc.h +2 -0
@@ -3,6 +3,7 @@#include "exec/hwaddr.h" #include "qapi/qapi-types-block.h" +#include "hw/sysbus.h" /* fdc.c */ #define MAX_FD 2
@@ -10,6 +11,7 @@#define TYPE_ISA_FDC "isa-fdc"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,
hw/block/fdc-sysbus.c +16 -7
@@ -94,6 +94,15 @@ static void fdctrl_handle_tc(void *opaque, int irq, int level)trace_fdctrl_tc_pulse (level); } +void sysbus_fdc_init_drives (SysBusDevice *dev,DriveInfo **fds) +{ +FDCtrlSysBus *fdc; + + fdc =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); -fdctrl_init_drives (&sys->state.bus, fds); +sysbus_fdc_init_drives (sbd, fds); }void sun4m_fdctrl_init (qemu_irq irq,hwaddr io_base,DriveInfo **fds,qemu_irq *fdc_tc) {DeviceState *dev; -FDCtrlSysBus *sys; +SysBusDevice *sbd; dev =qdev_new ("sun-fdtwo" ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); - sys =SYSBUS_FDC (dev); -sysbus_connect_irq (SYS_BUS_DEVICE (sys),0 , irq); -sysbus_mmio_map (SYS_BUS_DEVICE (sys),0 , io_base); + sbd =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 =qdev_get_gpio_in (dev,0 ); -fdctrl_init_drives (&sys->state.bus, fds); +sysbus_fdc_init_drives (sbd, fds); }static void sysbus_fdc_common_initfn (Object *obj)
Signature · 1 line
2.26.3
PATCH v4 7/9 hw/sparc/sun4m: Inline sun4m_fdctrl_init()
In reply to Philippe Mathieu-Daudé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".
--- include/hw/block/fdc.h | 2 -- hw/block/fdc-sysbus.c | 16 ---------------- hw/sparc/sun4m.c | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 18 deletions(-)
include/hw/block/fdc.h +0 -2
@@ -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);FloppyDriveType isa_fdc_get_drive_type (ISADevice *fdc,int i);int cmos_get_fd_drive_type (FloppyDriveType fd0);
hw/block/fdc-sysbus.c +0 -16
@@ -123,22 +123,6 @@ void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,sysbus_fdc_init_drives (sbd, fds); } -void sun4m_fdctrl_init (qemu_irq irq,hwaddr io_base, -DriveInfo **fds,qemu_irq *fdc_tc) -{ -DeviceState *dev; -SysBusDevice *sbd; - - dev =qdev_new ("sun-fdtwo" ); - sbd =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 =qdev_get_gpio_in (dev,0 ); - -sysbus_fdc_init_drives (sbd, fds); -} -static void sysbus_fdc_common_initfn (Object *obj) {DeviceState *dev =DEVICE (obj);
hw/sparc/sun4m.c +16 -0
@@ -816,6 +816,22 @@ static void dummy_fdc_tc(void *opaque, int irq, int level) { } +static void sun4m_fdctrl_init (qemu_irq irq,hwaddr io_base, +DriveInfo **fds,qemu_irq *fdc_tc) +{ +DeviceState *dev; +SysBusDevice *sbd; + + dev =qdev_new ("sun-fdtwo" ); + sbd =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 =qdev_get_gpio_in (dev,0 ); + +sysbus_fdc_init_drives (sbd, fds); +} +static void sun4m_hw_init (MachineState *machine) {const struct sun4m_hwdef *hwdef =SUN4M_MACHINE_GET_CLASS (machine)->hwdef;
Signature · 1 line
2.26.3
PATCH v4 8/9 hw/block/fdc-sysbus: Add 'dma-channel' property
In reply to Philippe Mathieu-Daudé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().
--- hw/block/fdc-internal.h | 2 +- hw/block/fdc-sysbus.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-)
hw/block/fdc-internal.h +1 -1
@@ -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 */
hw/block/fdc-sysbus.c +2 -7
@@ -106,15 +106,11 @@ void sysbus_fdc_init_drives(SysBusDevice *dev, DriveInfo **fds)void fdctrl_init_sysbus (qemu_irq irq,int dma_chann,hwaddr mmio_base,DriveInfo **fds) { -FDCtrl *fdctrl;DeviceState *dev;SysBusDevice *sbd; -FDCtrlSysBus *sys; dev =qdev_new ("sysbus-fdc" ); - sys =SYSBUS_FDC (dev); - fdctrl = &sys->state; - fdctrl->dma_chann = dma_chann;/* FIXME */ +qdev_prop_set_int32 (dev,"dma-channel" , dma_chann); sbd =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 =SYSBUS_FDC (obj);FDCtrl *fdctrl = &sys->state; - fdctrl->dma_chann =-1 ; -qdev_set_legacy_instance_id (dev,0 /* io */ ,2 );/* FIXME */ memory_region_init_io(&fdctrl->iomem, obj,
@@ -173,6 +167,7 @@ static Property sysbus_fdc_properties[] = {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(), };
Signature · 1 line
2.26.3
PATCH v4 9/9 hw/mips/jazz: Inline fdctrl_init_sysbus()
In reply to Philippe Mathieu-Daudé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".
--- include/hw/block/fdc.h | 3 --- hw/block/fdc-sysbus.c | 16 ---------------- hw/mips/jazz.c | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 19 deletions(-)
include/hw/block/fdc.h +0 -3
@@ -1,7 +1,6 @@#ifndef HW_FDC_H #define HW_FDC_H -#include "exec/hwaddr.h" #include "qapi/qapi-types-block.h" #include "hw/sysbus.h"
@@ -12,8 +11,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);FloppyDriveType isa_fdc_get_drive_type (ISADevice *fdc,int i);int cmos_get_fd_drive_type (FloppyDriveType fd0);
hw/block/fdc-sysbus.c +0 -16
@@ -103,22 +103,6 @@ void sysbus_fdc_init_drives(SysBusDevice *dev, DriveInfo **fds)fdctrl_init_drives (&fdc->state.bus, fds); } -void fdctrl_init_sysbus (qemu_irq irq,int dma_chann, -hwaddr mmio_base,DriveInfo **fds) -{ -DeviceState *dev; -SysBusDevice *sbd; - - dev =qdev_new ("sysbus-fdc" ); -qdev_prop_set_int32 (dev,"dma-channel" , dma_chann); - sbd =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 =DEVICE (obj);
hw/mips/jazz.c +16 -0
@@ -143,6 +143,22 @@ static void mips_jazz_do_transaction_failed(CPUState *cs, hwaddr physaddr, }#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ +static void fdctrl_init_sysbus (qemu_irq irq,int dma_chann, +hwaddr mmio_base,DriveInfo **fds) +{ +DeviceState *dev; +SysBusDevice *sbd; + + dev =qdev_new ("sysbus-fdc" ); +qdev_prop_set_int32 (dev,"dma-channel" , dma_chann); + sbd =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) {
Signature · 1 line
2.26.3
Quoted 53 lines · Philippe Mathieu-Daudé
Missing review: #1
Hi,
The floppy disc controllers pulls in irrelevant devices (sysbus in an ISA-only machine, ISA bus + isa devices on a sysbus-only machine).
This series clean that by extracting each device in its own file, adding the corresponding
Kconfigsymbols:FDC_ISAandFDC_SYSBUS.Since v3:
- FixISA_SUPERIO-> FDCKconfigdependency (jsnow)Since v2:
- rebasedSince v1:
- added missing "hw/block/block.h" header (jsnow)
- inlined hardware specific calls (Mark)
- added R-b/A-b tagsRegards,
Phil.
Philippe Mathieu-Daudé (9):
hw/isa/Kconfig: Fix missing dependencyISA_SUPERIO-> FDC hw/block/fdc: Replace disabledfprintf()by trace event hw/block/fdc: Declare shared prototypes infdc-internal.hhw/block/fdc: Extract ISA floppy controllers tofdc-isa.chw/block/fdc: Extract SysBus floppy controllers tofdc-sysbus.chw/block/fdc: Addsysbus_fdc_init_drives()method hw/sparc/sun4m: Inlinesun4m_fdctrl_init()hw/block/fdc-sysbus: Add 'dma-channel' property hw/mips/jazz: Inlinefdctrl_init_sysbus()hw/block/fdc-internal.h | 156 +++++++++++ include/hw/block/fdc.h | 7 +- hw/block/fdc-isa.c | 313 +++++++++++++++++++++ hw/block/fdc-sysbus.c | 224 +++++++++++++++ hw/block/fdc.c | 608 +--------------------------------------- hw/mips/jazz.c | 16 ++ hw/sparc/sun4m.c | 16 ++ MAINTAINERS | 3 + hw/block/Kconfig | 8 + hw/block/meson.build | 2 + hw/block/trace-events | 3 + hw/i386/Kconfig | 2 +- hw/isa/Kconfig | 7 +- hw/mips/Kconfig | 2 +- hw/sparc/Kconfig | 2 +- hw/sparc64/Kconfig | 2 +- 16 files changed, 759 insertions(+), 612 deletions(-)
Quoted 4 lines
create mode 100644
hw/block/fdc-internal.h
create mode 100644hw/block/fdc-isa.c
create mode 100644hw/block/fdc-sysbus.c
Hi, tentatively staged:
https://gitlab.com/jsnow/qemu/-/commits/floppy/
pending CI:
https://gitlab.com/jsnow/qemu/-/pipelines/304308461
--js
Quoted 59 lines · John Snow
Quoted 52 lines · Philippe Mathieu-Daudé
Missing review: #1
Hi,
The floppy disc controllers pulls in irrelevant devices (sysbus in an ISA-only machine, ISA bus + isa devices on a sysbus-only machine).
This series clean that by extracting each device in its own file, adding the corresponding
Kconfigsymbols:FDC_ISAandFDC_SYSBUS.Since v3:
- FixISA_SUPERIO-> FDCKconfigdependency (jsnow)Since v2:
- rebasedSince v1:
- added missing "hw/block/block.h" header (jsnow)
- inlined hardware specific calls (Mark)
- added R-b/A-b tagsRegards,
Phil.
Philippe Mathieu-Daudé (9):
hw/isa/Kconfig: Fix missing dependencyISA_SUPERIO-> FDC hw/block/fdc: Replace disabledfprintf()by trace event hw/block/fdc: Declare shared prototypes infdc-internal.hhw/block/fdc: Extract ISA floppy controllers tofdc-isa.chw/block/fdc: Extract SysBus floppy controllers tofdc-sysbus.chw/block/fdc: Addsysbus_fdc_init_drives()method hw/sparc/sun4m: Inlinesun4m_fdctrl_init()hw/block/fdc-sysbus: Add 'dma-channel' property hw/mips/jazz: Inlinefdctrl_init_sysbus()
hw/block/fdc-internal.h| 156 +++++++++++ include/hw/block/fdc.h | 7 +-
hw/block/fdc-isa.c | 313 +++++++++++++++++++++ hw/block/fdc-sysbus.c | 224 +++++++++++++++ hw/block/fdc.c | 608 +--------------------------------------- hw/mips/jazz.c | 16 ++
hw/sparc/sun4m.c | 16 ++
MAINTAINERS | 3 +
hw/block/Kconfig | 8 +
hw/block/meson.build | 2 +
hw/block/trace-events | 3 +
hw/i386/Kconfig | 2 +-
hw/isa/Kconfig | 7 +-
hw/mips/Kconfig | 2 +-
hw/sparc/Kconfig | 2 +-
hw/sparc64/Kconfig | 2 +-Quoted 5 lines
16 files changed, 759 insertions(+), 612 deletions(-)create mode 100644
hw/block/fdc-internal.h
create mode 100644hw/block/fdc-isa.c
create mode 100644hw/block/fdc-sysbus.c
Quoted 7 lines
Hi, tentatively staged:
https://gitlab.com/jsnow/qemu/-/commits/floppy/
pending CI:
Not good enough:
qemu-system-sparc: ../hw/block/fdc.c:2356: fdctrl_realize_common:
Assertion `fdctrl->dma' failed.
Forget about it for your next pull request.
Quoted 66 lines · Philippe Mathieu-Daudé
Quoted 65 lines · John Snow
Quoted 53 lines · Philippe Mathieu-Daudé
Missing review: #1
Hi,
The floppy disc controllers pulls in irrelevant devices (sysbus in an ISA-only machine, ISA bus + isa devices on a sysbus-only machine).
This series clean that by extracting each device in its own file, adding the corresponding
Kconfigsymbols:FDC_ISAandFDC_SYSBUS.Since v3:
- FixISA_SUPERIO-> FDCKconfigdependency (jsnow)Since v2:
- rebasedSince v1:
- added missing "hw/block/block.h" header (jsnow)
- inlined hardware specific calls (Mark)
- added R-b/A-b tagsRegards,
Phil.
Philippe Mathieu-Daudé (9):
hw/isa/Kconfig: Fix missing dependencyISA_SUPERIO-> FDC hw/block/fdc: Replace disabledfprintf()by trace event hw/block/fdc: Declare shared prototypes infdc-internal.hhw/block/fdc: Extract ISA floppy controllers tofdc-isa.chw/block/fdc: Extract SysBus floppy controllers tofdc-sysbus.chw/block/fdc: Addsysbus_fdc_init_drives()method hw/sparc/sun4m: Inlinesun4m_fdctrl_init()hw/block/fdc-sysbus: Add 'dma-channel' property hw/mips/jazz: Inlinefdctrl_init_sysbus()hw/block/fdc-internal.h | 156 +++++++++++ include/hw/block/fdc.h | 7 +- hw/block/fdc-isa.c | 313 +++++++++++++++++++++ hw/block/fdc-sysbus.c | 224 +++++++++++++++ hw/block/fdc.c | 608 +--------------------------------------- hw/mips/jazz.c | 16 ++ hw/sparc/sun4m.c | 16 ++ MAINTAINERS | 3 + hw/block/Kconfig | 8 + hw/block/meson.build | 2 + hw/block/trace-events | 3 + hw/i386/Kconfig | 2 +- hw/isa/Kconfig | 7 +- hw/mips/Kconfig | 2 +- hw/sparc/Kconfig | 2 +- hw/sparc64/Kconfig | 2 +- 16 files changed, 759 insertions(+), 612 deletions(-)Quoted 4 lines
create mode 100644
hw/block/fdc-internal.h
create mode 100644hw/block/fdc-isa.c
create mode 100644hw/block/fdc-sysbus.cHi, tentatively staged:
https://gitlab.com/jsnow/qemu/-/commits/floppy/
pending CI:
Quoted 9 lines
Quoted 1 line
Not good enough:
qemu-system-sparc:
../hw/block/fdc.c:2356:fdctrl_realize_common:
Assertion `fdctrl->dma' failed.Forget about it for your next pull request.
Yup, I see. Dropping it from the queue for now. Thanks!
--js
Cc'ing Hervé, Aleksandar, Markus & Mark.
Quoted 7 lines · John Snow
Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 5 lines · John Snow
Quoted 3 lines · Philippe Mathieu-Daudé
The floppy disc controllers pulls in irrelevant devices (sysbus in an ISA-only machine, ISA bus + isa devices on a sysbus-only machine).
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
This series clean that by extracting each device in its own file, adding the corresponding
Kconfigsymbols:FDC_ISAandFDC_SYSBUS.Not good enough:
Yup, I see. Dropping it from the queue for now. Thanks!
The Jazz machines use the sysbus FDC model, but register a DMA channel.
The DMA transfer is done using:
if (fdctrl->dma_chann != -1 && !(fdctrl->msr & FD_MSR_NONDMA)) {
IsaDmaClass *k = ISADMA_GET_CLASS(fdctrl->dma);
k->release_DREQ(fdctrl->dma, fdctrl->dma_chann);
}The IsaDmaTransferHandler is ISA specific...
I suppose the Jazz machines should use the ISA FDC model.
Hervé, Aleksandar, do you know?
Thanks,
Phil.
Le 18/05/2021 à 09:14, Philippe Mathieu-Daudé a écrit :
Quoted 26 lines
Cc'ing Hervé, Aleksandar, Markus & Mark.
Quoted 7 lines · John Snow
Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 5 lines · John Snow
Quoted 3 lines · Philippe Mathieu-Daudé
The floppy disc controllers pulls in irrelevant devices (sysbus in an ISA-only machine, ISA bus + isa devices on a sysbus-only machine).
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
This series clean that by extracting each device in its own file, adding the corresponding
Kconfigsymbols:FDC_ISAandFDC_SYSBUS.Not good enough:
Yup, I see. Dropping it from the queue for now. Thanks!
The Jazz machines use the sysbus FDC model, but register a DMA channel.
The DMA transfer is done using:
if (fdctrl->dma_chann != -1 && !(fdctrl->msr & FD_MSR_NONDMA)) { IsaDmaClass *k = ISADMA_GET_CLASS(fdctrl->dma); k->release_DREQ(fdctrl->dma, fdctrl->dma_chann); }
Quoted 5 lines
The IsaDmaTransferHandler is ISA specific...
I suppose the Jazz machines should use the ISA FDC model.
Hervé, Aleksandar, do you know?
The Jazz machine uses the standard floppy controller (i82077) FDC registers are accessible at memory-mapped address 0x80003000-0x80003007 FDC interrupt is using custom Jazz interrupt controller, with interrupt #1. FDC DMA is using custom Jazz DMA channel controller, with channel #1.
You can find in jazz.c the following code:
/* FIXME: we should enable DMA with a custom IsaDma device */
fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), -1, 0x80003000, fds);I had in the idea to wrap the custom Jazz interrupt controller in a IsaDma structure, to use it with floppy controller, but I never took the time to do it + test it.
So, floppy drive never worked for me, neither with Windows NT 4, nor with Linux kernels. You can do what you feel the best, as long as you keep the possibility to use the floppy model with something else than a i8259 DMA controller.
Regards,
Hervé