Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6655BC433E0 for ; Sat, 25 Jul 2020 13:54:51 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 3B3D520674 for ; Sat, 25 Jul 2020 13:54:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B3D520674 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzKdW-0005ba-GD for qemu-devel@archiver.kernel.org; Sat, 25 Jul 2020 09:54:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzJhf-0003d1-Q5 for qemu-devel@nongnu.org; Sat, 25 Jul 2020 08:55:03 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:39502 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzJhd-0006tf-SR for qemu-devel@nongnu.org; Sat, 25 Jul 2020 08:55:03 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id E0F37ED71C1FABDD0635; Sat, 25 Jul 2020 20:54:49 +0800 (CST) Received: from localhost (10.174.149.56) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.487.0; Sat, 25 Jul 2020 20:54:44 +0800 From: Hogan Wang To: , , , , Subject: [PATCH v3 2/2] hw/pci-host: save/restore pci host config register for old ones Date: Sat, 25 Jul 2020 20:54:37 +0800 Message-ID: <20200725125437.2825-2-hogan.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200725125437.2825-1-hogan.wang@huawei.com> References: <20200725125437.2825-1-hogan.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.174.149.56] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.32; envelope-from=hogan.wang@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/25 08:54:50 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 25 Jul 2020 09:54:04 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wangxinxin.wang@huawei.com, weidong.huang@huawei.com, hogan.wang@huawei.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The i440fx and q35 machines integrate i440FX or MCH PCI device by default. Refer to i440FX and ICH9-LPC spcifications, there are some reserved configuration registers can used to save/restore PCIHostState.config_reg. It's nasty but friendly to old ones. Signed-off-by: Hogan Wang --- hw/pci-host/i440fx.c | 31 +++++++++++++++++++++++++++++++ hw/pci-host/q35.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index c662903dbb..9e2cfdb052 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -65,6 +65,14 @@ typedef struct I440FXState { */ #define I440FX_COREBOOT_RAM_SIZE 0x57 +/* Older I440FX machines (5.0 and older) not support i440FX-pcihost state + * migration, use some reserved INTEL 82441 configuration registers to + * save/restore i440FX-pcihost config register. Refer to [INTEL 440FX PCISET + * 82441FX PCI AND MEMORY CONTROLLER (PMC) AND 82442FX DATA BUS ACCELERATOR + * (DBX) Table 1. PMC Configuration Space] + */ +#define I440FX_PCI_HOST_CONFIG_REG 0x94 + static void i440fx_update_memory_mappings(PCII440FXState *d) { int i; @@ -99,8 +107,30 @@ static void i440fx_write_config(PCIDevice *dev, static int i440fx_post_load(void *opaque, int version_id) { PCII440FXState *d = opaque; + uint8_t *config; + I440FXState *s = OBJECT_CHECK(I440FXState, + object_resolve_path("/machine/i440fx", NULL), + TYPE_PCI_HOST_BRIDGE); i440fx_update_memory_mappings(d); + + if (!s->migration_enabled) { + config = &d->parent_obj.config[I440FX_PCI_HOST_CONFIG_REG]; + s->parent_obj.config_reg = pci_get_long(config); + } + return 0; +} + +static int i440fx_pre_save(void *opaque) +{ + PCIDevice *d = opaque; + I440FXState *s = OBJECT_CHECK(I440FXState, + object_resolve_path("/machine/i440fx", NULL), + TYPE_PCI_HOST_BRIDGE); + if (!s->migration_enabled) { + pci_set_long(&d->config[I440FX_PCI_HOST_CONFIG_REG], + s->parent_obj.config_reg); + } return 0; } @@ -108,6 +138,7 @@ static const VMStateDescription vmstate_i440fx = { .name = "I440FX", .version_id = 3, .minimum_version_id = 3, + .pre_save = i440fx_pre_save, .post_load = i440fx_post_load, .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PCII440FXState), diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index bb41665da4..67e08dedc5 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -43,6 +43,15 @@ #define Q35_PCI_HOST_HOLE64_SIZE_DEFAULT (1ULL << 35) +/* Older Q35 machines (5.0 and older) not support q35-pcihost state + * migration, use some reserved INTEL MCH configuration registers to + * save/restore q35-pcihost config register. Refer to [Intel 3 Series + * Chipset Family Datasheet Table 5-1. DRAM Controller Register Address + * Map (D0:F0)] + */ +#define Q35_PCI_HOST_CONFIG_REG 0x70 + + static void q35_host_realize(DeviceState *dev, Error **errp) { PCIHostState *pci = PCI_HOST_BRIDGE(dev); @@ -532,7 +541,34 @@ static void mch_update(MCHPCIState *mch) static int mch_post_load(void *opaque, int version_id) { MCHPCIState *mch = opaque; + uint8_t *config; + Q35PCIHost *s = OBJECT_CHECK(Q35PCIHost, + object_resolve_path("/machine/q35", NULL), + TYPE_PCI_HOST_BRIDGE); + PCIHostState *pci = PCI_HOST_BRIDGE(s); + mch_update(mch); + if (!s->migration_enabled) { + config = &mch->parent_obj.config[Q35_PCI_HOST_CONFIG_REG]; + pci->config_reg = pci_get_long(config); + } + + return 0; +} + +static int mch_pre_save(void *opaque) +{ + MCHPCIState *mch = opaque; + uint8_t *config; + Q35PCIHost *s = OBJECT_CHECK(Q35PCIHost, + object_resolve_path("/machine/q35", NULL), + TYPE_PCI_HOST_BRIDGE); + PCIHostState *pci = PCI_HOST_BRIDGE(s); + + if (!s->migration_enabled) { + config = &mch->parent_obj.config[Q35_PCI_HOST_CONFIG_REG]; + pci_set_long(config, pci->config_reg); + } return 0; } @@ -540,6 +576,7 @@ static const VMStateDescription vmstate_mch = { .name = "mch", .version_id = 1, .minimum_version_id = 1, + .pre_save = mch_pre_save, .post_load = mch_post_load, .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, MCHPCIState), -- 2.27.0