X86: Create SimObjects in python and C++ to represent the ACPI system description tables.
This commit is contained in:
Gabe Black
@@ -57,6 +57,7 @@ from m5.params import *
|
||||
from E820 import X86E820Table, X86E820Entry
|
||||
from SMBios import X86SMBiosSMBiosTable
|
||||
from IntelMP import X86IntelMPFloatingPointer, X86IntelMPConfigTable
|
||||
from ACPI import X86ACPIRSDP
|
||||
from System import System
|
||||
|
||||
class X86System(System):
|
||||
@@ -69,6 +70,8 @@ class X86System(System):
|
||||
intel_mp_table = Param.X86IntelMPConfigTable(
|
||||
X86IntelMPConfigTable(),
|
||||
'intel mp spec configuration table')
|
||||
acpi_description_table_pointer = Param.X86ACPIRSDP(
|
||||
X86ACPIRSDP(), 'ACPI root description pointer structure')
|
||||
|
||||
class LinuxX86System(X86System):
|
||||
type = 'LinuxX86System'
|
||||
|
||||
99
src/arch/x86/bios/ACPI.py
Normal file
99
src/arch/x86/bios/ACPI.py
Normal file
@@ -0,0 +1,99 @@
|
||||
# Copyright (c) 2008 The Hewlett-Packard Development Company
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this software in source and binary forms,
|
||||
# with or without modification, are permitted provided that the
|
||||
# following conditions are met:
|
||||
#
|
||||
# The software must be used only for Non-Commercial Use which means any
|
||||
# use which is NOT directed to receiving any direct monetary
|
||||
# compensation for, or commercial advantage from such use. Illustrative
|
||||
# examples of non-commercial use are academic research, personal study,
|
||||
# teaching, education and corporate research & development.
|
||||
# Illustrative examples of commercial use are distributing products for
|
||||
# commercial advantage and providing services using the software for
|
||||
# commercial advantage.
|
||||
#
|
||||
# If you wish to use this software or functionality therein that may be
|
||||
# covered by patents for commercial use, please contact:
|
||||
# Director of Intellectual Property Licensing
|
||||
# Office of Strategy and Technology
|
||||
# Hewlett-Packard Company
|
||||
# 1501 Page Mill Road
|
||||
# Palo Alto, California 94304
|
||||
#
|
||||
# Redistributions of source code must retain the above copyright notice,
|
||||
# this list of conditions and the following disclaimer. Redistributions
|
||||
# in binary form must reproduce the above copyright notice, this list of
|
||||
# conditions and the following disclaimer in the documentation and/or
|
||||
# other materials provided with the distribution. Neither the name of
|
||||
# the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
|
||||
# contributors may be used to endorse or promote products derived from
|
||||
# this software without specific prior written permission. No right of
|
||||
# sublicense is granted herewith. Derivatives of the software and
|
||||
# output created using the software may be prepared, but only for
|
||||
# Non-Commercial Uses. Derivatives of the software may be shared with
|
||||
# others provided: (i) the others agree to abide by the list of
|
||||
# conditions herein which includes the Non-Commercial Use restrictions;
|
||||
# and (ii) such Derivatives of the software include the above copyright
|
||||
# notice to acknowledge the contribution from this software where
|
||||
# applicable, this list of conditions and the disclaimer below.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
# Authors: Gabe Black
|
||||
|
||||
from m5.params import *
|
||||
from m5.SimObject import SimObject
|
||||
|
||||
# ACPI description table header. Subclasses contain and handle the actual
|
||||
# contents as appropriate for that type of table.
|
||||
class X86ACPISysDescTable(SimObject):
|
||||
type = 'X86ACPISysDescTable'
|
||||
cxx_class = 'X86ISA::ACPI::SysDescTable'
|
||||
abstract = True
|
||||
|
||||
oem_id = Param.String('', 'string identifying the oem')
|
||||
oem_table_id = Param.String('', 'oem table ID')
|
||||
oem_revision = Param.UInt32(0, 'oem revision number for the table')
|
||||
|
||||
creator_id = Param.String('',
|
||||
'string identifying the generator of the table')
|
||||
creator_revision = Param.UInt32(0,
|
||||
'revision number for the creator of the table')
|
||||
|
||||
class X86ACPIRSDT(X86ACPISysDescTable):
|
||||
type = 'X86ACPIRSDT'
|
||||
cxx_class = 'X86ISA::ACPI::RSDT'
|
||||
|
||||
entries = VectorParam.X86ACPISysDescTable([], 'system description tables')
|
||||
|
||||
class X86ACPIXSDT(X86ACPISysDescTable):
|
||||
type = 'X86ACPIXSDT'
|
||||
cxx_class = 'X86ISA::ACPI::XSDT'
|
||||
|
||||
entries = VectorParam.X86ACPISysDescTable([], 'system description tables')
|
||||
|
||||
# Root System Description Pointer Structure
|
||||
class X86ACPIRSDP(SimObject):
|
||||
type = 'X86ACPIRSDP'
|
||||
cxx_class = 'X86ISA::ACPI::RSDP'
|
||||
|
||||
oem_id = Param.String('', 'string identifying the oem')
|
||||
# Because 0 encodes ACPI 1.0, 2 encodes ACPI 3.0, the version implemented
|
||||
# here.
|
||||
revision = Param.UInt8(2, 'revision of ACPI being used, zero indexed')
|
||||
|
||||
rsdt = Param.X86ACPIRSDT('root system description table')
|
||||
xsdt = Param.X86ACPIXSDT(X86ACPIXSDT(),
|
||||
'extended system description table')
|
||||
@@ -71,3 +71,7 @@ if env['TARGET_ISA'] == 'x86':
|
||||
# Intel Multiprocessor Specification Configuration Table
|
||||
SimObject('IntelMP.py')
|
||||
Source('intelmp.cc')
|
||||
|
||||
# ACPI system description tables
|
||||
SimObject('ACPI.py')
|
||||
Source('acpi.cc')
|
||||
|
||||
109
src/arch/x86/bios/acpi.cc
Normal file
109
src/arch/x86/bios/acpi.cc
Normal file
@@ -0,0 +1,109 @@
|
||||
/*
|
||||
* Copyright (c) 2008 The Hewlett-Packard Development Company
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use of this software in source and binary forms,
|
||||
* with or without modification, are permitted provided that the
|
||||
* following conditions are met:
|
||||
*
|
||||
* The software must be used only for Non-Commercial Use which means any
|
||||
* use which is NOT directed to receiving any direct monetary
|
||||
* compensation for, or commercial advantage from such use. Illustrative
|
||||
* examples of non-commercial use are academic research, personal study,
|
||||
* teaching, education and corporate research & development.
|
||||
* Illustrative examples of commercial use are distributing products for
|
||||
* commercial advantage and providing services using the software for
|
||||
* commercial advantage.
|
||||
*
|
||||
* If you wish to use this software or functionality therein that may be
|
||||
* covered by patents for commercial use, please contact:
|
||||
* Director of Intellectual Property Licensing
|
||||
* Office of Strategy and Technology
|
||||
* Hewlett-Packard Company
|
||||
* 1501 Page Mill Road
|
||||
* Palo Alto, California 94304
|
||||
*
|
||||
* Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer. Redistributions
|
||||
* in binary form must reproduce the above copyright notice, this list of
|
||||
* conditions and the following disclaimer in the documentation and/or
|
||||
* other materials provided with the distribution. Neither the name of
|
||||
* the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
|
||||
* contributors may be used to endorse or promote products derived from
|
||||
* this software without specific prior written permission. No right of
|
||||
* sublicense is granted herewith. Derivatives of the software and
|
||||
* output created using the software may be prepared, but only for
|
||||
* Non-Commercial Uses. Derivatives of the software may be shared with
|
||||
* others provided: (i) the others agree to abide by the list of
|
||||
* conditions herein which includes the Non-Commercial Use restrictions;
|
||||
* and (ii) such Derivatives of the software include the above copyright
|
||||
* notice to acknowledge the contribution from this software where
|
||||
* applicable, this list of conditions and the disclaimer below.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* Authors: Gabe Black
|
||||
*/
|
||||
|
||||
#include "arch/x86/bios/acpi.hh"
|
||||
#include "mem/port.hh"
|
||||
#include "sim/byteswap.hh"
|
||||
#include "sim/sim_object.hh"
|
||||
|
||||
#include "params/X86ACPIRSDP.hh"
|
||||
|
||||
#include "params/X86ACPISysDescTable.hh"
|
||||
#include "params/X86ACPIRSDT.hh"
|
||||
#include "params/X86ACPIXSDT.hh"
|
||||
|
||||
using namespace std;
|
||||
|
||||
const char X86ISA::ACPI::RSDP::signature[] = "RSD PTR ";
|
||||
|
||||
X86ISA::ACPI::RSDP::RSDP(Params *p) : SimObject(p), oemID(p->oem_id),
|
||||
revision(p->revision), rsdt(p->rsdt), xsdt(p->xsdt)
|
||||
{}
|
||||
|
||||
X86ISA::ACPI::SysDescTable::SysDescTable(Params *p,
|
||||
const char * _signature, uint8_t _revision) : SimObject(p),
|
||||
signature(_signature), revision(_revision),
|
||||
oemID(p->oem_id), oemTableID(p->oem_table_id),
|
||||
oemRevision(p->oem_revision),
|
||||
creatorID(p->creator_id), creatorRevision(p->creator_revision)
|
||||
{}
|
||||
|
||||
X86ISA::ACPI::RSDT::RSDT(Params *p) :
|
||||
SysDescTable(p, "RSDT", 1), entries(p->entries)
|
||||
{}
|
||||
|
||||
X86ISA::ACPI::XSDT::XSDT(Params *p) :
|
||||
SysDescTable(p, "XSDT", 1), entries(p->entries)
|
||||
{}
|
||||
|
||||
X86ISA::ACPI::RSDP *
|
||||
X86ACPIRSDPParams::create()
|
||||
{
|
||||
return new X86ISA::ACPI::RSDP(this);
|
||||
}
|
||||
|
||||
X86ISA::ACPI::RSDT *
|
||||
X86ACPIRSDTParams::create()
|
||||
{
|
||||
return new X86ISA::ACPI::RSDT(this);
|
||||
}
|
||||
|
||||
X86ISA::ACPI::XSDT *
|
||||
X86ACPIXSDTParams::create()
|
||||
{
|
||||
return new X86ISA::ACPI::XSDT(this);
|
||||
}
|
||||
147
src/arch/x86/bios/acpi.hh
Normal file
147
src/arch/x86/bios/acpi.hh
Normal file
@@ -0,0 +1,147 @@
|
||||
/*
|
||||
* Copyright (c) 2008 The Hewlett-Packard Development Company
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use of this software in source and binary forms,
|
||||
* with or without modification, are permitted provided that the
|
||||
* following conditions are met:
|
||||
*
|
||||
* The software must be used only for Non-Commercial Use which means any
|
||||
* use which is NOT directed to receiving any direct monetary
|
||||
* compensation for, or commercial advantage from such use. Illustrative
|
||||
* examples of non-commercial use are academic research, personal study,
|
||||
* teaching, education and corporate research & development.
|
||||
* Illustrative examples of commercial use are distributing products for
|
||||
* commercial advantage and providing services using the software for
|
||||
* commercial advantage.
|
||||
*
|
||||
* If you wish to use this software or functionality therein that may be
|
||||
* covered by patents for commercial use, please contact:
|
||||
* Director of Intellectual Property Licensing
|
||||
* Office of Strategy and Technology
|
||||
* Hewlett-Packard Company
|
||||
* 1501 Page Mill Road
|
||||
* Palo Alto, California 94304
|
||||
*
|
||||
* Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer. Redistributions
|
||||
* in binary form must reproduce the above copyright notice, this list of
|
||||
* conditions and the following disclaimer in the documentation and/or
|
||||
* other materials provided with the distribution. Neither the name of
|
||||
* the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
|
||||
* contributors may be used to endorse or promote products derived from
|
||||
* this software without specific prior written permission. No right of
|
||||
* sublicense is granted herewith. Derivatives of the software and
|
||||
* output created using the software may be prepared, but only for
|
||||
* Non-Commercial Uses. Derivatives of the software may be shared with
|
||||
* others provided: (i) the others agree to abide by the list of
|
||||
* conditions herein which includes the Non-Commercial Use restrictions;
|
||||
* and (ii) such Derivatives of the software include the above copyright
|
||||
* notice to acknowledge the contribution from this software where
|
||||
* applicable, this list of conditions and the disclaimer below.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* Authors: Gabe Black
|
||||
*/
|
||||
|
||||
#ifndef __ARCH_X86_BIOS_ACPI_HH__
|
||||
#define __ARCH_X86_BIOS_ACPI_HH__
|
||||
|
||||
#include "sim/host.hh"
|
||||
#include "sim/sim_object.hh"
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
class Port;
|
||||
|
||||
class X86ACPIRSDPParams;
|
||||
|
||||
class X86ACPISysDescTableParams;
|
||||
class X86ACPIRSDTParams;
|
||||
class X86ACPIXSDTParams;
|
||||
|
||||
namespace X86ISA
|
||||
{
|
||||
|
||||
namespace ACPI
|
||||
{
|
||||
|
||||
class RSDT;
|
||||
class XSDT;
|
||||
class SysDescTable;
|
||||
|
||||
class RSDP : public SimObject
|
||||
{
|
||||
protected:
|
||||
typedef X86ACPIRSDPParams Params;
|
||||
|
||||
static const char signature[];
|
||||
|
||||
std::string oemID;
|
||||
uint8_t revision;
|
||||
|
||||
RSDT * rsdt;
|
||||
XSDT * xsdt;
|
||||
|
||||
public:
|
||||
RSDP(Params *p);
|
||||
};
|
||||
|
||||
class SysDescTable : public SimObject
|
||||
{
|
||||
protected:
|
||||
typedef X86ACPISysDescTableParams Params;
|
||||
|
||||
const char * signature;
|
||||
uint8_t revision;
|
||||
|
||||
std::string oemID;
|
||||
std::string oemTableID;
|
||||
uint32_t oemRevision;
|
||||
|
||||
std::string creatorID;
|
||||
uint32_t creatorRevision;
|
||||
|
||||
public:
|
||||
SysDescTable(Params *p, const char * _signature, uint8_t _revision);
|
||||
};
|
||||
|
||||
class RSDT : public SysDescTable
|
||||
{
|
||||
protected:
|
||||
typedef X86ACPIRSDTParams Params;
|
||||
|
||||
std::vector<SysDescTable *> entries;
|
||||
|
||||
public:
|
||||
RSDT(Params *p);
|
||||
};
|
||||
|
||||
class XSDT : public SysDescTable
|
||||
{
|
||||
protected:
|
||||
typedef X86ACPIXSDTParams Params;
|
||||
|
||||
std::vector<SysDescTable *> entries;
|
||||
|
||||
public:
|
||||
XSDT(Params *p);
|
||||
};
|
||||
|
||||
} // namespace ACPI
|
||||
|
||||
} // namespace X86ISA
|
||||
|
||||
#endif // __ARCH_X86_BIOS_E820_HH__
|
||||
@@ -77,7 +77,8 @@ using namespace X86ISA;
|
||||
X86System::X86System(Params *p) :
|
||||
System(p), smbiosTable(p->smbios_table),
|
||||
mpFloatingPointer(p->intel_mp_pointer),
|
||||
mpConfigTable(p->intel_mp_table)
|
||||
mpConfigTable(p->intel_mp_table),
|
||||
rsdp(p->acpi_description_table_pointer)
|
||||
{}
|
||||
|
||||
void
|
||||
|
||||
@@ -102,6 +102,7 @@ class X86System : public System
|
||||
X86ISA::SMBios::SMBiosTable * smbiosTable;
|
||||
X86ISA::IntelMP::FloatingPointer * mpFloatingPointer;
|
||||
X86ISA::IntelMP::ConfigTable * mpConfigTable;
|
||||
X86ISA::ACPI::RSDP * rsdp;
|
||||
|
||||
void writeOutSMBiosTable(Addr header,
|
||||
Addr &headerSize, Addr &tableSize, Addr table = 0);
|
||||
|
||||
Reference in New Issue
Block a user