GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AMD Agesa macro expansion fix 

This change fixes the use of a macro that was
previously modified to fix a warning.  The macro
was used in a manner that doubly incremented a
pointer.  The pointer increment was removed from
the macro call and moved elsewhere.  In addition,
an unused macro was removed from both Family 12
and Family 14 code.

Change-Id: I577794bbc55d18f21170dda1d0bbdc6d776ce392
Signed-off-by: Frank Vibrans <frank.vibrans@amd.com>
Signed-off-by: efdesign98 <efdesign98@gmail.com>
Reviewed-on: http://review.coreboot.org/217
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
efdesign98 2011-09-14 19:34:13 -06:00 committed by Patrick Georgi
parent 3c59158810
commit 4d2d5d5b3e
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/vendorcode/amd/agesa/f12/Proc/GNB/Common/GnbPcie.h
View File

@ -74,9 +74,6 @@
//#define PCIE_LINK_GPIO_RESET_ASSERT_TIME (2 * 1000) //#define PCIE_LINK_GPIO_RESET_ASSERT_TIME (2 * 1000)
//#define PCIE_LINK_RESET_TO_TRAINING_TIME (2 * 1000) //#define PCIE_LINK_RESET_TO_TRAINING_TIME (2 * 1000)
#define IS_LAST_DESCRIPTOR(Descriptor) (Descriptor != NULL ? ((Descriptor->Header.DescriptorFlags & DESCRIPTOR_TERMINATE_LIST) == 0) : (1==1))
#define IS_VALID_DESCRIPTOR(Descriptor) (Descriptor != NULL ? ((Descriptor->Header.DescriptorFlags & DESCRIPTOR_ALLOCATED) != 0) : (1==0))
// Get lowest PHY lane on engine // Get lowest PHY lane on engine
#define PcieLibGetLoPhyLane(Engine) (Engine != NULL ? ((Engine->EngineData.StartLane > Engine->EngineData.EndLane) ? Engine->EngineData.EndLane : Engine->EngineData.StartLane) : 0xFF) #define PcieLibGetLoPhyLane(Engine) (Engine != NULL ? ((Engine->EngineData.StartLane > Engine->EngineData.EndLane) ? Engine->EngineData.EndLane : Engine->EngineData.StartLane) : 0xFF)
// Get highest PHY lane on engine // Get highest PHY lane on engine

3
src/vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbPcie.h
View File

@ -66,8 +66,7 @@
#define UNUSED_LANE_ID 128 #define UNUSED_LANE_ID 128
#define IS_LAST_DESCRIPTOR(Descriptor) (Descriptor != NULL ? ((Descriptor->Flags & DESCRIPTOR_TERMINATE_LIST) == 0) : (1==1)) #define IS_LAST_DESCRIPTOR(Descriptor) (Descriptor != NULL ? ((Descriptor->Flags & DESCRIPTOR_TERMINATE_LIST) == 0) : (1==0))
#define IS_VALID_DESCRIPTOR(Descriptor) (Descriptor != NULL ? ((Descriptor->Flags & DESCRIPTOR_ALLOCATED) != 0) : (1==0))
// Get lowest PHY lane on engine // Get lowest PHY lane on engine
#define PcieLibGetLoPhyLane(Engine) (Engine != NULL ? ((Engine->EngineData.StartLane > Engine->EngineData.EndLane) ? Engine->EngineData.EndLane : Engine->EngineData.StartLane) : 0xFF) #define PcieLibGetLoPhyLane(Engine) (Engine != NULL ? ((Engine->EngineData.StartLane > Engine->EngineData.EndLane) ? Engine->EngineData.EndLane : Engine->EngineData.StartLane) : 0xFF)

6
src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieWrapperServices.c
View File

@ -263,12 +263,13 @@ PcieOnConfigureGppEnginesLaneAllocation (
CoreLaneIndex = 0; CoreLaneIndex = 0;
PortIdIndex = 0; PortIdIndex = 0;
do { do {
if (PortIdIndex > 0) EnginesList++;
EnginesList->Flags &= ~DESCRIPTOR_ALLOCATED; EnginesList->Flags &= ~DESCRIPTOR_ALLOCATED;
EnginesList->Type.Port.PortId = GppPortIdConfigurationTable [ConfigurationId][PortIdIndex++]; EnginesList->Type.Port.PortId = GppPortIdConfigurationTable [ConfigurationId][PortIdIndex++];
EnginesList->Type.Port.StartCoreLane = GppLaneConfigurationTable [ConfigurationId][CoreLaneIndex++]; EnginesList->Type.Port.StartCoreLane = GppLaneConfigurationTable [ConfigurationId][CoreLaneIndex++];
EnginesList->Type.Port.EndCoreLane = GppLaneConfigurationTable [ConfigurationId][CoreLaneIndex++]; EnginesList->Type.Port.EndCoreLane = GppLaneConfigurationTable [ConfigurationId][CoreLaneIndex++];
} while (IS_LAST_DESCRIPTOR (EnginesList++)); } while (IS_LAST_DESCRIPTOR (EnginesList));
return AGESA_SUCCESS; return AGESA_SUCCESS;
} }
@ -305,12 +306,13 @@ PcieOnConfigureDdiEnginesLaneAllocation (
} }
LaneIndex = 0; LaneIndex = 0;
do { do {
if (LaneIndex > 0) EnginesList++;
EnginesList->Flags &= ~DESCRIPTOR_ALLOCATED; EnginesList->Flags &= ~DESCRIPTOR_ALLOCATED;
EnginesList->EngineData.StartLane = DdiLaneConfigurationTable [ConfigurationId][LaneIndex++] + EnginesList->EngineData.StartLane = DdiLaneConfigurationTable [ConfigurationId][LaneIndex++] +
Wrapper->StartPhyLane; Wrapper->StartPhyLane;
EnginesList->EngineData.EndLane = DdiLaneConfigurationTable [ConfigurationId][LaneIndex++] + EnginesList->EngineData.EndLane = DdiLaneConfigurationTable [ConfigurationId][LaneIndex++] +
Wrapper->StartPhyLane; Wrapper->StartPhyLane;
} while (IS_LAST_DESCRIPTOR (EnginesList++)); } while (IS_LAST_DESCRIPTOR (EnginesList));
return AGESA_SUCCESS; return AGESA_SUCCESS;
} }