Aladyshev Konstantin has uploaded this change for review.

View Change

AGESA: Correct PCI function number for MEM_GET(SET)REG outputs

PCI function number takes only 3 bits, therefore
correct bitmask for it is 0x7.

Change-Id: Id41700be0474eecc4d5b5173c4d5686c421735e3
Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com>
---
M src/vendorcode/amd/agesa/f12/Proc/Mem/NB/C32/mnregc32.c
M src/vendorcode/amd/agesa/f12/Proc/Mem/NB/DA/mnregda.c
M src/vendorcode/amd/agesa/f12/Proc/Mem/NB/DR/mnregdr.c
M src/vendorcode/amd/agesa/f12/Proc/Mem/NB/HY/mnreghy.c
M src/vendorcode/amd/agesa/f12/Proc/Mem/NB/LN/mnregln.c
M src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnregc32.c
M src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnregda.c
M src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnregdr.c
M src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnreghy.c
M src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnregon.c
M src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrnon.c
M src/vendorcode/amd/agesa/f15/Proc/Mem/NB/C32/mnregc32.c
M src/vendorcode/amd/agesa/f15/Proc/Mem/NB/DA/mnregda.c
M src/vendorcode/amd/agesa/f15/Proc/Mem/NB/DR/mnregdr.c
M src/vendorcode/amd/agesa/f15/Proc/Mem/NB/HY/mnreghy.c
M src/vendorcode/amd/agesa/f15/Proc/Mem/NB/OR/mnregor.c
M src/vendorcode/amd/agesa/f15/Proc/Recovery/Mem/NB/OR/mrnor.c
M src/vendorcode/amd/agesa/f15tn/Proc/Mem/NB/TN/mnregtn.c
M src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/KB/mnregkb.c
19 files changed, 38 insertions(+), 38 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/20837/1

