From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yk7ri-0007Wn-M2 for qemu-devel@nongnu.org; Mon, 20 Apr 2015 05:19:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yk7rf-0001fj-RJ for qemu-devel@nongnu.org; Mon, 20 Apr 2015 05:19:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40867) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yk7rf-0001fV-Hk for qemu-devel@nongnu.org; Mon, 20 Apr 2015 05:19:39 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3K9Jci9016000 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 20 Apr 2015 05:19:39 -0400 From: Gerd Hoffmann Date: Mon, 20 Apr 2015 11:19:20 +0200 Message-Id: <1429521560-2743-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1429521560-2743-1-git-send-email-kraxel@redhat.com> References: <1429521560-2743-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 6/6] [wip] tseg, part2, not (yet) tested List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, lersek@redhat.com, Gerd Hoffmann , mst@redhat.com add tseg window to smram region, so cpus can access it in smm mode. Signed-off-by: Gerd Hoffmann --- hw/pci-host/q35.c | 13 +++++++++++++ include/hw/pci-host/q35.h | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 412ff0a..7d21399 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -345,6 +345,13 @@ static void mch_update_smram(MCHPCIState *mch) mch->below_4g_mem_size - tseg_size, &mch->tseg_blackhole, 1); + memory_region_set_enabled(&mch->tseg_window, tseg_size); + memory_region_set_size(&mch->tseg_window, tseg_size); + memory_region_set_address(&mch->tseg_window, + mch->below_4g_mem_size - tseg_size); + memory_region_set_alias_offset(&mch->tseg_window, + mch->below_4g_mem_size - tseg_size); + memory_region_transaction_commit(); } @@ -500,6 +507,12 @@ static void mch_realize(PCIDevice *d, Error **errp) mch->below_4g_mem_size, &mch->tseg_blackhole, 1); + memory_region_init_alias(&mch->tseg_window, OBJECT(mch), "tseg-window", + mch->ram_memory, mch->below_4g_mem_size, 0); + memory_region_set_enabled(&mch->tseg_window, false); + memory_region_add_subregion(&mch->smram, mch->below_4g_mem_size, + &mch->tseg_window); + init_pam(DEVICE(mch), mch->ram_memory, mch->system_memory, mch->pci_address_space, &mch->pam_regions[0], PAM_BIOS_BASE, PAM_BIOS_SIZE); diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h index ba64c70..23b7700 100644 --- a/include/hw/pci-host/q35.h +++ b/include/hw/pci-host/q35.h @@ -55,7 +55,7 @@ typedef struct MCHPCIState { PAMMemoryRegion pam_regions[13]; MemoryRegion smram_region, open_high_smram; MemoryRegion smram, low_smram, high_smram; - MemoryRegion tseg_blackhole; + MemoryRegion tseg_blackhole, tseg_window; PcPciInfo pci_info; ram_addr_t below_4g_mem_size; ram_addr_t above_4g_mem_size; -- 1.8.3.1