From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSm4h-00084Y-PV for qemu-devel@nongnu.org; Mon, 08 Feb 2016 08:41:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSm4d-0003jg-Ob for qemu-devel@nongnu.org; Mon, 08 Feb 2016 08:41:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50033) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSm4d-0003jN-Gh for qemu-devel@nongnu.org; Mon, 08 Feb 2016 08:41:51 -0500 Date: Mon, 8 Feb 2016 14:41:47 +0100 From: Igor Mammedov Message-ID: <20160208144147.443c71c1@nial.brq.redhat.com> In-Reply-To: <1453816225-139685-4-git-send-email-imammedo@redhat.com> References: <1453816225-139685-1-git-send-email-imammedo@redhat.com> <1453816225-139685-4-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v7 3/3] i386: populate floppy drive information in DSDT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jsnow@redhat.com, rkagan@virtuozzo.com, mst@redhat.com On Tue, 26 Jan 2016 14:50:25 +0100 Igor Mammedov wrote: > From: Roman Kagan > > On x86-based systems Linux determines the presence > and the type of floppy drives via a query of a CMOS field. > So does SeaBIOS when populating the return data for > int 0x13 function 0x08. > > However Windows doesn't do it. Instead, it requests > this information from BIOS via int 0x13/0x08 or through > ACPI objects _FDE (Floppy Drive Enumerate) and _FDI > (Floppy Drive Information) of the floppy controller object. > On UEFI systems only ACPI-based detection is supported. > > QEMU doesn't provide those objects in its ACPI tables > and as a result floppy drives aren't invisible to Windows > on UEFI/OVMF. > > This patch adds those objects to the floppy controller > in DSDT, populating them with the information from > respective QEMU objects. > > Signed-off-by: Roman Kagan > Signed-off-by: Igor Mammedov pls also test with booting XP guest with default SeaBIOS firmware. > --- > fixup: > - rebase on latest FDC refactoring > --- > hw/i386/acpi-build.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 58 insertions(+), 3 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 2f685fb..1d291d8 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -38,6 +38,7 @@ > #include "hw/acpi/bios-linker-loader.h" > #include "hw/loader.h" > #include "hw/isa/isa.h" > +#include "hw/block/fdc.h" > #include "hw/acpi/memory_hotplug.h" > #include "hw/mem/nvdimm.h" > #include "sysemu/tpm.h" > @@ -1227,10 +1228,47 @@ static void build_hpet_aml(Aml *table) > aml_append(table, scope); > } > > -static Aml *build_fdc_device_aml(void) > +static Aml *build_fdinfo_aml(int idx, uint8_t type, uint8_t cylinders, > + uint8_t heads, uint8_t sectors) > +{ > + Aml *dev, *fdi; > + > + dev = aml_device("FLP%c", 'A' + idx); > + > + aml_append(dev, aml_name_decl("_ADR", aml_int(idx))); > + > + fdi = aml_package(0x10); > + aml_append(fdi, aml_int(idx)); /* Drive Number */ > + aml_append(fdi, > + aml_int(cmos_get_fd_drive_type(type))); /* Device Type */ > + aml_append(fdi, > + aml_int(cylinders - 1)); /* Maximum Cylinder Number */ int overflow shouldn't happen here, XP crashes here because overflows causes 64bit number here which has not supported AML opcode per ACPI1.0b spec, Also per ACPI spec it's uint16_t type max. > + aml_append(fdi, aml_int(sectors)); /* Maximum Sector Number */ > + aml_append(fdi, aml_int(heads - 1)); /* Maximum Head Number */ isa_fdc_get_drive_geometry() returns number of 'heads' either 1 or 2, so are you sure that (heads - 1) is correct here? The same question applies to 'cylinders'. > + /* 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; > +} > + > +static Aml *build_fdc_device_aml(ISADevice *fdc) > { > + int i; > Aml *dev; > Aml *crs; > + uint32_t fde_buf[5] = {0, 0, 0, 0, cpu_to_le32(0x2)}; > > dev = aml_device("FDC0"); > aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0700"))); > @@ -1243,6 +1281,21 @@ static Aml *build_fdc_device_aml(void) > aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2)); > aml_append(dev, aml_name_decl("_CRS", crs)); > > + for (i = 0; i < MAX_FD; i++) { > + uint8_t type = isa_fdc_get_drive_type(fdc, i); > + > + if (type < FLOPPY_DRIVE_TYPE_NONE) { > + uint8_t cylinders, heads, sectors; > + > + fde_buf[i] = cpu_to_le32(0x1); > + isa_fdc_get_drive_geometry(fdc, i, &cylinders, &heads, §ors); > + aml_append(dev, > + build_fdinfo_aml(i, type, cylinders, heads, sectors)); > + } > + } > + aml_append(dev, aml_name_decl("_FDE", > + aml_buffer(sizeof(fde_buf), (uint8_t *) fde_buf))); > + > return dev; > } > > @@ -1387,13 +1440,15 @@ static Aml *build_com_device_aml(uint8_t uid) > > static void build_isa_devices_aml(Aml *table) > { > + ISADevice *fdc = pc_find_fdc0(); > + > Aml *scope = aml_scope("_SB.PCI0.ISA"); > > aml_append(scope, build_rtc_device_aml()); > aml_append(scope, build_kbd_device_aml()); > aml_append(scope, build_mouse_device_aml()); > - if (!!pc_find_fdc0()) { > - aml_append(scope, build_fdc_device_aml()); > + if (!!fdc) { > + aml_append(scope, build_fdc_device_aml(fdc)); > } > aml_append(scope, build_lpt_device_aml()); > aml_append(scope, build_com_device_aml(1));