From patchwork Tue Apr 6 11:44:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 49504 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 829F7B7D19 for ; Tue, 6 Apr 2010 22:07:08 +1000 (EST) Received: from localhost ([127.0.0.1]:45417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nz7QM-0003qM-FS for incoming@patchwork.ozlabs.org; Tue, 06 Apr 2010 07:58:30 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nz7E1-0000n5-DO for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:45:45 -0400 Received: from [140.186.70.92] (port=35235 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nz7E0-0000mc-4V for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:45:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nz7Dy-0000Oj-NW for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:45:43 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:63208) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nz7Dy-0000OZ-B1 for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:45:42 -0400 Received: from flocke.weilnetz.de (p54ADF876.dip.t-dialin.net [84.173.248.118]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0LbvF2-1NINwP0dGe-00jMYR; Tue, 06 Apr 2010 13:45:41 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1Nz7Dm-00080t-AY; Tue, 06 Apr 2010 13:45:30 +0200 From: Stefan Weil To: QEMU Developers Date: Tue, 6 Apr 2010 13:44:07 +0200 Message-Id: <1270554249-24861-8-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1270554249-24861-1-git-send-email-weil@mail.berlios.de> References: <1270554249-24861-1-git-send-email-weil@mail.berlios.de> X-Provags-ID: V01U2FsdGVkX194yERUYMwODiTCjnbxfAMNciIwqIm0iN1gbti AaaTFrnNvLFI7sQ7Mdcs1wE06NN+RbycBkHYSo4k2ZZ0gA3vnB AyHhFCt0Gss+WLdq8mMRQhtKBJ6dHgMVZfTr/zTEgJoM3Mz+5x VRA== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 7/9] eepro100: Set power management capability using pci_reserve_capability 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 pci_reserve_capability automatically updates PCI status and PCI capability pointer, so use it. Signed-off-by: Stefan Weil --- hw/eepro100.c | 39 ++++++++++++++++++--------------------- 1 files changed, 18 insertions(+), 21 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index e12ee23..f0acdbc 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -457,7 +457,6 @@ static void eepro100_fcp_interrupt(EEPRO100State * s) static void e100_pci_reset(EEPRO100State * s, E100PCIDeviceInfo *e100_device) { - /* TODO: Use pci_add_capability(&s->dev, PCI_CAP_ID_PM, ...) for PM. */ uint32_t device = s->device; uint8_t *pci_conf = s->dev.config; @@ -468,25 +467,14 @@ static void e100_pci_reset(EEPRO100State * s, E100PCIDeviceInfo *e100_device) /* PCI Device ID */ pci_config_set_device_id(pci_conf, e100_device->device_id); /* PCI Status */ - if (e100_device->power_management) { - pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM | - PCI_STATUS_FAST_BACK | - PCI_STATUS_CAP_LIST); - } else { - pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM | - PCI_STATUS_FAST_BACK); - } + pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM | + PCI_STATUS_FAST_BACK); /* PCI Revision ID */ pci_config_set_revision(pci_conf, e100_device->revision); pci_config_set_class(pci_conf, PCI_CLASS_NETWORK_ETHERNET); /* PCI Latency Timer */ pci_set_byte(pci_conf + PCI_LATENCY_TIMER, 0x20); /* latency timer = 32 clocks */ - /* Capability Pointer */ - if (e100_device->power_management) { - pci_set_byte(pci_conf + PCI_CAPABILITY_LIST, 0xdc); - } else { - pci_set_byte(pci_conf + PCI_CAPABILITY_LIST, 0x00); - } + /* Capability Pointer is set by PCI framework. */ /* Minimum Grant */ pci_set_byte(pci_conf + PCI_MIN_GNT, 0x08); /* Maximum Latency */ @@ -549,12 +537,21 @@ static void e100_pci_reset(EEPRO100State * s, E100PCIDeviceInfo *e100_device) if (e100_device->power_management) { /* Power Management Capabilities */ - pci_set_byte(pci_conf + 0xdc, PCI_CAP_ID_PM); - /* Next Item Pointer */ - /* Capability ID */ - pci_set_word(pci_conf + 0xde, 0x7e21); - /* TODO: Power Management Control / Status. */ - /* TODO: Ethernet Power Consumption Registers (i82559 and later). */ + int cfg_offset; + pci_reserve_capability(&s->dev, PCI_CONFIG_HEADER_SIZE, + 0xdc - PCI_CONFIG_HEADER_SIZE); + cfg_offset = pci_add_capability(&s->dev, PCI_CAP_ID_PM, PCI_PM_SIZEOF); + assert(cfg_offset == 0xdc); + if (cfg_offset > 0) { + /* Power Management Capabilities */ + pci_set_word(pci_conf + cfg_offset + PCI_PM_PMC, 0x7e21); +#if 0 /* TODO: replace dummy code for power management emulation. */ + /* TODO: Power Management Control / Status. */ + pci_set_word(pci_conf + cfg_offset + PCI_PM_CTRL, 0x0000); + /* TODO: Ethernet Power Consumption Registers (i82559 and later). */ + pci_set_byte(pci_conf + cfg_offset + PCI_PM_PPB_EXTENSIONS, 0x0000); +#endif + } } #if EEPROM_SIZE > 0