SeaBIOS March 2013

seabios@seabios.org

41 participants
83 discussions

Re: [SeaBIOS] [Qemu-devel] [RFC PATCH v4 00/30] ACPI memory hotplug
by liu ping fan 28 Mar '13

28 Mar '13

On Thu, Mar 28, 2013 at 5:29 PM, Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> wrote: > Hi, > > [...] >>> > > >>> > > I haven't updated the series for a while, but I can rework if there is a more >>> > > clear direction for the community. >>> > > >>> > > Another open issue is reference counting of memoryregions in qemu memory >>> > > model. In order to make memory hot-remove operations safe, we need to remove >>> > > a memoryregion after all users (e.g. both guest and block layer) have stopped >>> > > using it, >>> > >>> > it seems it mostly up to the user who want to hot-(un)plug, >>> > if user want to un-plug a memory which is kernel's main memory, kernel >>> > will always run on it(never stop) unless power off. >>> > and if guest stops, all DIMMs should be safe to hot-remove, >>> > or else we should do something to let user can unlock all reference. >>> >>> it's not only the guest-side that needs to stop using it, we need to make sure >>> that the qemu block layer is also not using the memory region anymore. See the 2 >>> links below for discussion: >>> >> >> can't we simply track this(MemoryRegion) usage by ref-count? >> e.g. >> every time mr used, inc ref-count, then dec it when unused >> even for cpu_physical_memory_map and other potential users. >> > > yes, that's the idea the patchset below try to implement, but last > time I checked this was not upstreamed. I will take a closer look next > week. > The current problem is that if not all the device convert to support MemoryRegionOps ref/unref API, the code in address_space_rw will be ugly. But I think the virtio data plane will need thread-safe RAM, so can we just try that for RAM device. If it is needed, I will update my patches Regards, Pingfan >>> > > see discussion at >>> > > http://lists.gnu.org/archive/html/qemu-devel/2012-10/msg03986.html. There was a >>> > > relevant ibm patchset >>> > > https://lists.gnu.org/archive/html/qemu-devel/2012-11/msg02697.html >>> > > but it was not merged. > > - Vasilis

1 0

Re: [SeaBIOS] [Qemu-devel] [RFC PATCH v4 00/30] ACPI memory hotplug
by li guang 28 Mar '13

28 Mar '13

在 2013-03-26二的 17:43 +0100，Vasilis Liaskovitis写道： > Hi, > > On Tue, Mar 19, 2013 at 03:28:38PM +0800, li guang wrote: > [...] > > > > > This is v4 of the ACPI memory hotplug functionality. Only x86_64 target is > > > > > supported (both i440fx and q35). There are still several issues, but it's > > > > > been a while since v3 and I wanted to get some more feedback on the current > > > > > state of the patchseries. > > > > > > > > > > > > > > We are working in memory hotplug functionality on pSeries machine. I'm > > > > wondering whether and how we can better integrate things. Do you think the > > > > DIMM abstraction is generic enough to be used in other machine types? > > > > > > I think the DimmDevice is generic enough but I am open to other suggestions. > > > > > > A related issue is that the patchseries uses a DimmBus to hot-add and hot-remove > > > DimmDevice. Another approach that has been suggested is to use links<> between > > > DimmDevices and the dram controller device (piix4 or mch for pc and q35-pc > > > machines respectively). This would be more similar to the CPUState/qom > > > patches - see Andreas Färber's earlier reply to this thread. > > > > > > I think we should get some consensus from the community/maintainers before we > > > continue to integrate. > > > > > > I haven't updated the series for a while, but I can rework if there is a more > > > clear direction for the community. > > > > > > Another open issue is reference counting of memoryregions in qemu memory > > > model. In order to make memory hot-remove operations safe, we need to remove > > > a memoryregion after all users (e.g. both guest and block layer) have stopped > > > using it, > > > > it seems it mostly up to the user who want to hot-(un)plug, > > if user want to un-plug a memory which is kernel's main memory, kernel > > will always run on it(never stop) unless power off. > > and if guest stops, all DIMMs should be safe to hot-remove, > > or else we should do something to let user can unlock all reference. > > it's not only the guest-side that needs to stop using it, we need to make sure > that the qemu block layer is also not using the memory region anymore. See the 2 > links below for discussion: > can't we simply track this(MemoryRegion) usage by ref-count? e.g. every time mr used, inc ref-count, then dec it when unused even for cpu_physical_memory_map and other potential users. > > > see discussion at > > > http://lists.gnu.org/archive/html/qemu-devel/2012-10/msg03986.html. There was a > > > relevant ibm patchset > > > https://lists.gnu.org/archive/html/qemu-devel/2012-11/msg02697.html > > > but it was not merged. > > > > thanks, > > - Vasilis

