Patchworkβ workaround for mahogany_fam10. Not a signed-off-by

login
register
about
Submitter Bao, Zheng
Date 2010-03-15 05:41:24
Message ID <DD1CC71B621B004FA76856E5129D6B170388AA40@sbjgexmb1.amd.com>
Download mbox | patch
Permalink /patch/1053/
State Rejected
Headers show

Comments

Bao, Zheng - 2010-03-15 05:41:24
This is for the mahogany_fam10 I just sent. It is not a signed-off-by
patch. We need to work it out about this problem.


 			{
@@ -1145,7 +1146,7 @@
 				STOP_HERE;
 				break;
 			}
-
+#endif
 			AmdPCIReadBits(currentPtr, 26, 26, &temp);
 			pDat->PortList[pDat->TotalLinks*2+1].Link =
(u8)temp;
 			pDat->PortList[pDat->TotalLinks*2+1].Pointer =
currentPtr;
@@ -1156,6 +1157,11 @@
 			depth++;
 			pDat->TotalLinks++;
 			currentBUID += unitIDcnt;
+#if CONFIG_HT_CHAIN_UNITID_BASE == 0
+			STOP_HERE;
+			break;
+#endif
+
 		}
 		if (pDat->HtBlock->AMD_CB_EventNotify)
 		{
Marc Jones - 2010-09-10 22:55:07
On Sun, Mar 14, 2010 at 11:41 PM, Bao, Zheng <Zheng.Bao@amd.com> wrote:
> This is for the mahogany_fam10 I just sent. It is not a signed-off-by
> patch. We need to work it out about this problem.
>
>
> Index: src/northbridge/amd/amdht/h3finit.c
> ===================================================================
> --- src/northbridge/amd/amdht/h3finit.c (revision 4521)
> +++ src/northbridge/amd/amdht/h3finit.c (working copy)
> @@ -1104,6 +1104,7 @@
>                                AmdPCIRead(currentPtr, &temp);
>                        } while (!IS_HT_SLAVE_CAPABILITY(temp));
>
> +#if (CONFIG_HT_CHAIN_UNITID_BASE != 0)
>                        AmdPCIReadBits(currentPtr, 25, 21, &unitIDcnt);
>                        if ((unitIDcnt + currentBUID > 31) || ((secBus
> == 0) && (unitIDcnt + currentBUID > 24)))
>                        {
> @@ -1145,7 +1146,7 @@
>                                STOP_HERE;
>                                break;
>                        }
> -
> +#endif
>                        AmdPCIReadBits(currentPtr, 26, 26, &temp);
>                        pDat->PortList[pDat->TotalLinks*2+1].Link =
> (u8)temp;
>                        pDat->PortList[pDat->TotalLinks*2+1].Pointer =
> currentPtr;
> @@ -1156,6 +1157,11 @@
>                        depth++;
>                        pDat->TotalLinks++;
>                        currentBUID += unitIDcnt;
> +#if CONFIG_HT_CHAIN_UNITID_BASE == 0
> +                       STOP_HERE;
> +                       break;
> +#endif
> +
>                }
>                if (pDat->HtBlock->AMD_CB_EventNotify)
>                {
>

Please give a better description to this fix when you check it in.

Acked-by: Marc Jones <marcj303@gmail.com>

Thanks,
Marc
Patrick Georgi - 2010-09-11 04:30:58
Am 11.09.2010 00:55, schrieb Marc Jones:
> Please give a better description to this fix when you check it in.
Also, "Not a signed-off-by" is not the best condition to get it in.


Patrick
Peter Stuge - 2010-09-11 04:33:54
Patrick Georgi wrote:
> Am 11.09.2010 00:55, schrieb Marc Jones:
> > Please give a better description to this fix when you check it in.
> Also, "Not a signed-off-by" is not the best condition to get it in.

I guess it was not really intended to be commited but rather that
further work will come..


//Peter

Patch

Index: src/northbridge/amd/amdht/h3finit.c
===================================================================
--- src/northbridge/amd/amdht/h3finit.c	(revision 4521)
+++ src/northbridge/amd/amdht/h3finit.c	(working copy)
@@ -1104,6 +1104,7 @@ 
 				AmdPCIRead(currentPtr, &temp);
 			} while (!IS_HT_SLAVE_CAPABILITY(temp));
 
+#if (CONFIG_HT_CHAIN_UNITID_BASE != 0)
 			AmdPCIReadBits(currentPtr, 25, 21, &unitIDcnt);
 			if ((unitIDcnt + currentBUID > 31) || ((secBus
== 0) && (unitIDcnt + currentBUID > 24)))