From nobody Tue Nov 18 10:38:41 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609542750; cv=none; d=zohomail.com; s=zohoarc; b=F99o3Ninb7tYyrzowj9o7RPI91qQdVHbXVJZQQTV1eLOaqzUpSLpiP+VQUZf7FnC0Gv07QgJFTiV1iDXfDqiY1aPcz14Xd4B/iOyLKaiMmkLY4oMhhOOJ63o/lQSVr0sG3XPL0LFjN6o8fKTa4868kraU7ne700+64T4p0pG7fY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609542750; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pPknC029CfavJowHtwOqnsemwysUTgbwL3GrNj5GZCc=; b=NEgROu3Vij2d5a1KB6iV4fsCwmKZZLxttApznEBLH+h/lsKHQu1OBCpCGwgIfhQGCx/UzzkAza3D6Yw2o7BRQYYH9l71RIFW/3LyMyoYmUACBFC2ddnonFoSJ0uudexWcDZLa7AY6zNWNp9RuiwMQNvWo1mPvI68x/ruSw+K3KM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 16095427501721003.2015783903333; Fri, 1 Jan 2021 15:12:30 -0800 (PST) Received: by mail-wm1-f44.google.com with SMTP id 3so10455115wmg.4 for ; Fri, 01 Jan 2021 15:12:29 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (239.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.239]) by smtp.gmail.com with ESMTPSA id g78sm18705835wme.33.2021.01.01.15.12.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jan 2021 15:12:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pPknC029CfavJowHtwOqnsemwysUTgbwL3GrNj5GZCc=; b=U6F8DnS5IBogNbJNUYE37Kq3jPFEFoQO8TVo75+2KJZnImnxETNU/i9I4+afpspRiY KckjcLJtsAdgTob969t1uaQVIo9Dj+Kc2b0fjX+kduPbKGLHqTUK3CPR4R0HvD7AoraA iko38/NM8LFE2KcMvDForW60eM+L7cog0XF4gMoTTk21xAqi9DMHEUtmjYh+4mEO38rK eW2IN/G7gByB4FXFsga8KM3E8KKQTakP8icFAsJ5VrvfUz3NLnx+uOUcXcvL+VMlq5kg JEqyIC91rkxN6NsVDJrdJE/Dm9KJNfKlfaM9G2xiyqkBMcfGNUWNK/phHUssPkLN4NCH h/Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pPknC029CfavJowHtwOqnsemwysUTgbwL3GrNj5GZCc=; b=N2cuCfGa3AeS/Gawh9PF/vIr9QXtGPxl1kdC5yQl40Jxdhf44dfvaWIgPOivuAtv5E Hmf1Zhhfmk9boo6v3ZXnn99Z5dTUjgb/9rAsQKWDLFNxV09Ivh3okj/tuDjyElpGvgi/ C4yircv4ZiJexyRbV5rK5LcdSOUc0WAVgzcuXDGVkwJJdLUcTZeFaJPtWRYitKNund6F 8ndlBFrDmaUp4IkJB3ZKO6AExxw01g1B/G4D03u0MNQmu2XsNRL3lHOHuFaYBDjQLxVE Nbps6SoGWeh6v/kzbAmyoocqL+buVdEP/CfN0+Af7VXsm38wlEz5vu9ogMY6ckTbcbrs vSuQ== X-Gm-Message-State: AOAM533r3boT79QvHKO4zROTl2XGyhhhYJQJdAhJhwuIIDiGcdLTXBE8 N5PZeKDSvxcFklydShgqiIU= X-Google-Smtp-Source: ABdhPJxp5l1KvDxEAAUhLV3oVUkL3YoMIrfWmnxy6fVtdE09xyZ4RX4gal0NtFUCma98vOCQQBUrIA== X-Received: by 2002:a7b:c24d:: with SMTP id b13mr17101502wmj.151.1609542748418; Fri, 01 Jan 2021 15:12:28 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aurelien Jarno , Cleber Rosa , Aleksandar Rikalo , Mark Cave-Ayland , qemu-block@nongnu.org, Artyom Tarasenko , Wainer dos Santos Moschetta , John Snow , Huacai Chen , Peter Maydell , Guenter Roeck , BALATON Zoltan Subject: [RFC PATCH 2/5] via-ide: Fix fuloong2e support Date: Sat, 2 Jan 2021 00:12:12 +0100 Message-Id: <20210101231215.1870611-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210101231215.1870611-1-f4bug@amsat.org> References: <20210101231215.1870611-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Guenter Roeck The IDE legacy mode emulation has been removed in commit 4ea98d317eb ("ide/via: Implement and use native PCI IDE mode") but some Linux kernels (probably including def_config) require legacy mode on the Fuloong2e so only emulating native mode did not turn out feasible. Add property to via-ide model to make the mode configurable, and set legacy mode for Fuloong2e. [balaton: Use bit in flags for property, add comment for missing BAR4] Signed-off-by: Guenter Roeck Signed-off-by: BALATON Zoltan Tested-by: Guenter Roeck Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jiaxun Yang Message-Id: <17a50e58e6baa26440c7dac83f07fdbba1595439.1609191252.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/via.c | 19 +++++++++++++++++-- hw/mips/fuloong2e.c | 4 +++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/hw/ide/via.c b/hw/ide/via.c index be09912b334..2d935b910f8 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -26,6 +26,7 @@ =20 #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/dma.h" @@ -185,12 +186,19 @@ static void via_ide_realize(PCIDevice *dev, Error **e= rrp) &d->bus[1], "via-ide1-cmd", 4); pci_register_bar(dev, 3, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd_bar[1]); =20 - bmdma_setup_bar(d); - pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); + if (!(d->flags & BIT(PCI_IDE_LEGACY_MODE))) { + /* Missing BAR4 will make Linux driver fall back to legacy PIO mod= e */ + bmdma_setup_bar(d); + pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); + } =20 qdev_init_gpio_in(ds, via_ide_set_irq, 2); for (i =3D 0; i < 2; i++) { ide_bus_new(&d->bus[i], sizeof(d->bus[i]), ds, i, 2); + if (d->flags & BIT(PCI_IDE_LEGACY_MODE)) { + ide_init_ioport(&d->bus[i], NULL, i ? 0x170 : 0x1f0, + i ? 0x376 : 0x3f6); + } ide_init2(&d->bus[i], qdev_get_gpio_in(ds, i)); =20 bmdma_init(&d->bus[i], &d->bmdma[i], d); @@ -210,6 +218,12 @@ static void via_ide_exitfn(PCIDevice *dev) } } =20 +static Property via_ide_properties[] =3D { + DEFINE_PROP_BIT("legacy-mode", PCIIDEState, flags, PCI_IDE_LEGACY_MODE, + false), + DEFINE_PROP_END_OF_LIST(), +}; + static void via_ide_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -223,6 +237,7 @@ static void via_ide_class_init(ObjectClass *klass, void= *data) k->device_id =3D PCI_DEVICE_ID_VIA_IDE; k->revision =3D 0x06; k->class_id =3D PCI_CLASS_STORAGE_IDE; + device_class_set_props(dc, via_ide_properties); set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } =20 diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 45c596f4fe5..d334fde389f 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -253,7 +253,9 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus,= int slot, qemu_irq intc, /* Super I/O */ isa_create_simple(isa_bus, TYPE_VT82C686B_SUPERIO); =20 - dev =3D pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), "via-ide"); + dev =3D pci_new(PCI_DEVFN(slot, 1), "via-ide"); + qdev_prop_set_bit(&dev->qdev, "legacy-mode", true); + pci_realize_and_unref(dev, pci_bus, &error_fatal); pci_ide_create_devs(dev); =20 pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci"); --=20 2.26.2