2 1

[PATCH 0/2] Add TPM driver and ACPI support to SeaBIOS
by Corey Bryant 28 Mar '13

28 Mar '13

The following set of patches is being resubmitted to add TPM support to SeaBIOS. This series only includes a subset of the total seabios TPM support that is planned. The patches included in this series provide initial foundational support that make sense to include at this point now that a passthrough vTPM is available in QEMU. In particular, these patches add: - a TPM driver for QEMU's TPM TIS emulation - ACPI support for the TPM device (SSDT table) - ACPI support for measurement logging (TCPA table) Corey Bryant (2): Add an implementation of a TPM TIS driver Provide ACPI SSDT table for TPM device Makefile | 9 ++- src/acpi-tpm-ssdt.dsl | 24 +++++ src/acpi-tpm-ssdt.hex | 27 +++++ src/acpi.c | 41 ++++++++ src/acpi.h | 20 ++++ src/config.h | 2 +- src/tcgbios.c | 70 +++++++++++++ src/tcgbios.h | 57 +++++++++++ src/tpm_drivers.c | 258 +++++++++++++++++++++++++++++++++++++++++++++++++ src/tpm_drivers.h | 90 +++++++++++++++++ 10 files changed, 596 insertions(+), 2 deletions(-) create mode 100644 src/acpi-tpm-ssdt.dsl create mode 100644 src/acpi-tpm-ssdt.hex create mode 100644 src/tcgbios.c create mode 100644 src/tcgbios.h create mode 100644 src/tpm_drivers.c create mode 100644 src/tpm_drivers.h

2 3

Re: [SeaBIOS] [Qemu-devel] [RFC PATCH v4 00/30] ACPI memory hotplug
by Andreas Färber 27 Mar '13

27 Mar '13

