From patchwork Tue Dec 15 11:26:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 41183 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0B13BB6F09 for ; Tue, 15 Dec 2009 22:48:03 +1100 (EST) Received: from localhost ([127.0.0.1]:49551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKVsl-0000Sb-Sp for incoming@patchwork.ozlabs.org; Tue, 15 Dec 2009 06:47:59 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NKVY2-00019I-Lr for qemu-devel@nongnu.org; Tue, 15 Dec 2009 06:26:34 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NKVXv-00014Q-9t for qemu-devel@nongnu.org; Tue, 15 Dec 2009 06:26:31 -0500 Received: from [199.232.76.173] (port=43803 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKVXu-00014C-MS for qemu-devel@nongnu.org; Tue, 15 Dec 2009 06:26:26 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:43011) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NKVXt-00059x-U2 for qemu-devel@nongnu.org; Tue, 15 Dec 2009 06:26:26 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 53007106A33; Tue, 15 Dec 2009 20:26:17 +0900 (JST) Received: (nullmailer pid 28243 invoked by uid 1000); Tue, 15 Dec 2009 11:26:07 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org, mst@redhat.com Date: Tue, 15 Dec 2009 20:26:05 +0900 Message-Id: <1260876367-28197-9-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.5.4 In-Reply-To: <1260876367-28197-1-git-send-email-yamahata@valinux.co.jp> References: <1260876367-28197-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH V2 08/10] piix_pci: define symbolic value for PAM0, PAM6 and SMRAM. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Define symbolic value in i440fx configuration space for 0x59, 0x5f and 0x7f and use them. Signed-off-by: Isaku Yamahata --- hw/piix_pci.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 1b67475..0dae6f9 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -44,6 +44,11 @@ struct PCII440FXState { PIIX3State *piix3; }; + +#define I440FX_PAM 0x59 +#define I440FX_PAM_SIZE 7 +#define I440FX_SMRAM 0x72 + static void piix3_set_irq(void *opaque, int irq_num, int level); /* return the global irq number corresponding to a given device irq @@ -88,12 +93,12 @@ static void i440fx_update_memory_mappings(PCII440FXState *d) int i, r; uint32_t smram, addr; - update_pam(d, 0xf0000, 0x100000, (d->dev.config[0x59] >> 4) & 3); + update_pam(d, 0xf0000, 0x100000, (d->dev.config[I440FX_PAM] >> 4) & 3); for(i = 0; i < 12; i++) { - r = (d->dev.config[(i >> 1) + 0x5a] >> ((i & 1) * 4)) & 3; + r = (d->dev.config[(i >> 1) + (I440FX_PAM + 1)] >> ((i & 1) * 4)) & 3; update_pam(d, 0xc0000 + 0x4000 * i, 0xc0000 + 0x4000 * (i + 1), r); } - smram = d->dev.config[0x72]; + smram = d->dev.config[I440FX_SMRAM]; if ((d->smm_enabled && (smram & 0x08)) || (smram & 0x40)) { cpu_register_physical_memory(0xa0000, 0x20000, 0xa0000); } else { @@ -132,7 +137,9 @@ static void i440fx_write_config(PCIDevice *dev, /* XXX: implement SMRAM.D_LOCK */ pci_default_write_config(dev, address, val, len); - if ((address >= 0x59 && address <= 0x5f) || address == 0x72) + if ((address >= I440FX_PAM && + address <= I440FX_PAM + I440FX_PAM_SIZE - 1) || + address == I440FX_SMRAM) i440fx_update_memory_mappings(d); } @@ -196,7 +203,7 @@ static int i440fx_initfn(PCIDevice *dev) pci_config_set_class(d->dev.config, PCI_CLASS_BRIDGE_HOST); d->dev.config[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type - d->dev.config[0x72] = 0x02; /* SMRAM */ + d->dev.config[I440FX_SMRAM] = 0x02; return 0; }