diff --git a/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/C32/mnregc32.c b/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/C32/mnregc32.c
index b4335d6..ebf73e0 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/C32/mnregc32.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/C32/mnregc32.c
@@ -209,7 +209,7 @@
         LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
         if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
             (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
         }
       } else if (Type == DCT_PHY_ACCESS) {
         MemNSetBitFieldNb (NBPtr, BFDctAddlOffsetReg, Address);
@@ -240,7 +240,7 @@
           LibAmdPciWrite (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+            IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/DA/mnregda.c b/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/DA/mnregda.c
index 7d5b684..c721618 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/DA/mnregda.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/DA/mnregda.c
@@ -194,7 +194,7 @@
         LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
         if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
             (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
         }
       } else if (Type == DCT_PHY_ACCESS) {
         MemNSetBitFieldNb (NBPtr, BFDctAddlOffsetReg, Address);
@@ -220,7 +220,7 @@
           LibAmdPciWrite (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/DR/mnregdr.c b/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/DR/mnregdr.c
index b84006b..9b871f2 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/DR/mnregdr.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/DR/mnregdr.c
@@ -195,7 +195,7 @@
         LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
         if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
             (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
         }
       } else if (Type == DCT_PHY_ACCESS) {
         MemNSetBitFieldNb (NBPtr, BFDctAddlOffsetReg, Address);
@@ -221,7 +221,7 @@
           LibAmdPciWrite (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/HY/mnreghy.c b/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/HY/mnreghy.c
index 8f59d4d..61cf26b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/HY/mnreghy.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/HY/mnreghy.c
@@ -210,7 +210,7 @@
         LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
         if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
             (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
         }
       } else if (Type == DCT_PHY_ACCESS) {
         MemNSetBitFieldNb (NBPtr, BFDctAddlOffsetReg, Address);
@@ -241,7 +241,7 @@
           LibAmdPciWrite (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/LN/mnregln.c b/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/LN/mnregln.c
index ff6e673..607fce0 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/LN/mnregln.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/LN/mnregln.c
@@ -219,7 +219,7 @@
           LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+            IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           if (IsPhyDirectAccess && (NumOfInstances > 1)) {
@@ -251,7 +251,7 @@
             LibAmdPciWrite (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
             if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
                 (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-              IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+              IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
             }
           } else if (Type == DCT_PHY_ACCESS) {
             MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnregc32.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnregc32.c
index c7b6dcf..715e072 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnregc32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/C32/mnregc32.c
@@ -211,7 +211,7 @@
         LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
         if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
             (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
         }
       } else if (Type == DCT_PHY_ACCESS) {
         MemNSetBitFieldNb (NBPtr, BFDctAddlOffsetReg, Address);
@@ -242,7 +242,7 @@
           LibAmdPciWrite (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+            IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnregda.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnregda.c
index 22dcee3..56d3880 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnregda.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DA/mnregda.c
@@ -196,7 +196,7 @@
         LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
         if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
             (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
         }
       } else if (Type == DCT_PHY_ACCESS) {
         MemNSetBitFieldNb (NBPtr, BFDctAddlOffsetReg, Address);
@@ -222,7 +222,7 @@
           LibAmdPciWrite (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnregdr.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnregdr.c
index b549cba..317cfb7 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnregdr.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/DR/mnregdr.c
@@ -197,7 +197,7 @@
         LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
         if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
             (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
         }
       } else if (Type == DCT_PHY_ACCESS) {
         MemNSetBitFieldNb (NBPtr, BFDctAddlOffsetReg, Address);
@@ -223,7 +223,7 @@
           LibAmdPciWrite (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnreghy.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnreghy.c
index a8a1170..da6d6fa 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnreghy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/HY/mnreghy.c
@@ -212,7 +212,7 @@
         LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
         if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
             (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
         }
       } else if (Type == DCT_PHY_ACCESS) {
         MemNSetBitFieldNb (NBPtr, BFDctAddlOffsetReg, Address);
@@ -243,7 +243,7 @@
           LibAmdPciWrite (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnregon.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnregon.c
index e92dec0..109cd53 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnregon.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/ON/mnregon.c
@@ -242,7 +242,7 @@
           LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+            IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           if (IsPhyDirectAccess && (NumOfInstances > 1)) {
@@ -276,7 +276,7 @@
             LibAmdPciWrite (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
             if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
                 (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-              IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+              IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
             }
           } else if (Type == DCT_PHY_ACCESS) {
             MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrnon.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrnon.c
index 7915b84..f9acf5a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrnon.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/Mem/NB/ON/mrnon.c
@@ -345,7 +345,7 @@
         LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+            IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
           }
       } else if (Type == DCT_PHY_ACCESS) {
           if (IsPhyDirectAccess && (NumOfInstances > 1)) {
@@ -377,7 +377,7 @@
           LibAmdPciWrite (AccessWidth32, PciAddr , &Value, &NBPtr->MemPtr->StdHeader);
             if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
                 (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-              IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+              IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
             }
         } else if (Type == DCT_PHY_ACCESS) {
           MemRecNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/C32/mnregc32.c b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/C32/mnregc32.c
index 17c603f..953dd4c 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/C32/mnregc32.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/C32/mnregc32.c
@@ -210,7 +210,7 @@
         LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
         if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
             (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
         }
       } else if (Type == DCT_PHY_ACCESS) {
         MemNSetBitFieldNb (NBPtr, BFDctAddlOffsetReg, Address);
@@ -241,7 +241,7 @@
           LibAmdPciWrite (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+            IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/DA/mnregda.c b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/DA/mnregda.c
index 336fb35..f97a550 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/DA/mnregda.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/DA/mnregda.c
@@ -195,7 +195,7 @@
         LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
         if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
             (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
         }
       } else if (Type == DCT_PHY_ACCESS) {
         MemNSetBitFieldNb (NBPtr, BFDctAddlOffsetReg, Address);
@@ -221,7 +221,7 @@
           LibAmdPciWrite (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/DR/mnregdr.c b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/DR/mnregdr.c
index 5c6207d..d74b75e 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/DR/mnregdr.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/DR/mnregdr.c
@@ -196,7 +196,7 @@
         LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
         if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
             (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
         }
       } else if (Type == DCT_PHY_ACCESS) {
         MemNSetBitFieldNb (NBPtr, BFDctAddlOffsetReg, Address);
@@ -222,7 +222,7 @@
           LibAmdPciWrite (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/HY/mnreghy.c b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/HY/mnreghy.c
index 90bb9e4..5177cec 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/HY/mnreghy.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/HY/mnreghy.c
@@ -211,7 +211,7 @@
         LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
         if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
             (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Value);
+          IDS_HDT_CONSOLE (MEM_GETREG, "~Fn%d_%03x = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Value);
         }
       } else if (Type == DCT_PHY_ACCESS) {
         MemNSetBitFieldNb (NBPtr, BFDctAddlOffsetReg, Address);
@@ -242,7 +242,7 @@
           LibAmdPciWrite (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) &&
               (FieldName != BFDctExtraDataReg) && (FieldName != BFDctExtraOffsetReg)) {
-            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+            IDS_HDT_CONSOLE (MEM_SETREG, "~Fn%d_%03x [%d:%d] = %x\n", (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/OR/mnregor.c b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/OR/mnregor.c
index 512ef14..a29093f 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/OR/mnregor.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/NB/OR/mnregor.c
@@ -238,7 +238,7 @@
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) && (FieldName != BFDctCfgSel)) {
             IDS_HDT_CONSOLE (MEM_GETREG, "~Dev%x Dct%d Fn%d_%03x = %x\n",
                              NBPtr->PciAddr.Address.Device, NBPtr->Dct,
-                             (Address >> 12) & 0xF, Address & 0xFFF, Value);
+                             (Address >> 12) & 0x7, Address & 0xFFF, Value);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           if (IsPhyDirectAccess && (NumOfInstances > 1)) {
@@ -273,7 +273,7 @@
             if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) && (FieldName != BFDctCfgSel)) {
               IDS_HDT_CONSOLE (MEM_SETREG, "~Dev%x Dct%d Fn%d_%03x [%d:%d] = %x\n",
                                NBPtr->PciAddr.Address.Device, NBPtr->Dct,
-                               (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+                               (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
             }
           } else if (Type == DCT_PHY_ACCESS) {
             MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Recovery/Mem/NB/OR/mrnor.c b/src/vendorcode/amd/agesa/f15/Proc/Recovery/Mem/NB/OR/mrnor.c
index 8fcfc96..eb91bac 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Recovery/Mem/NB/OR/mrnor.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Recovery/Mem/NB/OR/mrnor.c
@@ -548,7 +548,7 @@
         LibAmdPciRead (AccessWidth32, PciAddr, &Value, &NBPtr->MemPtr->StdHeader);
         IDS_HDT_CONSOLE (MEM_GETREG, "~Dev%x Dct%d Fn%d_%03x = %x\n",
                          NBPtr->PciAddr.Address.Device, NBPtr->Dct,
-                         (Address >> 12) & 0xF, Address & 0xFFF, Value);
+                         (Address >> 12) & 0x7, Address & 0xFFF, Value);
       } else if (Type == DCT_PHY_ACCESS) {
         MemRecNSetBitFieldNb (NBPtr, BFDctAddlOffsetReg, Address);
         while (MemRecNGetBitFieldNb (NBPtr, BFDctAccessDone) == 0) {}
@@ -573,7 +573,7 @@
           LibAmdPciWrite (AccessWidth32, PciAddr , &Value, &NBPtr->MemPtr->StdHeader);
           IDS_HDT_CONSOLE (MEM_SETREG, "~Dev%x Dct%d Fn%d_%03x [%d:%d] = %x\n",
                            NBPtr->PciAddr.Address.Device, NBPtr->Dct,
-                           (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+                           (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
         } else if (Type == DCT_PHY_ACCESS) {
           MemRecNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
           Address |= DCT_ACCESS_WRITE;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Mem/NB/TN/mnregtn.c b/src/vendorcode/amd/agesa/f15tn/Proc/Mem/NB/TN/mnregtn.c
index ca2afb4..5bf1093 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Mem/NB/TN/mnregtn.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Mem/NB/TN/mnregtn.c
@@ -235,7 +235,7 @@
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) && (FieldName != BFDctCfgSel)) {
             IDS_HDT_CONSOLE (MEM_GETREG, "~Dev%x Dct%d Fn%d_%03x = %x\n",
                              NBPtr->PciAddr.Address.Device, NBPtr->Dct,
-                             (Address >> 12) & 0xF, Address & 0xFFF, Value);
+                             (Address >> 12) & 0x7, Address & 0xFFF, Value);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           if (IsPhyDirectAccess && (NumOfInstances > 1)) {
@@ -266,7 +266,7 @@
               if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) && (FieldName != BFDctCfgSel)) {
                 IDS_HDT_CONSOLE (MEM_SETREG, "~Dev%x Dct%d Fn%d_%03x [%d:%d] = %x\n",
                                  NBPtr->PciAddr.Address.Device, NBPtr->Dct,
-                                 (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+                                 (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
               }
             } else if (Type == DCT_PHY_ACCESS) {
               MemNSetBitFieldNb (NBPtr, BFDctAddlDataReg, Value);
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/KB/mnregkb.c b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/KB/mnregkb.c
index df810d0..f8b70b8 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/KB/mnregkb.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/KB/mnregkb.c
@@ -234,7 +234,7 @@
           if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) && (FieldName != BFDctCfgSel)) {
             IDS_HDT_CONSOLE (MEM_GETREG, "~Dev%x Dct%d Fn%d_%03x = %x\n",
                              NBPtr->PciAddr.Address.Device, NBPtr->Dct,
-                             (Address >> 12) & 0xF, Address & 0xFFF, Value);
+                             (Address >> 12) & 0x7, Address & 0xFFF, Value);
           }
         } else if (Type == DCT_PHY_ACCESS) {
           if (IsPhyDirectAccess && (NumOfInstances > 1)) {
@@ -265,7 +265,7 @@
               if ((FieldName != BFDctAddlDataReg) && (FieldName != BFDctAddlOffsetReg) && (FieldName != BFDctCfgSel)) {
                 IDS_HDT_CONSOLE (MEM_SETREG, "~Dev%x Dct%d Fn%d_%03x [%d:%d] = %x\n",
                                  NBPtr->PciAddr.Address.Device, NBPtr->Dct,
-                                 (Address >> 12) & 0xF, Address & 0xFFF, Highbit, Lowbit, Field);
+                                 (Address >> 12) & 0x7, Address & 0xFFF, Highbit, Lowbit, Field);
               }
             } else if (Type == DCT_PHY_ACCESS) {
               ASSERT (!NBPtr->IsSupported[ScrubberEn]);   // Phy CSR write is not allowed after scrubber is enabled

To view, visit change 20837. To unsubscribe, visit settings.