Context Navigation

← Previous Changeset
Next Changeset →

Changeset 3425

Timestamp:

07/17/08 21:50:37 (3 months ago)

Author:

mjones

Message:

Clean up AMD FAM10 HT variable initialization. The structure init is cleaner, avoid compiler warnings, and matches the AMD example code more closely.

Signed-off-by: Marc Jones <marc.jones@…>

Acked-by: Peter Stuge <peter@…>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>

Location:

trunk/coreboot-v2/src/northbridge/amd/amdht

Files:

: 2 modified

h3finit.c (modified) (17 diffs)
h3ncmn.c (modified) (6 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/coreboot-v2/src/northbridge/amd/amdht/h3finit.c

r3423	r3425
113	113
114	114	/*----------------------------------------------------------------------------------------
115		* ~~int~~
	115	* u8
116	116	* graphHowManyNodes(u8 *graph)
117	117	*
…	…
124	124	* ---------------------------------------------------------------------------------------
125	125	*/
126		~~int~~ graphHowManyNodes(u8 *graph)
	126	u8 graphHowManyNodes(u8 *graph)
127	127	{
128	128	return graph[0];
…	…
199	199	u8 graphGetReq(u8 *graph, u8 nodeA, u8 nodeB)
200	200	{
201		~~int~~ size = graph[0];
	201	u8 size = graph[0];
202	202	ASSERT(size <= MAX_NODES);
203	203	ASSERT((nodeA < size) && (nodeB < size));
…	…
207	207	/*----------------------------------------------------------------------------------------
208	208	* u8
209		* graphGetBc(u~~nsigned char *graph, int nodeA, int~~ nodeB)
	209	* graphGetBc(u8 *graph, u8 nodeA, u8 nodeB)
210	210	*
211	211	* Description:
…	…
220	220	* ---------------------------------------------------------------------------------------
221	221	*/
222		u8 graphGetBc(u~~nsigned char *graph, int nodeA, int~~ nodeB)
223		{
224		~~int~~ size = graph[0];
	222	u8 graphGetBc(u8 *graph, u8 nodeA, u8 nodeB)
	223	{
	224	u8 size = graph[0];
225	225	ASSERT(size <= MAX_NODES);
226	226	ASSERT((nodeA < size) && (nodeB < size));
…	…
416	416	if (pDat->HtBlock->AMD_CB_EventNotify)
417	417	{
418		sHtEventCohFamilyFeud evt = {sizeof(sHtEventCohFamilyFeud),
419		currentNode,
420		currentLink,
421		pDat->NodesDiscovered};
	418	sHtEventCohFamilyFeud evt;
	419	evt.eSize = sizeof(sHtEventCohFamilyFeud);
	420	evt.node = currentNode;
	421	evt.link = currentLink;
	422	evt.totalNodes = pDat->NodesDiscovered;
422	423
423	424	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_ERROR,
…	…
471	472	if (pDat->HtBlock->AMD_CB_EventNotify)
472	473	{
473		sHtEventCohMpCapMismatch evt = {sizeof(sHtEventCohMpCapMismatch),
474		currentNode,
475		currentLink,
476		pDat->sysMpCap,
477		pDat->NodesDiscovered};
	474	sHtEventCohMpCapMismatch evt;
	475	evt.eSize = sizeof(sHtEventCohMpCapMismatch);
	476	evt.node = currentNode;
	477	evt.link = currentLink;
	478	evt.sysMpCap = pDat->sysMpCap;
	479	evt.totalNodes = pDat->NodesDiscovered;
478	480
479	481	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_ERROR,
…	…
503	505	if (pDat->HtBlock->AMD_CB_EventNotify)
504	506	{
505		sHtEventCohNodeDiscovered evt = {sizeof(sHtEventCohNodeDiscovered),
506		currentNode,
507		currentLink,
508		token};
	507	sHtEventCohNodeDiscovered evt;
	508	evt.eSize = sizeof(sHtEventCohNodeDiscovered);
	509	evt.node = currentNode;
	510	evt.link = currentLink;
	511	evt.newNode = token;
509	512
510	513	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_INFO,
…	…
528	531	if (pDat->HtBlock->AMD_CB_EventNotify)
529	532	{
530		sHtEventCohLinkExceed evt = {sizeof(sHtEventCohLinkExceed),
531		currentNode,
532		currentLink,
533		token,
534		pDat->NodesDiscovered,
535		pDat->nb->maxLinks};
	533	sHtEventCohLinkExceed evt;
	534	evt.eSize = sizeof(sHtEventCohLinkExceed);
	535	evt.node = currentNode;
	536	evt.link = currentLink;
	537	evt.targetNode = token;
	538	evt.totalNodes = pDat->NodesDiscovered;
	539	evt.maxLinks = pDat->nb->maxLinks;
536	540
537	541	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_ERROR,
…	…
777	781	if (pDat->HtBlock->AMD_CB_EventNotify)
778	782	{
779		sHtEventCohNoTopology evt = {sizeof(sHtEventCohNoTopology),
780		pDat->NodesDiscovered};
	783	sHtEventCohNoTopology evt;
	784	evt.eSize = sizeof(sHtEventCohNoTopology);
	785	evt.totalNodes = pDat->NodesDiscovered;
781	786
782	787	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_ERROR,
…	…
841	846	void coherentInit(sMainData *pDat)
842	847	{
843		~~int~~ i, j;
	848	u8 i, j;
844	849
845	850	#ifdef HT_BUILD_NC_ONLY
…	…
913	918	if (pDat->HtBlock->AMD_CB_EventNotify)
914	919	{
915		sHTEventNcohBusMaxExceed evt = {sizeof(sHTEventNcohBusMaxExceed), node, link, pDat->AutoBusCurrent};
	920	sHTEventNcohBusMaxExceed evt;
	921	evt.eSize = sizeof(sHTEventNcohBusMaxExceed);
	922	evt.node = node;
	923	evt.link = link;
	924	evt.bus = pDat->AutoBusCurrent;
916	925
917	926	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_ERROR,HT_EVENT_NCOH_BUS_MAX_EXCEED,(u8 *)&evt);
…	…
928	937	if (pDat->HtBlock->AMD_CB_EventNotify)
929	938	{
930		sHtEventNcohCfgMapExceed evt = {sizeof(sHtEventNcohCfgMapExceed), node, link};
	939	sHtEventNcohCfgMapExceed evt;
	940	evt.eSize = sizeof(sHtEventNcohCfgMapExceed);
	941	evt.node = node;
	942	evt.link = link;
931	943
932	944	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_ERROR,
…	…
1050	1062	if (pDat->HtBlock->AMD_CB_EventNotify)
1051	1063	{
1052		sHtEventNcohLinkExceed evt = {sizeof(sHtEventNcohLinkExceed),
1053		node,
1054		link,
1055		depth,
1056		pDat->nb->maxLinks};
	1064	sHtEventNcohLinkExceed evt;
	1065	evt.eSize = sizeof(sHtEventNcohLinkExceed);
	1066	evt.node = node;
	1067	evt.link = link;
	1068	evt.depth = depth;
	1069	evt.maxLinks = pDat->nb->maxLinks;
1057	1070
1058	1071	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_ERROR,
…	…
1098	1111	if (pDat->HtBlock->AMD_CB_EventNotify)
1099	1112	{
1100		sHtEventNcohBuidExceed evt = {sizeof(sHtEventNcohBuidExceed),
1101		node, link, depth, (u8)currentBUID, (u8)unitIDcnt};
	1113	sHtEventNcohBuidExceed evt;
	1114	evt.eSize = sizeof(sHtEventNcohBuidExceed);
	1115	evt.node = node;
	1116	evt.link = link;
	1117	evt.depth = depth;
	1118	evt.currentBUID = (uint8)currentBUID;
	1119	evt.unitCount = (uint8)unitIDcnt;
1102	1120
1103	1121	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_ERROR,HT_EVENT_NCOH_BUID_EXCEED,(u8 *)&evt);
…	…
1116	1134	if (pDat->HtBlock->AMD_CB_EventNotify)
1117	1135	{
1118		sHtEventNcohDeviceFailed evt = {sizeof(sHtEventNcohDeviceFailed),
1119		node, link, depth, (u8)currentBUID};
	1136	sHtEventNcohDeviceFailed evt;
	1137	evt.eSize = sizeof(sHtEventNcohDeviceFailed);
	1138	evt.node = node;
	1139	evt.link = link;
	1140	evt.depth = depth;
	1141	evt.attemptedBUID = (uint8)currentBUID;
1120	1142
1121	1143	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_ERROR,HT_EVENT_NCOH_DEVICE_FAILED,(u8 *)&evt);
…	…
1139	1161	{
1140	1162	/* Provide information on automatic device results */
1141		sHtEventNcohAutoDepth evt = {sizeof(sHtEventNcohAutoDepth), node, link, (depth - 1)};
	1163	sHtEventNcohAutoDepth evt;
	1164	evt.eSize = sizeof(sHtEventNcohAutoDepth);
	1165	evt.node = node;
	1166	evt.link = link;
	1167	evt.depth = (depth - 1);
1142	1168
1143	1169	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_INFO,HT_EVENT_NCOH_AUTO_DEPTH,(u8 *)&evt);

trunk/coreboot-v2/src/northbridge/amd/amdht/h3ncmn.c

r3423	r3425
402	402	{
403	403	/* Pass the node and link on which the generic synch flood event occurred. */
404		sHtEventHWHtCrc evt = {sizeof(sHtEventHWHtCrc), node, link, (u8)crc};
	404	sHtEventHWHtCrc evt;
	405	evt.eSize = sizeof(sHtEventHWHtCrc);
	406	evt.node = node;
	407	evt.link = link;
	408	evt.laneMask = (uint8)crc;
405	409
406	410	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_HW_FAULT,
…	…
415	419	{
416	420	/* Pass the node and link on which the generic synch flood event occurred. */
417		sHtEventHWSynchFlood evt = {sizeof(sHtEventHWSynchFlood), node, link};
	421	sHtEventHWSynchFlood evt;
	422	evt.eSize = sizeof(sHtEventHWSynchFlood);
	423	evt.node = node;
	424	evt.link = link;
418	425
419	426	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_HW_FAULT,
…	…
1113	1120	}
1114	1121	STOP_HERE; /* This is an error internal condition */
1115
1116		~~return 0xFF; // make the compiler happy.~~
1117	1122	}
1118	1123
…	…
1144	1149	}
1145	1150	STOP_HERE; /* This is an internal error condition */
1146
1147		~~return 0xFF; // make the compiler happy.~~
1148	1151	}
1149	1152
…	…
1469	1472	if (pDat->HtBlock->AMD_CB_EventNotify)
1470	1473	{
1471		sHtEventOptRequiredCap evt ={sizeof(sHtEventOptRequiredCap),
1472		pDat->PortList[i].NodeID,
1473		pDat->PortList[i].HostLink,
1474		pDat->PortList[i].HostDepth};
	1474	sHtEventOptRequiredCap evt;
	1475	evt.eSize = sizeof(sHtEventOptRequiredCap);
	1476	evt.node = pDat->PortList[i].NodeID;
	1477	evt.link = pDat->PortList[i].HostLink;
	1478	evt.depth = pDat->PortList[i].HostDepth;
1475	1479
1476	1480	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_WARNING,
…	…
1514	1518	if (pDat->HtBlock->AMD_CB_EventNotify)
1515	1519	{
1516		sHtEventOptRequiredCap evt ={sizeof(sHtEventOptRequiredCap),
1517		pDat->PortList[i].NodeID,
1518		pDat->PortList[i].HostLink,
1519		pDat->PortList[i].HostDepth};
	1520	sHtEventOptRequiredCap evt;
	1521	evt.eSize = sizeof(sHtEventOptRequiredCap);
	1522	evt.node = pDat->PortList[i].NodeID;
	1523	evt.link = pDat->PortList[i].HostLink;
	1524	evt.depth = pDat->PortList[i].HostDepth;
1520	1525
1521	1526	pDat->HtBlock->AMD_CB_EventNotify(HT_EVENT_CLASS_WARNING,

Context Navigation

Changeset 3425

Legend:

trunk/coreboot-v2/src/northbridge/amd/amdht/h3finit.c

trunk/coreboot-v2/src/northbridge/amd/amdht/h3ncmn.c

Download in other formats: