From: "Michael S. Tsirkin" <mst@redhat.com>
To: Igor Mammedov <imammedo@redhat.com>
Cc: jsnow@redhat.com, qemu-devel@nongnu.org, rkagan@virtuozzo.com
Subject: Re: [Qemu-devel] [PATCH v7 3/3] i386: populate floppy drive information in DSDT
Date: Sun, 7 Feb 2016 11:08:07 +0200 [thread overview]
Message-ID: <20160207102341-mutt-send-email-mst@redhat.com> (raw)
In-Reply-To: <1453816225-139685-4-git-send-email-imammedo@redhat.com>
On Tue, Jan 26, 2016 at 02:50:25PM +0100, Igor Mammedov wrote:
> From: Roman Kagan <rkagan@virtuozzo.com>
>
> 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
are 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 <rkagan@virtuozzo.com>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> 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)
acpi spec says these are WORD values. Are they really uint8_t?
> +{
> + Aml *dev, *fdi;
> +
> + dev = aml_device("FLP%c", 'A' + idx);
> +
> + aml_append(dev, aml_name_decl("_ADR", aml_int(idx)));
> +
> + fdi = aml_package(0x10);
Why 0x10 and not 16?
> + 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 */
> + aml_append(fdi, aml_int(sectors)); /* Maximum Sector Number */
> + aml_append(fdi, aml_int(heads - 1)); /* Maximum Head Number */
Doesn't above change on media change?
If so this must be created dynamically, not hard-coded at machine
done type.
> + /* SeaBIOS returns the below values for int 0x13 func 0x08 regardless of
> + * the drive type, so shall we */
/*
* Format comments
* Like this please
*/
/* Not
* Like this */
> + 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)};
Pls document values.
>
> 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);
Pls document values.
> + 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)));
No space after cast please.
> +
> 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));
> --
> 1.8.3.1
next prev parent reply other threads:[~2016-02-07 9:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-26 13:50 [Qemu-devel] [PATCH v7 0/3] i386: expose floppy-related objects in SSDT Igor Mammedov
2016-01-26 13:50 ` [Qemu-devel] [PATCH v7 1/3] i386/acpi: make floppy controller object dynamic Igor Mammedov
2016-02-14 10:00 ` Marcel Apfelbaum
2016-01-26 13:50 ` [Qemu-devel] [PATCH v7 2/3] expose floppy drive geometry and CMOS type Igor Mammedov
2016-01-26 13:50 ` [Qemu-devel] [PATCH v7 3/3] i386: populate floppy drive information in DSDT Igor Mammedov
2016-02-07 9:08 ` Michael S. Tsirkin [this message]
2016-02-08 13:00 ` Roman Kagan
2016-02-08 13:16 ` Michael S. Tsirkin
2016-02-08 13:41 ` Igor Mammedov
2016-01-26 19:15 ` [Qemu-devel] [PATCH v7 0/3] i386: expose floppy-related objects in SSDT John Snow
2016-01-27 10:00 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160207102341-mutt-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=imammedo@redhat.com \
--cc=jsnow@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rkagan@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).