Am 18.12.2012 13:41, schrieb Vasilis Liaskovitis: > Because dimm layout needs to be configured on machine-boot, all dimm devices > need to be specified on startup command line (either with populated=on or with > populated=off). The dimm information is stored in dimm configuration structures. > > After machine startup, dimms are hot-added or removed with normal device_add > and device_del operations e.g.: > Hot-add syntax: "device_add dimm,id=mydimm0,bus=membus.0" > Hot-remove syntax: "device_del dimm,id=mydimm0" This sounds contradictory: Either all devices need to be specified on the command line, or they can be hot-added via monitor. Assuming a fixed layout at startup, I wonder if there is another clever way to model this... For CPU hotplug Anthony had suggested to have a fixed set of link<Socket> properties that get set to a CPU socket as needed. Might a similar strategy work for memory, i.e. a startup-configured amount of link<DIMM>s on /machine/dimm[n] that point to a QOM DIMM object or NULL if unpopulated? Hot(un)plug would then simply work via QMP qom-set command. (CC'ing some people) Regards, Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

4 4

Re: [SeaBIOS] [Qemu-devel] [RFC PATCH v4 00/30] ACPI memory hotplug
by li guang 27 Mar '13

27 Mar '13

在 2013-03-26二的 17:58 +0100，Vasilis Liaskovitis写道： > Hi, > > On Tue, Mar 19, 2013 at 02:30:25PM +0800, li guang wrote: > > 在 2013-01-10四的 19:57 +0100，Vasilis Liaskovitis写道： > > > > > > > > > > IIRC q35 supports memory hotplug natively (picked up in some > > > > > discussion). Is that correct? > > > > > > > > > From previous discussion I also understand that q35 supports native hotplug. > > > > Sections 5.1 and 5.2 of the spec describe the MCH registers but the native > > > > memory hotplug specifics are not yet clear to me. Any pointers from the > > > > spec are welcome. > > > > > > Ping. Could anyone who's familiar with the q35 spec provide some pointers on > > > native memory hotplug details in the spec? I see pcie hotplug registers but can't > > > find memory hotplug interface details. If I am not mistaken, the spec is here: > > > http://www.intel.com/design/chipsets/datashts/316966.htm > > > > > > Is the q35 memory hotplug support supposed to be an shpc-like interface geared > > > towards memory slots instead of pci slots? > > > > > > > seems there's no so-called q35-native support > > that was also my first impression when scanning the specification. Wasn't native > memory hotplug capabilities one of the reasons that q35 got picked as the next > pc chipset? Um, I can't find the original statement of q35, but I think if we can't find in intel's official SPEC, then we have to say 'there's no q35-native support'.

1 0

Re: [SeaBIOS] [Qemu-devel] [RFC PATCH v4 00/30] ACPI memory hotplug
by Luiz Capitulino 26 Mar '13

26 Mar '13

On Tue, 18 Dec 2012 13:41:28 +0100 Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> wrote: > This is v4 of the ACPI memory hotplug functionality. Only x86_64 target is > supported (both i440fx and q35). There are still several issues, but it's > been a while since v3 and I wanted to get some more feedback on the current > state of the patchseries. It seems this series doesn't apply anymore, do you plan to respin it? Also, some months ago I saw patches flying on linux-mm fixing some issues related to memory hotplug, so should this work with latest Linux kernel?

2 1

Re: [SeaBIOS] [Qemu-devel] [RFC PATCH v4 00/30] ACPI memory hotplug
by li guang 26 Mar '13

26 Mar '13

在 2013-01-10四的 19:57 +0100，Vasilis Liaskovitis写道： > > > > > > IIRC q35 supports memory hotplug natively (picked up in some > > > discussion). Is that correct? > > > > > From previous discussion I also understand that q35 supports native hotplug. > > Sections 5.1 and 5.2 of the spec describe the MCH registers but the native > > memory hotplug specifics are not yet clear to me. Any pointers from the > > spec are welcome. > > Ping. Could anyone who's familiar with the q35 spec provide some pointers on > native memory hotplug details in the spec? I see pcie hotplug registers but can't > find memory hotplug interface details. If I am not mistaken, the spec is here: > http://www.intel.com/design/chipsets/datashts/316966.htm > > Is the q35 memory hotplug support supposed to be an shpc-like interface geared > towards memory slots instead of pci slots? > seems there's no so-called q35-native support

2 1

Re: [SeaBIOS] [Qemu-devel] [RFC PATCH v4 00/30] ACPI memory hotplug
by li guang 26 Mar '13

26 Mar '13

在 2013-02-28四的 11:18 +0100，Vasilis Liaskovitis写道： > Hi, > > sorry for the delay. > On Tue, Feb 19, 2013 at 07:39:40PM -0300, Erlon Cruz wrote: > > On Tue, Dec 18, 2012 at 10:41 AM, Vasilis Liaskovitis < > > vasilis.liaskovitis(a)profitbricks.com> wrote: > > > > > This is v4 of the ACPI memory hotplug functionality. Only x86_64 target is > > > supported (both i440fx and q35). There are still several issues, but it's > > > been a while since v3 and I wanted to get some more feedback on the current > > > state of the patchseries. > > > > > > > > We are working in memory hotplug functionality on pSeries machine. I'm > > wondering whether and how we can better integrate things. Do you think the > > DIMM abstraction is generic enough to be used in other machine types? > > I think the DimmDevice is generic enough but I am open to other suggestions. > > A related issue is that the patchseries uses a DimmBus to hot-add and hot-remove > DimmDevice. Another approach that has been suggested is to use links<> between > DimmDevices and the dram controller device (piix4 or mch for pc and q35-pc > machines respectively). This would be more similar to the CPUState/qom > patches - see Andreas Färber's earlier reply to this thread. > > I think we should get some consensus from the community/maintainers before we > continue to integrate. > > I haven't updated the series for a while, but I can rework if there is a more > clear direction for the community. > > Another open issue is reference counting of memoryregions in qemu memory > model. In order to make memory hot-remove operations safe, we need to remove > a memoryregion after all users (e.g. both guest and block layer) have stopped > using it, it seems it mostly up to the user who want to hot-(un)plug, if user want to un-plug a memory which is kernel's main memory, kernel will always run on it(never stop) unless power off. and if guest stops, all DIMMs should be safe to hot-remove, or else we should do something to let user can unlock all reference. > see discussion at > http://lists.gnu.org/archive/html/qemu-devel/2012-10/msg03986.html. There was a > relevant ibm patchset > https://lists.gnu.org/archive/html/qemu-devel/2012-11/msg02697.html > but it was not merged. > > > > > > > > Overview: > > > > > > Dimm device layout is modeled with a normal qemu device: > > > > > > "-device dimm,id=name,size=sz,node=pxm,populated=on|off,bus=membus.0" > > > > > > > > How does this will handle the no-hotplugable memory for example the memory > > passed in '-m' parameter? > > The non-hotpluggable initial memory (-m) is currently not modelled at all as a > DimmDevice. We may want to model it though. > > thanks, > - Vasilis >

2 1

[PATCH please reply] make acpi bits GPLv2 compatible
by Michael S. Tsirkin 26 Mar '13

26 Mar '13

You are getting this mail because you might have contributed code to one of the files in seabios that we want to reuse in QEMU, when this file was under GPLv3 or LGPLv3. QEMU is GPLv2 at the moment, so as a step in the process of moving acpi tables to qemu, we need to make sure the code we'll be moving is GPLv2 compatible. The code was originally LGPLv2 in bochs so these bits are OK. QEMU generally prefers GPLv2 or later, so this is what this patch does. The plan is therefore: - collect acks from everyone - copy code to QEMU and apply this patch to QEMU copy only If you allow the use of your contribution in QEMU under the terms of GPLv2 or later as proposed by this patch, please respond to this mail including the line: Acked-by: Name <email address> in the message body. For example: Acked-by: Michael S. Tsirkin <mst(a)redhat.com> Thanks! Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> diff --git a/src/acpi-dsdt-cpu-hotplug.dsl b/src/acpi-dsdt-cpu-hotplug.dsl index 0f3e83b..c96ac42 100644 --- a/src/acpi-dsdt-cpu-hotplug.dsl +++ b/src/acpi-dsdt-cpu-hotplug.dsl @@ -1,3 +1,18 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + /**************************************************************** * CPU hotplug ****************************************************************/ diff --git a/src/acpi-dsdt-dbug.dsl b/src/acpi-dsdt-dbug.dsl index 276321f..86230f7 100644 --- a/src/acpi-dsdt-dbug.dsl +++ b/src/acpi-dsdt-dbug.dsl @@ -1,3 +1,18 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + /**************************************************************** * Debugging ****************************************************************/ diff --git a/src/acpi-dsdt-hpet.dsl b/src/acpi-dsdt-hpet.dsl index f33e527..dfde174 100644 --- a/src/acpi-dsdt-hpet.dsl +++ b/src/acpi-dsdt-hpet.dsl @@ -1,3 +1,18 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + /**************************************************************** * HPET ****************************************************************/ diff --git a/src/acpi-dsdt-isa.dsl b/src/acpi-dsdt-isa.dsl index 23761db..89caa16 100644 --- a/src/acpi-dsdt-isa.dsl +++ b/src/acpi-dsdt-isa.dsl @@ -1,3 +1,18 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + /* Common legacy ISA style devices. */ Scope(\_SB.PCI0.ISA) { diff --git a/src/acpi-dsdt-pci-crs.dsl b/src/acpi-dsdt-pci-crs.dsl index d421891..b375a19 100644 --- a/src/acpi-dsdt-pci-crs.dsl +++ b/src/acpi-dsdt-pci-crs.dsl @@ -1,3 +1,18 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + /* PCI CRS (current resources) definition. */ Scope(\_SB.PCI0) { diff --git a/src/acpi.c b/src/acpi.c index 88abc09..4ed5b11 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -3,7 +3,19 @@ // Copyright (C) 2008-2010 Kevin O'Connor <kevin(a)koconnor.net> // Copyright (C) 2006 Fabrice Bellard // -// This file may be distributed under the terms of the GNU LGPLv3 license. +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this program; if not, see <http://www.gnu.org/licenses/>. + #include "acpi.h" // struct rsdp_descriptor #include "util.h" // memcpy diff --git a/src/acpi.h b/src/acpi.h index 7fbd082..9c2d849 100644 --- a/src/acpi.h +++ b/src/acpi.h @@ -1,3 +1,17 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ #ifndef __ACPI_H #define __ACPI_H diff --git a/src/ssdt-misc.dsl b/src/ssdt-misc.dsl index 679422b..ac11e96 100644 --- a/src/ssdt-misc.dsl +++ b/src/ssdt-misc.dsl @@ -1,3 +1,18 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + ACPI_EXTRACT_ALL_CODE ssdp_misc_aml DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1) diff --git a/src/ssdt-pcihp.dsl b/src/ssdt-pcihp.dsl index 67e485f..d29a5b9 100644 --- a/src/ssdt-pcihp.dsl +++ b/src/ssdt-pcihp.dsl @@ -1,3 +1,18 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + ACPI_EXTRACT_ALL_CODE ssdp_pcihp_aml DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPCIHP", 0x1) diff --git a/src/ssdt-proc.dsl b/src/ssdt-proc.dsl index 407d61e..58333c7 100644 --- a/src/ssdt-proc.dsl +++ b/src/ssdt-proc.dsl @@ -1,3 +1,18 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + /* This file is the basis for the ssdt table generated in src/acpi.c. * It defines the contents of the per-cpu Processor() object. At * runtime, a dynamically generated SSDT will contain one copy of this diff --git a/tools/acpi_extract.py b/tools/acpi_extract.py index ab8ced6..fbedc6b 100755 --- a/tools/acpi_extract.py +++ b/tools/acpi_extract.py @@ -1,7 +1,18 @@ #!/usr/bin/python # Copyright (C) 2011 Red Hat, Inc., Michael S. Tsirkin <mst(a)redhat.com> # -# This file may be distributed under the terms of the GNU GPLv3 license. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, see <http://www.gnu.org/licenses/>. # Process mixed ASL/AML listing (.lst file) produced by iasl -l # Locate and execute ACPI_EXTRACT directives, output offset info diff --git a/tools/acpi_extract_preprocess.py b/tools/acpi_extract_preprocess.py index 4ae364e..c986160 100755 --- a/tools/acpi_extract_preprocess.py +++ b/tools/acpi_extract_preprocess.py @@ -1,7 +1,18 @@ #!/usr/bin/python # Copyright (C) 2011 Red Hat, Inc., Michael S. Tsirkin <mst(a)redhat.com> # -# This file may be distributed under the terms of the GNU GPLv3 license. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, see <http://www.gnu.org/licenses/>. # Read a preprocessed ASL listing and put each ACPI_EXTRACT # directive in a comment, to make iasl skip it.

15 15

[PATCH v15 2/2] patch dsdt to use passed-in pvpanic ioport
by Hu Tao 26 Mar '13

26 Mar '13

Signed-off-by: Hu Tao <hutao(a)cn.fujitsu.com> --- src/acpi-dsdt-isa.dsl | 14 ++++++++++++-- src/acpi.c | 9 +++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/acpi-dsdt-isa.dsl b/src/acpi-dsdt-isa.dsl index 87a31b9..43fe719 100644 --- a/src/acpi-dsdt-isa.dsl +++ b/src/acpi-dsdt-isa.dsl @@ -102,7 +102,9 @@ Scope(\_SB.PCI0.ISA) { Device(PEVT) { Name(_HID, "QEMU0001") - OperationRegion(PEOR, SystemIO, 0x0505, 0x01) + ACPI_EXTRACT_NAME_WORD_CONST dsdt_isa_pest + Name(PEST, 0x505) + OperationRegion(PEOR, SystemIO, PEST, 0x01) Field(PEOR, ByteAcc, NoLock, Preserve) { PEPT, 8, } @@ -126,7 +128,15 @@ Scope(\_SB.PCI0.ISA) { } Name(_CRS, ResourceTemplate() { - IO(Decode16, 0x0505, 0x0505, 0x01, 0x01) + IO(Decode16, 0x0505, 0x0505, 0x01, 0x01, IO) }) + + CreateWordField(_CRS, IO._MIN, IOMN) + CreateWordField(_CRS, IO._MAX, IOMX) + + Method(_INI, 0, NotSerialized) { + Store(PEST, IOMN) + Store(PEST, IOMX) + } } } diff --git a/src/acpi.c b/src/acpi.c index 119d1c1..42fa06e 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -286,11 +286,20 @@ static const struct pci_device_id fadt_init_tbl[] = { PCI_DEVICE_END }; +static void patch_dsdt(void *dsdt) +{ + u8 *dsdt_ptr = dsdt; + int pvpanic_port = romfile_loadint("etc/pvpanic-port", 0x505); + + *(u16 *)(dsdt_ptr + *dsdt_isa_pest) = pvpanic_port; +} + static void fill_dsdt(struct fadt_descriptor_rev1 *fadt, void *dsdt) { if (fadt->dsdt) { free((void *)le32_to_cpu(fadt->dsdt)); } + patch_dsdt(dsdt); fadt->dsdt = cpu_to_le32((u32)dsdt); fadt->checksum -= checksum(fadt, sizeof(*fadt)); dprintf(1, "ACPI DSDT=%p\n", dsdt); -- 1.8.1.4

5 14

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS March 2013