From patchwork Wed Dec 8 17:08:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 74890 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 8C19DB7043 for ; Fri, 10 Dec 2010 00:44:44 +1100 (EST) Received: from localhost ([127.0.0.1]:34140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQgnZ-0005V5-PS for incoming@patchwork.ozlabs.org; Thu, 09 Dec 2010 08:44:41 -0500 Received: from [140.186.70.92] (port=46989 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQNYn-0002lM-HH for qemu-devel@nongnu.org; Wed, 08 Dec 2010 12:12:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PQNYl-0000fX-OT for qemu-devel@nongnu.org; Wed, 08 Dec 2010 12:12:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:8707) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PQNYl-0000ea-Db for qemu-devel@nongnu.org; Wed, 08 Dec 2010 12:12:07 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oB8HC4MN031575 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 8 Dec 2010 12:12:05 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oB8HC4RQ027176; Wed, 8 Dec 2010 12:12:04 -0500 Received: from amt.cnet (vpn1-4-93.ams2.redhat.com [10.36.4.93]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id oB8HC2fJ020002; Wed, 8 Dec 2010 12:12:03 -0500 Received: from amt.cnet (localhost.localdomain [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id DACF465613C; Wed, 8 Dec 2010 15:09:40 -0200 (BRST) Received: (from marcelo@localhost) by amt.cnet (8.14.4/8.14.4/Submit) id oB8H9cbQ010203; Wed, 8 Dec 2010 15:09:38 -0200 Resent-From: Marcelo Tosatti Resent-Date: Wed, 8 Dec 2010 15:09:38 -0200 Resent-Message-ID: <20101208170938.GB10056@amt.cnet> Resent-To: seabios@seabios.org, qemu-devel@nongnu.org, Gleb Natapov , Gerd Hoffmann Date: Wed, 8 Dec 2010 15:08:59 -0200 From: Marcelo Tosatti To: seabios@seabios.org, qemu-devel@nongnu.org Message-ID: <20101208170858.GA10056@amt.cnet> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-08-17) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann , Gleb Natapov Subject: [Qemu-devel] seabios: acpi: add _RMV control method for PCI devices 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 Use _RMV method to indicate whether device can be removed. Data is retrieved from QEMU via I/O port 0xae0c. Signed-off-by: Marcelo Tosatti Acked-by: Gleb Natapov Index: seabios/src/acpi-dsdt.dsl =================================================================== --- seabios.orig/src/acpi-dsdt.dsl +++ seabios/src/acpi-dsdt.dsl @@ -122,6 +122,12 @@ DefinitionBlock ( B0EJ, 32, } + OperationRegion(RMVC, SystemIO, 0xae0c, 0x04) + Field(RMVC, DWordAcc, NoLock, WriteAsZeros) + { + PCRM, 32, + } + #define hotplug_slot(name, nr) \ Device (S##name) { \ Name (_ADR, nr##0000) \ @@ -245,11 +251,14 @@ DefinitionBlock ( { Return (0x00) } + Method(_RMV) { Return (0x00) } } /* PIIX3 ISA bridge */ Device (ISA) { Name (_ADR, 0x00010000) + Method(_RMV) { Return (0x00) } + /* PIIX PCI to ISA irq remapping */ OperationRegion (P40C, PCI_Config, 0x60, 0x04) @@ -442,6 +451,49 @@ DefinitionBlock ( DRSJ, 32 } } + +#define gen_pci_device(name, nr) \ + Device(SL##name) { \ + Name (_ADR, nr##0000) \ + Method (_RMV) { \ + If (And(\_SB.PCI0.PCRM, ShiftLeft(1, nr))) { \ + Return (0x1) \ + } \ + Return (0x0) \ + } \ + Name (_SUN, name) \ + } + + /* VGA (slot 1) and ISA bus (slot 2) defined above */ + gen_pci_device(3, 0x0003) + gen_pci_device(4, 0x0004) + gen_pci_device(5, 0x0005) + gen_pci_device(6, 0x0006) + gen_pci_device(7, 0x0007) + gen_pci_device(8, 0x0008) + gen_pci_device(9, 0x0009) + gen_pci_device(10, 0x000a) + gen_pci_device(11, 0x000b) + gen_pci_device(12, 0x000c) + gen_pci_device(13, 0x000d) + gen_pci_device(14, 0x000e) + gen_pci_device(15, 0x000f) + gen_pci_device(16, 0x0010) + gen_pci_device(17, 0x0011) + gen_pci_device(18, 0x0012) + gen_pci_device(19, 0x0013) + gen_pci_device(20, 0x0014) + gen_pci_device(21, 0x0015) + gen_pci_device(22, 0x0016) + gen_pci_device(23, 0x0017) + gen_pci_device(24, 0x0018) + gen_pci_device(25, 0x0019) + gen_pci_device(26, 0x001a) + gen_pci_device(27, 0x001b) + gen_pci_device(28, 0x001c) + gen_pci_device(29, 0x001d) + gen_pci_device(30, 0x001e) + gen_pci_device(31, 0x001f) } /* PCI IRQs */