Patch set updated for coreboot: 7fb7dee vendorcode/amd/agesa, cimx: Integer comparisons always true

[Edward O'Callaghan]

Edward O'Callaghan ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5749

-gerrit

commit 7fb7deef1a4c18b44b054b3194da87bd06d74f38
Author: Edward O'Callaghan 
Date:   Thu May 15 05:23:09 2014 +1000

vendorcode/amd/agesa,cimx: Integer comparisons always true

Change-Id: I6a3f36cd7e4f2cf26a72f3e849fed0b2da691d1d
    Signed-off-by: Edward O'Callaghan 
---
 src/vendorcode/amd/agesa/f14/Lib/amdlib.c |  9 +++++----
 src/vendorcode/amd/cimx/sb800/SATA.c      | 12 ++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/vendorcode/amd/agesa/f14/Lib/amdlib.c b/src/vendorcode/amd/agesa/f14/Lib/amdlib.c
index 31b3f1e..2bee185 100644
--- a/src/vendorcode/amd/agesa/f14/Lib/amdlib.c
+++ b/src/vendorcode/amd/agesa/f14/Lib/amdlib.c
@@ -348,11 +348,12 @@ LibAmdBitScanReverse (
   IN       UINT32 value
 )
 {
-  UINTN Index;
-  for (Index = 31; Index >= 0; Index--){
-      if (value & (1 << Index)) break;
+  UINT8 Index;
+  for (Index = 31; Index > 0; Index--){
+    if (value & (1 << Index))
+      return Index;
   }
-  return (UINT8) Index;
+  return 0xFF;
 }
 VOID
 LibAmdMsrRead (
diff --git a/src/vendorcode/amd/cimx/sb800/SATA.c b/src/vendorcode/amd/cimx/sb800/SATA.c
index a301208..c2f2162 100644
--- a/src/vendorcode/amd/cimx/sb800/SATA.c
+++ b/src/vendorcode/amd/cimx/sb800/SATA.c
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 2011, Advanced Micro Devices, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -25,10 +25,10 @@
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of 
- *       its contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
+ *       its contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -39,7 +39,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * ***************************************************************************
  *
  */
@@ -568,7 +568,7 @@ sataDriveDetection (
   UINT8   dbPortNum;
   UINT8   dbVar0;
   UINT16   dwIoBase;
-  UINT16   dwVar0;
+  UINT32   dwVar0;
   if ( (pConfig->SataClass == NATIVE_IDE_MODE) || (pConfig->SataClass == LEGACY_IDE_MODE) || (pConfig->SataClass == IDE_TO_AHCI_MODE) ) {
     for ( dbPortNum = 0; dbPortNum < 4; dbPortNum++ ) {
       ReadMEM (*pBar5 + SB_SATA_BAR5_REG128 + dbPortNum * 0x80, AccWidthUint32, &ddVar0);