From patchwork Sun Sep 25 09:37:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Kujawski X-Patchwork-Id: 12987973 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EA472C6FA82 for ; Sun, 25 Sep 2022 13:12:57 +0000 (UTC) Received: from localhost ([::1]:41412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocRRI-0001PO-TD for qemu-devel@archiver.kernel.org; Sun, 25 Sep 2022 09:12:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocO5c-0002Iz-Vh; Sun, 25 Sep 2022 05:38:21 -0400 Received: from mout-p-102.mailbox.org ([2001:67c:2050:0:465::102]:48338) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1ocO5b-0007A9-6Z; Sun, 25 Sep 2022 05:38:20 -0400 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4Mb15z42Vmz9snl; Sun, 25 Sep 2022 11:38:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1664098695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uSci2HODWG9PjNVJx6Y+YEanIA2l0t9/txobPaXHSjg=; b=hVCzy/5sas5cVo9zukvvfbwBiYMIUUnmLPksKF5cCZqE/21dCXPkDIAbW7NAFt3oGHoRLJ Rx0EiyHC20lfyFZ5i6ijHi7Sgc55spOVzaQ9HuF4XjKzzqD2yq/t5stRls3gP1BGWPj4bT f5s1aHJOQSbyQ1G/QD5hXuBXXyQWAbqhdaT1csIxX6oJGFWkos64AsDUst2PkeTSC6+/3x sMl6iBVgkTXfpGy7yTayq2i2S/mR9Qwm5PDD3b7mhQlt3xftzl+KzsaA16qwiwxlAYGhtC 5tWSOVgy/kXz+69sCY2200VaK1dgMo52Ye2UfHvVrJqGXNbiS6DAUsBzK7sdow== From: Lev Kujawski DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1664098693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uSci2HODWG9PjNVJx6Y+YEanIA2l0t9/txobPaXHSjg=; b=CH7JoNTkzSybhw3/xzKfGv+1sjCsrat/UzOZklt3jrA2F022ShXxl9waUlwXcCg/nszyIl XD3I/6ZH+4+bnX4N5MAgQqfG2zNw2c7ig6axpqF6X9oINNxT3mapNb4NMtiICEt7NWedSZ 7mAJM9dJxKUP/FAvpfcwE3BuPFzPWXUkBt6mMv+gVsB/kW8mXh9d5CGx0JRBqpsL8hTN1L Nqwp114k26Vfa7ZFU8iqzHQzpDt3MdhIOt5aXqtotoXbWAP2U3kof17BHggiV9vIt5QxpX KAr01vczKZKOMjyem86ci3wbSEKYQaHNQ/iML/q3jS/B37tNCI7XoMECO8qw/Q== To: mst@redhat.com, qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Laurent Vivier , Thomas Huth , Paolo Bonzini , John Snow , Lev Kujawski Subject: [PATCH v3 1/2] qpci_device_enable: Allow for command bits hardwired to 0 Date: Sun, 25 Sep 2022 09:37:58 +0000 Message-Id: <20220925093759.1598617-2-lkujaw@mailbox.org> In-Reply-To: <20220925093759.1598617-1-lkujaw@mailbox.org> References: <20220922060325-mutt-send-email-mst@kernel.org> <20220925093759.1598617-1-lkujaw@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: 89ekusg7ru5qfnseca976hx4rirbcp8m X-MBO-RS-ID: b16d47634bf1bf2ca5a X-Rspamd-Queue-Id: 4Mb15z42Vmz9snl Received-SPF: pass client-ip=2001:67c:2050:0:465::102; envelope-from=lkujaw@mailbox.org; helo=mout-p-102.mailbox.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 25 Sep 2022 09:07:55 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Devices like the PIIX3/4 IDE controller do not support certain modes of operation, such as memory space accesses, and indicate this lack of support by hardwiring the applicable bits to zero. Extend the QEMU PCI device testing framework to accommodate such devices. * tests/qtest/libqos/pci.h: Add the command_disabled word to indicate bits hardwired to 0. * tests/qtest/libqos/pci.c: Verify that hardwired bits are actually hardwired. Signed-off-by: Lev Kujawski --- tests/qtest/libqos/pci.c | 13 +++++++------ tests/qtest/libqos/pci.h | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/qtest/libqos/pci.c b/tests/qtest/libqos/pci.c index b23d72346b..4f3d28d8d9 100644 --- a/tests/qtest/libqos/pci.c +++ b/tests/qtest/libqos/pci.c @@ -220,18 +220,19 @@ int qpci_secondary_buses_init(QPCIBus *bus) void qpci_device_enable(QPCIDevice *dev) { - uint16_t cmd; + const uint16_t enable_bits = + PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER; + uint16_t cmd, new_cmd; /* FIXME -- does this need to be a bus callout? */ cmd = qpci_config_readw(dev, PCI_COMMAND); - cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER; + cmd |= enable_bits; qpci_config_writew(dev, PCI_COMMAND, cmd); /* Verify the bits are now set. */ - cmd = qpci_config_readw(dev, PCI_COMMAND); - g_assert_cmphex(cmd & PCI_COMMAND_IO, ==, PCI_COMMAND_IO); - g_assert_cmphex(cmd & PCI_COMMAND_MEMORY, ==, PCI_COMMAND_MEMORY); - g_assert_cmphex(cmd & PCI_COMMAND_MASTER, ==, PCI_COMMAND_MASTER); + new_cmd = qpci_config_readw(dev, PCI_COMMAND); + new_cmd &= enable_bits; + g_assert_cmphex(new_cmd, ==, enable_bits & ~dev->command_disabled); } /** diff --git a/tests/qtest/libqos/pci.h b/tests/qtest/libqos/pci.h index 8389614523..eaedb98588 100644 --- a/tests/qtest/libqos/pci.h +++ b/tests/qtest/libqos/pci.h @@ -68,6 +68,7 @@ struct QPCIDevice bool msix_enabled; QPCIBar msix_table_bar, msix_pba_bar; uint64_t msix_table_off, msix_pba_off; + uint16_t command_disabled; }; struct QPCIAddress { From patchwork Sun Sep 25 09:37:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Kujawski X-Patchwork-Id: 12987972 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 26178C6FA82 for ; Sun, 25 Sep 2022 13:11:44 +0000 (UTC) Received: from localhost ([::1]:57176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocRQ8-00005R-16 for qemu-devel@archiver.kernel.org; Sun, 25 Sep 2022 09:11:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocO5h-0002Lo-H1; Sun, 25 Sep 2022 05:38:25 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:54200) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1ocO5f-0007AX-H1; Sun, 25 Sep 2022 05:38:25 -0400 Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4Mb1642HQZz9sQt; Sun, 25 Sep 2022 11:38:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1664098700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mb9gWOjdWajX8ukC5lRyB2s9oJCQT+pfk+SKOedQ2BU=; b=n3w1u1Am2sM4XBCNAUcAOHjy7HeIjgC/CxHCD9qKvoK/UfCPCuqWfyENBogBlCZ8IWRawG yq/Rn9oGF76n2rQ5z4cOQ/pibwnjAaIXoGEaGrpNbskn1i4MaOJdmn2ojHrJoGPMM46Qpe 7+C4tRCrrFNbUXff8xIsX9ByMpKE1V0vmeqCZC8bplSa/ZrAApG0mwqJtO29VNv8pBjP/Q NOdZ05WdS7nBRsiXqvlzySgC1S4qMw9j2YGGa9dDS2EGZdYFx/zRL3NpNefx572WsebcyA YjZiuiaNrKVKKLjEGJOueiqAYEbsAvu+ndil2fyJMgQNxMAgVox4F10QXYgL+A== From: Lev Kujawski DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1664098698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mb9gWOjdWajX8ukC5lRyB2s9oJCQT+pfk+SKOedQ2BU=; b=HEAZsvjJFSVZcW+JncKrSgnr1wllvon05EIHCLRff1yz/w98RHt+t59VvZwaqUzqGN9JN4 dx2GNN3FQ4P8gwY+nRBvSgYkpqI47QGeM4hNYEMJhSJJ4liKfKIKoU7eDtCO4/Ggscueud qr4U6ZemS8aYOl5KcrcYwsgAm4v8Xz5WoYQ6Qo7COSOZOqqb2vxE0U4ZwGxOR00jLgI6b5 dplFkcdiQnmiLLIkzDPBIblNfd39PbtYtjlJ8zfq4jMmy1EsQV1VauXOoyFCN2vN5gxBkV CYc+PWMmDgh024ECjvyb7XUD3aqKFBxXo1cNwAOqBp5P42wKHHy4kMaeLONFUw== To: mst@redhat.com, qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Laurent Vivier , Thomas Huth , Paolo Bonzini , John Snow , Lev Kujawski Subject: [PATCH v3 2/2] hw/ide/piix: Ignore writes of hardwired PCI command register bits Date: Sun, 25 Sep 2022 09:37:59 +0000 Message-Id: <20220925093759.1598617-3-lkujaw@mailbox.org> In-Reply-To: <20220925093759.1598617-1-lkujaw@mailbox.org> References: <20220922060325-mutt-send-email-mst@kernel.org> <20220925093759.1598617-1-lkujaw@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 1dc5d4de3c43414e8f9 X-MBO-RS-META: 8ze8ztyeermwt1knqn6irrqnbq5t1ihj Received-SPF: pass client-ip=80.241.56.171; envelope-from=lkujaw@mailbox.org; helo=mout-p-201.mailbox.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 25 Sep 2022 09:07:55 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" One method to enable PCI bus mastering for IDE controllers, often used by x86 firmware, is to write 0x7 to the PCI command register. Neither the PIIX3 specification nor actual hardware (a Tyan S1686D system) permit modification of the Memory Space Enable (MSE) bit, 1, and thus the command register would be left in an unspecified state without this patch. * hw/ide/pci.c Call post_load if provided by derived IDE controller. * hw/ide/piix.c a) Add references to the PIIX data sheets. b) Mask the MSE bit using the QEMU PCI device wmask field. c) Add a post_load function to mask bits from saved machine states. d) Specify post_load for both the PIIX3/4 IDE controllers. * include/hw/ide/pci.h Switch from SIMPLE_TYPE to TYPE, explicitly create a PCIIDEClass that includes the post_load function pointer. * tests/qtest/ide-test.c Use the command_disabled field of the QPCIDevice testing model to indicate that PCI_COMMAND_MEMORY is hardwired in the PIIX3/4 IDE controller. Signed-off-by: Lev Kujawski --- (v2) Use QEMU's built-in PCI bit-masking support rather than attempting to manually filter writes. Thanks to Philippe Mathieu-Daude and Michael S. Tsirkin for review and the pointer. (v3) Handle migration of older machine states, which may have set bits masked by this patch, via a new post_load method of PCIIDEClass. Thanks to Michael S. Tsirkin for catching this via review. hw/ide/pci.c | 5 +++++ hw/ide/piix.c | 39 +++++++++++++++++++++++++++++++++++++++ include/hw/ide/pci.h | 7 ++++++- tests/qtest/ide-test.c | 1 + 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 84ba733548..e42c7b9415 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -447,6 +447,7 @@ static const VMStateDescription vmstate_bmdma = { static int ide_pci_post_load(void *opaque, int version_id) { + PCIIDEClass *dc = PCI_IDE_GET_CLASS(opaque); PCIIDEState *d = opaque; int i; @@ -457,6 +458,10 @@ static int ide_pci_post_load(void *opaque, int version_id) ide_bmdma_post_load(&d->bmdma[i], -1); } + if (dc->post_load) { + dc->post_load(d, version_id); + } + return 0; } diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 9a9b28078e..fd55ecbd36 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -21,6 +21,12 @@ * 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. + * + * References: + * [1] 82371FB (PIIX) AND 82371SB (PIIX3) PCI ISA IDE XCELERATOR, + * 290550-002, Intel Corporation, April 1997. + * [2] 82371AB PCI-TO-ISA / IDE XCELERATOR (PIIX4), 290562-001, + * Intel Corporation, April 1997. */ #include "qemu/osdep.h" @@ -159,6 +165,19 @@ static void pci_piix_ide_realize(PCIDevice *dev, Error **errp) uint8_t *pci_conf = dev->config; int rc; + /* + * Mask all IDE PCI command register bits except for Bus Master + * Function Enable (bit 2) and I/O Space Enable (bit 0), as the + * remainder are hardwired to 0 [1, p.48] [2, p.89-90]. + * + * NOTE: According to the PIIX3 datasheet [1], the Memory Space + * Enable (MSE, bit 1) is hardwired to 1, but this is contradicted + * by actual PIIX3 hardware, the datasheet itself (viz., Default + * Value: 0000h), and the PIIX4 datasheet [2]. + */ + pci_set_word(dev->wmask + PCI_COMMAND, + PCI_COMMAND_MASTER | PCI_COMMAND_IO); + pci_conf[PCI_CLASS_PROG] = 0x80; // legacy ATA mode bmdma_setup_bar(d); @@ -184,11 +203,28 @@ static void pci_piix_ide_exitfn(PCIDevice *dev) } } +static int pci_piix_ide_post_load(PCIIDEState *s, int version_id) +{ + PCIDevice *dev = PCI_DEVICE(s); + uint8_t *pci_conf = dev->config; + + /* + * To preserve backward compatibility, handle saved machine states + * with reserved bits set (see comment in pci_piix_ide_realize()). + */ + pci_set_word(pci_conf + PCI_COMMAND, + pci_get_word(pci_conf + PCI_COMMAND) & + (PCI_COMMAND_MASTER | PCI_COMMAND_IO)); + + return 0; +} + /* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ static void piix3_ide_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + PCIIDEClass *ic = PCI_IDE_CLASS(klass); dc->reset = piix_ide_reset; k->realize = pci_piix_ide_realize; @@ -196,6 +232,7 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data) k->vendor_id = PCI_VENDOR_ID_INTEL; k->device_id = PCI_DEVICE_ID_INTEL_82371SB_1; k->class_id = PCI_CLASS_STORAGE_IDE; + ic->post_load = pci_piix_ide_post_load; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->hotpluggable = false; } @@ -211,6 +248,7 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + PCIIDEClass *ic = PCI_IDE_CLASS(klass); dc->reset = piix_ide_reset; k->realize = pci_piix_ide_realize; @@ -218,6 +256,7 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data) k->vendor_id = PCI_VENDOR_ID_INTEL; k->device_id = PCI_DEVICE_ID_INTEL_82371AB; k->class_id = PCI_CLASS_STORAGE_IDE; + ic->post_load = pci_piix_ide_post_load; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->hotpluggable = false; } diff --git a/include/hw/ide/pci.h b/include/hw/ide/pci.h index d8384e1c42..727c748a0f 100644 --- a/include/hw/ide/pci.h +++ b/include/hw/ide/pci.h @@ -40,7 +40,12 @@ typedef struct BMDMAState { } BMDMAState; #define TYPE_PCI_IDE "pci-ide" -OBJECT_DECLARE_SIMPLE_TYPE(PCIIDEState, PCI_IDE) +OBJECT_DECLARE_TYPE(PCIIDEState, PCIIDEClass, PCI_IDE) + +struct PCIIDEClass { + IDEDeviceClass parent_class; + int (*post_load)(PCIIDEState *s, int version_id); +}; struct PCIIDEState { /*< private >*/ diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c index 5bcb75a7e5..85a3967063 100644 --- a/tests/qtest/ide-test.c +++ b/tests/qtest/ide-test.c @@ -173,6 +173,7 @@ static QPCIDevice *get_pci_device(QTestState *qts, QPCIBar *bmdma_bar, *ide_bar = qpci_legacy_iomap(dev, IDE_BASE); + dev->command_disabled = PCI_COMMAND_MEMORY; qpci_device_enable(dev); return dev;