diff options
| author | niruiyu <niruiyu@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-12-14 07:17:55 +0000 |
|---|---|---|
| committer | niruiyu <niruiyu@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-12-14 07:17:55 +0000 |
| commit | 3a0e054598963d0dedcda04612fe759513e8f75c (patch) | |
| tree | 8fb25e8c70ec88726f8599e06c93a4ddc32603b5 /IntelFrameworkModulePkg | |
| parent | 204df563fef4b3e9cd95502821f78e685f7dbef7 (diff) | |
| download | edk2-platforms-3a0e054598963d0dedcda04612fe759513e8f75c.tar.xz | |
Fix the IsaIo driver to not create ISA resource item when the ACPI resource returned from EFI_SIO_PROTOCOL::GetResources() is 0.
This could avoid creating the ISA resource item with StartRange = 0 and EndRange = 0xffffffff when the ACPI resource Base and Len both are 0 because we set StartRange = Base and EndRange = Base + End - 1.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11164 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'IntelFrameworkModulePkg')
| -rw-r--r-- | IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.c | 56 |
1 files changed, 32 insertions, 24 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.c b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.c index 9058d7849e..ab2a9a5f92 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.c @@ -327,24 +327,28 @@ AcpiResourceToIsaResource ( case ACPI_IO_PORT_DESCRIPTOR:
Io = (EFI_ACPI_IO_PORT_DESCRIPTOR *) AcpiResource.SmallHeader;
- if (IsaResource != NULL) {
- IsaResource[Count].Type = EfiIsaAcpiResourceIo;
- IsaResource[Count].Attribute = IsaIoAttribute (Io->Information);
- IsaResource[Count].StartRange = Io->BaseAddressMin;
- IsaResource[Count].EndRange = Io->BaseAddressMin + Io->Length - 1;
+ if (Io->Length != 0) {
+ if (IsaResource != NULL) {
+ IsaResource[Count].Type = EfiIsaAcpiResourceIo;
+ IsaResource[Count].Attribute = IsaIoAttribute (Io->Information);
+ IsaResource[Count].StartRange = Io->BaseAddressMin;
+ IsaResource[Count].EndRange = Io->BaseAddressMin + Io->Length - 1;
+ }
+ Count ++;
}
- Count ++;
break;
case ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR:
FixedIo = (EFI_ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR *) AcpiResource.SmallHeader;
- if (IsaResource != NULL) {
- IsaResource[Count].Type = EfiIsaAcpiResourceIo;
- IsaResource[Count].Attribute = EFI_ISA_ACPI_IO_DECODE_10_BITS;
- IsaResource[Count].StartRange = FixedIo->BaseAddress;
- IsaResource[Count].EndRange = FixedIo->BaseAddress + FixedIo->Length - 1;
+ if (FixedIo->Length != 0) {
+ if (IsaResource != NULL) {
+ IsaResource[Count].Type = EfiIsaAcpiResourceIo;
+ IsaResource[Count].Attribute = EFI_ISA_ACPI_IO_DECODE_10_BITS;
+ IsaResource[Count].StartRange = FixedIo->BaseAddress;
+ IsaResource[Count].EndRange = FixedIo->BaseAddress + FixedIo->Length - 1;
+ }
+ Count ++;
}
- Count ++;
break;
case ACPI_IRQ_DESCRIPTOR:
@@ -377,24 +381,28 @@ AcpiResourceToIsaResource ( case ACPI_32_BIT_MEMORY_RANGE_DESCRIPTOR:
Memory = (EFI_ACPI_32_BIT_MEMORY_RANGE_DESCRIPTOR *) AcpiResource.LargeHeader;
- if (IsaResource != NULL) {
- IsaResource[Count].Type = EfiIsaAcpiResourceMemory;
- IsaResource[Count].Attribute = IsaMemoryAttribute (Memory->Information);
- IsaResource[Count].StartRange = Memory->BaseAddressMin;
- IsaResource[Count].EndRange = Memory->BaseAddressMin + Memory->Length - 1;
+ if (Memory->Length != 0) {
+ if (IsaResource != NULL) {
+ IsaResource[Count].Type = EfiIsaAcpiResourceMemory;
+ IsaResource[Count].Attribute = IsaMemoryAttribute (Memory->Information);
+ IsaResource[Count].StartRange = Memory->BaseAddressMin;
+ IsaResource[Count].EndRange = Memory->BaseAddressMin + Memory->Length - 1;
+ }
+ Count ++;
}
- Count ++;
break;
case ACPI_32_BIT_FIXED_MEMORY_RANGE_DESCRIPTOR:
FixedMemory = (EFI_ACPI_32_BIT_FIXED_MEMORY_RANGE_DESCRIPTOR *) AcpiResource.LargeHeader;
- if (IsaResource != NULL) {
- IsaResource[Count].Type = EfiIsaAcpiResourceMemory;
- IsaResource[Count].Attribute = IsaMemoryAttribute (FixedMemory->Information);
- IsaResource[Count].StartRange = FixedMemory->BaseAddress;
- IsaResource[Count].EndRange = FixedMemory->BaseAddress + FixedMemory->Length - 1;
+ if (FixedMemory->Length != 0) {
+ if (IsaResource != NULL) {
+ IsaResource[Count].Type = EfiIsaAcpiResourceMemory;
+ IsaResource[Count].Attribute = IsaMemoryAttribute (FixedMemory->Information);
+ IsaResource[Count].StartRange = FixedMemory->BaseAddress;
+ IsaResource[Count].EndRange = FixedMemory->BaseAddress + FixedMemory->Length - 1;
+ }
+ Count ++;
}
- Count ++;
break;
case ACPI_END_TAG_DESCRIPTOR:
|