* [Patch][edk2-platforms/devel-IntelAtomProcessorE3900 7Merged the I2C libraries
@ 2018-08-17 9:33 Guo, Mang
0 siblings, 0 replies; only message in thread
From: Guo, Mang @ 2018-08-17 9:33 UTC (permalink / raw)
To: edk2-devel@lists.01.org; +Cc: Wei, David
1. Merged the I2C libraries into one library in the silicon code.
2. Change MinnowBoard3Next to MinnowBoard3Module.
3. Correct code format.
Cc: David Wei <david.wei@intel.com>
Cc: Mike Wu <mike.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Kelly Steele <kelly.steele@intel.com>
Signed-off-by: Guo Mang <mang.guo@intel.com>
---
.../AuroraGlacier/BoardInitPostMem/BoardInit.h | 4 +-
.../BoardInitPostMem/BoardInitMiscs.h | 2 +-
.../BoardInitPostMem/BoardInitPostMem.inf | 2 +-
.../Board/AuroraGlacier/BoardInitPostMem/TypeC.h | 2 +-
.../AuroraGlacier/BoardInitPreMem/BoardInit.c | 4 +-
.../AuroraGlacier/BoardInitPreMem/BoardInit.h | 2 +-
.../AuroraGlacier/BoardInitPreMem/PlatformId.c | 2 +-
.../BensonGlacier/BoardInitPostMem/BoardInit.h | 6 +-
.../BoardInitPostMem/BoardInitMiscs.h | 4 +-
.../BoardInitPostMem/BoardInitPostMem.inf | 4 +-
.../Board/BensonGlacier/BoardInitPostMem/TypeC.h | 4 +-
.../BensonGlacier/BoardInitPreMem/BoardInit.c | 6 +-
.../BensonGlacier/BoardInitPreMem/BoardInit.h | 4 +-
.../BensonGlacier/BoardInitPreMem/PlatformId.c | 4 +-
.../Board/LeafHill/BoardInitPreMem/PlatformId.c | 2 +-
.../MinnowBoard3/BoardInitPreMem/PlatformId.c | 2 +-
.../Board/UP2/BoardInitPreMem/PlatformId.c | 2 +-
.../Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c | 4 +-
.../Common/Include/Guid/PlatformInfo.h | 4 +-
.../Common/Include/Guid/PlatformInfo_Aplk.h | 4 +-
.../BroxtonPlatformPkg/Common/Include/UsbTypec.h | 4 +-
.../PlatformPreMemPei/BoardGpiosPreMem.c | 8 +-
.../PlatformPreMemPei/PlatformInitPreMem.c | 4 +-
.../PlatformSetupDxe/PlatformSetupDxe.c | 9 +
.../PlatformSetupDxe/SetupInfoRecords.c | 4 +-
.../Common/Tools/Stitch/IFWIStitch_Simple.bat | 20 +-
.../BroxtonPlatformPkg/PlatformDsc/Components.dsc | 22 +-
.../Library/PmcIpcLib/InternalIpcLib.h | 4 +-
.../SouthCluster/Include/Library/I2CLib.h | 134 +-
.../SouthCluster/Library/I2CLib/I2CLib.c | 1581 ++++++++++++++------
.../SouthCluster/Library/I2CLib/I2CLib.inf | 47 +-
.../SouthCluster/Library/I2CLibPei/I2CAccess.h | 51 -
.../SouthCluster/Library/I2CLibPei/I2CDelayPei.h | 34 -
.../SouthCluster/Library/I2CLibPei/I2CIoLibPei.c | 175 ---
.../SouthCluster/Library/I2CLibPei/I2CIoLibPei.h | 146 --
.../SouthCluster/Library/I2CLibPei/I2CLibPei.c | 665 --------
.../SouthCluster/Library/I2CLibPei/I2CLibPei.inf | 51 -
.../SouthCluster/Library/I2cLib/I2cLib.h | 60 +
.../SouthCluster/Library/I2cLib/I2cNullLib.c | 281 ++++
.../I2CDelayPei.c => I2cLib/I2cNullLib.h} | 23 +-
.../SouthCluster/Library/I2cLib/I2cNullLib.inf | 37 +
41 files changed, 1732 insertions(+), 1696 deletions(-)
delete mode 100644 Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CAccess.h
delete mode 100644 Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CDelayPei.h
delete mode 100644 Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CIoLibPei.c
delete mode 100644 Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CIoLibPei.h
delete mode 100644 Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CLibPei.c
delete mode 100644 Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CLibPei.inf
create mode 100644 Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cLib.h
create mode 100644 Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cNullLib.c
rename Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/{I2CLibPei/I2CDelayPei.c => I2cLib/I2cNullLib.h} (61%)
create mode 100644 Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cNullLib.inf
diff --git a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/BoardInit.h
index 8d6fcba..72614fd 100644
--- a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/BoardInit.h
+++ b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/BoardInit.h
@@ -19,12 +19,12 @@
#include <PiPei.h>
-#include <Guid/PlatformInfo_Aplk.h>
+#include <Guid/PlatformInfo.h>
#include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h>
#include <Library/HobLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
#include <Library/IoLib.h>
#include <Library/PcdLib.h>
#include <Library/PeiServicesLib.h>
diff --git a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/BoardInitMiscs.h
index f915505..d86ef1d 100644
--- a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/BoardInitMiscs.h
+++ b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/BoardInitMiscs.h
@@ -53,7 +53,7 @@
#include <Library/DebugLib.h>
#include <Library/GpioLib.h>
#include <Library/HobLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
#include <Library/IoLib.h>
#include <Library/PcdLib.h>
#include <Library/SteppingLib.h>
diff --git a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/BoardInitPostMem.inf b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/BoardInitPostMem.inf
index f47cb4f..73205d7 100644
--- a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/BoardInitPostMem.inf
+++ b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/BoardInitPostMem.inf
@@ -42,7 +42,7 @@
IoLib
SteppingLib
GpioLib
- I2cLibPei
+ I2cLib
TimerLib
[Packages]
diff --git a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/TypeC.h b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/TypeC.h
index 9e9c8a8..6f50661 100644
--- a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/TypeC.h
+++ b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/TypeC.h
@@ -23,7 +23,7 @@
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/GpioLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
//
// Parade Tech PS8750 TypeC MUX
diff --git a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPreMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPreMem/BoardInit.c
index 41d1c5a..3304f54 100644
--- a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPreMem/BoardInit.c
+++ b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPreMem/BoardInit.c
@@ -75,9 +75,9 @@ AuroraGlacierPreMemInit (
Status = AuroraGetFabId (PeiServices, &FabId);
- if (FabId == 1) {
+ if (FabId == FAB_ID_B) {
DEBUG ((EFI_D_INFO, "This is Aurora Glacier FAB B.\n"));
- } else if (FabId == 0) {
+ } else if (FabId == FAB_ID_A) {
DEBUG ((EFI_D_INFO, "This is Aurora Glacier FAB A.\n"));
}
diff --git a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPreMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPreMem/BoardInit.h
index 1cec6b1..472a7f9 100644
--- a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPreMem/BoardInit.h
+++ b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPreMem/BoardInit.h
@@ -19,7 +19,7 @@
#include <PiPei.h>
-#include <Guid/PlatformInfo_Aplk.h>
+#include <Guid/PlatformInfo.h>
#include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h>
diff --git a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPreMem/PlatformId.c b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPreMem/PlatformId.c
index af1a0da..adaeb78 100644
--- a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPreMem/PlatformId.c
+++ b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPreMem/PlatformId.c
@@ -15,7 +15,7 @@
#include <Uefi.h>
#include <Library/BaseMemoryLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
#include <Library/GpioLib.h>
#include <Guid/PlatformInfo.h>
#include "PlatformId.h"
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h
index c065ed2..e951a6d 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h
@@ -2,7 +2,7 @@
GPIO setting for CherryView.
This file includes package header files, library classes.
- Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -19,12 +19,12 @@
#include <PiPei.h>
-#include <Guid/PlatformInfo_Aplk.h>
+#include <Guid/PlatformInfo.h>
#include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h>
#include <Library/HobLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
#include <Library/IoLib.h>
#include <Library/PcdLib.h>
#include <Library/PeiServicesLib.h>
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.h
index 2ac2859..ef33999 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.h
@@ -2,7 +2,7 @@
Multiplatform initialization header file.
This file includes package header files, library classes.
- Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -53,7 +53,7 @@
#include <Library/DebugLib.h>
#include <Library/GpioLib.h>
#include <Library/HobLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
#include <Library/IoLib.h>
#include <Library/PcdLib.h>
#include <Library/SteppingLib.h>
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf
index c7499b5..3a804b9 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf
@@ -2,7 +2,7 @@
# Board detected module for Intel(R) Atom(TM) x5 Processor Series.
# It will detect the board ID.
#
-# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -42,7 +42,7 @@
IoLib
SteppingLib
GpioLib
- I2cLibPei
+ I2cLib
TimerLib
[Packages]
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/TypeC.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/TypeC.h
index c145c69..e126ca9 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/TypeC.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/TypeC.h
@@ -2,7 +2,7 @@
Multiplatform initialization header file.
This file includes package header files, library classes.
- Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -23,7 +23,7 @@
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/GpioLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
//
// Parade Tech PS8750 TypeC MUX
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.c
index 6c75f75..d44e824 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.c
@@ -1,7 +1,7 @@
/** @file
Board Init driver.
- Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -74,9 +74,9 @@ BensonGlacierPreMemInit (
DEBUG ((EFI_D_INFO, "This is Benson Glacier board.\n"));
Status = BensonGetFabId (PeiServices, &FabId);
- if (FabId == 1) {
+ if (FabId == FAB_ID_B) {
DEBUG ((EFI_D_INFO, "This is Benson Glacier FAB B.\n"));
- } else if (FabId == 0) {
+ } else if (FabId == FAB_ID_A) {
DEBUG ((EFI_D_INFO, "This is Benson Glacier FAB A.\n"));
}
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.h
index 3153776..833bf55 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.h
@@ -2,7 +2,7 @@
GPIO setting for CherryView.
This file includes package header files, library classes.
- Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -19,7 +19,7 @@
#include <PiPei.h>
-#include <Guid/PlatformInfo_Aplk.h>
+#include <Guid/PlatformInfo.h>
#include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h>
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.c
index 614ed66..c0dfd0f 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.c
@@ -15,7 +15,7 @@
#include <Uefi.h>
#include <Library/BaseMemoryLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
#include <Library/GpioLib.h>
#include <Guid/PlatformInfo.h>
#include "PlatformId.h"
@@ -134,7 +134,7 @@ BensonGetFabId(
GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET, padConfg1.padCnf1);
- *FabId = (UINT8) (((GpioPadRead (GetCommOffset (NORTH, 0x0F0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1));
+ *FabId = (UINT8) (((GpioPadRead (GetCommOffset (NORTH, 0x0F0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1)) + 1;
DEBUG ((EFI_D_INFO, "FabId: %02X\n", *FabId));
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c
index aee2b0c..ecdcd83 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c
@@ -15,7 +15,7 @@
#include <Uefi.h>
#include <Library/BaseMemoryLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
#include <Library/GpioLib.h>
#include <Guid/PlatformInfo.h>
#include "PlatformId.h"
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.c
index f4cf51c..aaba9b7 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.c
@@ -15,7 +15,7 @@
#include <Uefi.h>
#include <Library/BaseMemoryLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
#include <Library/GpioLib.h>
#include <Guid/PlatformInfo.h>
#include "PlatformId.h"
diff --git a/Platform/BroxtonPlatformPkg/Board/UP2/BoardInitPreMem/PlatformId.c b/Platform/BroxtonPlatformPkg/Board/UP2/BoardInitPreMem/PlatformId.c
index cec7a7c..5708e05 100644
--- a/Platform/BroxtonPlatformPkg/Board/UP2/BoardInitPreMem/PlatformId.c
+++ b/Platform/BroxtonPlatformPkg/Board/UP2/BoardInitPreMem/PlatformId.c
@@ -15,7 +15,7 @@
#include <Uefi.h>
#include <Library/BaseMemoryLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
#include <Library/GpioLib.h>
#include <Guid/PlatformInfo.h>
#include "PlatformId.h"
diff --git a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c
index 41c59f1..cce4bbe 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c
+++ b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c
@@ -1,7 +1,7 @@
/** @file
The function that processes the Smbios data type 0x94.
- Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -30,7 +30,7 @@
#include <Protocol/CpuIo2.h>
#include <Library/IoLib.h>
#include <Library/PlatformSecureDefaultsLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
#include <Library/CpuIA32.h>
#include <Library/DriverLib.h>
#include <Library/UefiRuntimeServicesTableLib.h>
diff --git a/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo.h b/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo.h
index ee60046..0da592b 100644
--- a/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo.h
+++ b/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo.h
@@ -174,9 +174,9 @@ typedef enum {
typedef enum {
BOARD_ID_UP2 = 0x01, // UP2
- BOARD_ID_MINNOW_NEXT = 0x03, // Minnow Board Next
+ BOARD_ID_MINNOW_MODULE = 0x03, // Minnow Board v3 Module
BOARD_ID_LFH_CRB = 0x07, // Leaf Hill
- BOARD_ID_MINNOW = 0x0F, // Minnow Board
+ BOARD_ID_MINNOW = 0x0F, // Minnow Board v3
BOARD_ID_BENSON = 0x0C, // Benson Glacier
BOARD_ID_AURORA = 0x0E, // Aurora Glacier
BOARD_ID_APL_UNKNOWN = 0xFF
diff --git a/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo_Aplk.h b/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo_Aplk.h
index c9f0a75..f949ba1 100644
--- a/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo_Aplk.h
+++ b/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo_Aplk.h
@@ -159,9 +159,9 @@ typedef struct {
typedef enum {
BOARD_ID_UP2 = 0x01, // UP2
- BOARD_ID_MINNOW_NEXT = 0x03, // Minnow Board Next
+ BOARD_ID_MINNOW_MODULE = 0x03, // Minnow Board v3 Module
BOARD_ID_LFH_CRB = 0x07, // Leaf Hill
- BOARD_ID_MINNOW = 0x0F, // Minnow Board
+ BOARD_ID_MINNOW = 0x0F, // Minnow Board v3
BOARD_ID_BENSON = 0x0C, // Benson Glacier
BOARD_ID_AURORA = 0x0E, // Aurora Glacier
BOARD_ID_APL_UNKNOWN = 0xFF
diff --git a/Platform/BroxtonPlatformPkg/Common/Include/UsbTypec.h b/Platform/BroxtonPlatformPkg/Common/Include/UsbTypec.h
index ec70314..a86d2f4 100644
--- a/Platform/BroxtonPlatformPkg/Common/Include/UsbTypec.h
+++ b/Platform/BroxtonPlatformPkg/Common/Include/UsbTypec.h
@@ -1,5 +1,5 @@
/** @file
- Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -18,7 +18,7 @@
#include <Library/TimerLib.h>
#include <Library/IoLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
#include <Guid/SetupVariable.h>
#include <Library/PmicLib.h>
#include <Library/GpioLib.h>
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/BoardGpiosPreMem.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/BoardGpiosPreMem.c
index b95e907..d3ad7e2 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/BoardGpiosPreMem.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/BoardGpiosPreMem.c
@@ -1,7 +1,7 @@
/** @file
Gpio setting for multiplatform before Memory init.
- Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -78,7 +78,7 @@ BXT_GPIO_PAD_INIT SignsOfLifeGpio[] =
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled ,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm, MMIO_Offset, Community
//
- BXT_GPIO_PAD_CONF(L"GPIO_26", M0 , GPO , GPIO_D, LO , NA , Wake_Disabled, P_NONE , NA , NA, NA ,DisPuPd, GPIO_PADBAR+0x00D0, NORTH), // MB3N - SATA_LED
+ BXT_GPIO_PAD_CONF(L"GPIO_26", M0 , GPO , GPIO_D, LO , NA , Wake_Disabled, P_NONE , NA , NA, NA ,DisPuPd, GPIO_PADBAR+0x00D0, NORTH), // MB3M - SATA_LED
};
//
@@ -173,8 +173,8 @@ BXT_GPIO_PAD_INIT UartGpio [] =
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L, Inverted,GPI_ROUT,IOSstae, IOSTerm, MMIO_Offset, Community
//
- BXT_GPIO_PAD_CONF(L"GPIO_38 LPSS_UART0_RXD", M1 , NA , NA , NA , NA , Wake_Disabled, P_20K_H, NA , NA, NA , NA, GPIO_PADBAR+0x0130, NORTH), // SOC_UART1_TXD
- BXT_GPIO_PAD_CONF(L"GPIO_39 LPSS_UART0_TXD", M1 , NA , NA , NA , NA , Wake_Disabled, P_20K_H, NA , NA, NA , NA, GPIO_PADBAR+0x0138, NORTH), // SOC_UART1_RXD
+ BXT_GPIO_PAD_CONF(L"GPIO_38 LPSS_UART0_RXD", M1 , NA , NA , NA , NA , Wake_Disabled, P_20K_H, NA , NA, NA , NA, GPIO_PADBAR+0x0130, NORTH), // SOC_UART0_TXD
+ BXT_GPIO_PAD_CONF(L"GPIO_39 LPSS_UART0_TXD", M1 , NA , NA , NA , NA , Wake_Disabled, P_20K_H, NA , NA, NA , NA, GPIO_PADBAR+0x0138, NORTH), // SOC_UART0_RXD
BXT_GPIO_PAD_CONF(L"GPIO_42 LPSS_UART1_RXD", M1 , NA , NA , NA , NA , Wake_Disabled, P_20K_H, NA , NA, NA , NA, GPIO_PADBAR+0x0150, NORTH), // SOC_UART1_TXD
BXT_GPIO_PAD_CONF(L"GPIO_43 LPSS_UART1_TXD", M1 , NA , NA , NA , NA , Wake_Disabled, P_20K_H, NA , NA, NA , NA, GPIO_PADBAR+0x0158, NORTH), // SOC_UART1_RXD
BXT_GPIO_PAD_CONF(L"GPIO_46 LPSS_UART2_RXD", M1 , NA , NA , NA , NA , Wake_Disabled, P_20K_H, NA , NA, NA , NA, GPIO_PADBAR+0x0170, NORTH), // SOC_UART2_TXD
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
index f6d6910..a0c5e82 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
@@ -1,7 +1,7 @@
/** @file
Source code file for Platform Init Pre-Memory PEI module.
- Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -53,7 +53,7 @@
#include <Library/MemoryAllocationLib.h>
#include <Library/PerformanceLib.h>
#include <Library/MtrrLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
#include <Library/PmicLib.h>
#include <Library/PeiVariableCacheLib.h>
#include <Library/PeiSiPolicyLib.h>
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/PlatformSetupDxe.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/PlatformSetupDxe.c
index bbb31b1..21fd328 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/PlatformSetupDxe.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/PlatformSetupDxe.c
@@ -141,6 +141,15 @@ LoadPlatformDefaultValues (
IN EFI_CALLBACK_INFO *Private
)
{
+ switch (Private->FakeNvData.BoardId) {
+ case BOARD_ID_LFH_CRB:
+ case BOARD_ID_MINNOW:
+ case BOARD_ID_BENSON:
+
+ break;
+ default:
+ break;
+ }
Private->FakeNvData.PlatformSettingEn = 1;
}
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/SetupInfoRecords.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/SetupInfoRecords.c
index c3fd787..0bb5f00 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/SetupInfoRecords.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/SetupInfoRecords.c
@@ -1,7 +1,7 @@
/** @file
To retrieve various platform info data for Setup menu.
- Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -25,7 +25,7 @@
#include <Protocol/CpuInfo.h>
#include <Library/IoLib.h>
#include <Library/PlatformSecureDefaultsLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
#include <Library/PmcIpcLib.h>
#include <CpuAccess.h>
#include <Library/SteppingLib.h>
diff --git a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
index 125c8c2..c8d0973 100644
--- a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
+++ b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
@@ -138,9 +138,9 @@ echo.
echo %SpiAccessControl%
echo Generating SPI Image...
mkdir BIOS_COMPONENTS
-copy /y /b %BIOS_Names%\IBBL.Fv .\BIOS_COMPONENTS
-copy /y /b %BIOS_Names%\IBB.Fv .\BIOS_COMPONENTS
-copy /y /b %BIOS_Names%\OBB.Fv .\BIOS_COMPONENTS
+copy /y /b %BIOS_Names%\IBBL.Fv .\BIOS_COMPONENTS
+copy /y /b %BIOS_Names%\IBB.Fv .\BIOS_COMPONENTS
+copy /y /b %BIOS_Names%\OBB.Fv .\BIOS_COMPONENTS
copy /y /b %BIOS_Names%\NvStorage.Fv .\BIOS_COMPONENTS
if %BoardId%==BG (
@@ -151,8 +151,8 @@ if %BoardId%==BG (
) else (
copy /y /b ..\..\..\Board\BensonGlacier\IFWI\FAB_A\SpiChunk1.bin .
copy /y /b ..\..\..\Board\BensonGlacier\IFWI\FAB_A\SpiChunk2.bin .
- copy /y /b ..\..\..\Board\BensonGlacier\IFWI\FAB_A\SpiChunk3.bin .
- )
+ copy /y /b ..\..\..\Board\BensonGlacier\IFWI\FAB_A\SpiChunk3.bin .
+ )
copy /y /b SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvStorage.Fv+SpiChunk3.bin spi_out.bin
) else if %BoardId%==AG (
@@ -161,7 +161,7 @@ if %BoardId%==BG (
copy /y /b ..\..\..\Board\AuroraGlacier\IFWI\FAB_A\SpiChunk3.bin .
copy /y /b SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvStorage.Fv+SpiChunk3.bin spi_out.bin
-
+
) else if %BoardId%==MN (
if %FabId%==B (
copy /y /b ..\..\..\Board\MinnowBoard3\IFWI\FAB_B\SpiChunk1.bin .
@@ -175,10 +175,10 @@ if %BoardId%==BG (
copy /y /b SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvStorage.Fv+SpiChunk3.bin spi_out.bin
)
) else if %BoardId%==MX (
- copy /y /b ..\..\..\Board\MinnowBoard3Next\IFWI\FAB_A\SpiChunk1.bin .
- copy /y /b ..\..\..\Board\MinnowBoard3Next\IFWI\FAB_A\SpiChunk2.bin .
- copy /y /b ..\..\..\Board\MinnowBoard3Next\IFWI\FAB_A\SpiChunk3.bin .
- copy /y /b ..\..\..\Board\MinnowBoard3Next\IFWI\FAB_A\SpiChunk1SpiAccessControl.bin .
+ copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_A\SpiChunk1.bin .
+ copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_A\SpiChunk2.bin .
+ copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_A\SpiChunk3.bin .
+ copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_A\SpiChunk1SpiAccessControl.bin .
if %SpiAccessControl% EQU 0 (
copy /y /b SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvStorage.Fv+SpiChunk3.bin spi_out.bin
) else (
diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc
index f49d4cc..696480b 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc
@@ -48,7 +48,7 @@
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
}
-
+
UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
@@ -182,8 +182,8 @@
MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf {
- <PcdsFixedAtBuild>
- gPcAtChipsetPkgTokenSpaceGuid.PcdMinimalValidYear|2017
+ <PcdsFixedAtBuild>
+ gPcAtChipsetPkgTokenSpaceGuid.PcdMinimalValidYear|2018
}
MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
@@ -193,8 +193,7 @@
NULL|$(PLATFORM_NAME)/Board/LeafHill/BoardInitDxe/BoardInitDxe.inf
NULL|$(PLATFORM_NAME)/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.inf
NULL|$(PLATFORM_NAME)/Board/AuroraGlacier/BoardInitDxe/BoardInitDxe.inf
- NULL|$(PLATFORM_NAME)/Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.inf
- NULL|$(PLATFORM_NAME)/Board/UP2/BoardInitDxe/BoardInitDxe.inf
+ NULL|$(PLATFORM_NAME)/Board/MinnowBoard3Module/BoardInitDxe/BoardInitDxe.inf
}
!if $(DATAHUB_ENABLE) == TRUE
@@ -504,27 +503,27 @@
MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf {
<LibraryClasses>
- DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+ DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
}
MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf {
<LibraryClasses>
- DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+ DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
}
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf {
<LibraryClasses>
- DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+ DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
}
MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf {
<LibraryClasses>
- DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+ DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
}
MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf {
<LibraryClasses>
- DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+ DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
}
MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf {
<LibraryClasses>
- DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+ DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
}
MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf {
<BuildOptions>
@@ -563,6 +562,7 @@
#
$(PLATFORM_PACKAGE_COMMON)/Application/FirmwareUpdate/FirmwareUpdate.inf
MdeModulePkg/Application/VariableInfo/VariableInfo.inf
+ $(PLATFORM_PACKAGE_COMMON)/Features/Eeprom/EepromApp/EepromApp.inf
#
# VT-d for DMA Protection
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/Library/PmcIpcLib/InternalIpcLib.h b/Silicon/BroxtonSoC/BroxtonSiPkg/Library/PmcIpcLib/InternalIpcLib.h
index f8babb8..115da4c 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/Library/PmcIpcLib/InternalIpcLib.h
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/Library/PmcIpcLib/InternalIpcLib.h
@@ -1,7 +1,7 @@
/** @file
Header file for Base IPC library.
- Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -21,7 +21,7 @@
//
#include <Library/IoLib.h>
#include <Library/DebugLib.h>
-#include <Library/I2CLib.h>
+#include <Library/I2cLib.h>
//
// Produced library class
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Include/Library/I2CLib.h b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Include/Library/I2CLib.h
index 0c50a3d..1c715d5 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Include/Library/I2CLib.h
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Include/Library/I2CLib.h
@@ -1,7 +1,5 @@
/** @file
- Register Definitions for I2C Library.
-
- Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -16,21 +14,133 @@
#ifndef _I2C_LIB_H_
#define _I2C_LIB_H_
+////
+//// Header files
+////
#include <Uefi.h>
-#include <Library/IoLib.h>
+
+
+////
+//// Defines
+////
+#define I2C_WRITE_TIMEOUT 5
+#define FIFO_WRITE_DELAY 5
+#define I2C_ROUTINE_DELAY 10
+#define INVALID_I2C_ADDRESS 0xFF
+#define MAX_I2C_ADDRESS 0x7F
+#define MAX_I2C_BUS 7
+
+
+////
+//// Enums
+////
+typedef enum {
+ Standard_Speed = 1,
+ Fast_Speed = 2,
+ High_Speed = 3,
+ Max_Speed = 3
+} I2C_SPEED_ENUM;
+
+
+////
+//// Functions
+////
//
-// FIFO write workaround value.
+// Desc: Initializes the controller and returns the MMIO base address
+// Input: Bus - I2C controller, 0 based
+// Address - 7-bit slave address
+// Speed - Uses the I2C_SPEED_ENUM enum to set the controller speed
+// I2cBaseAddress - Pointer to the MMIO base address for the I2C controller
+// Output: EFI_SUCCESS - Initialization completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
//
-#define FIFO_WRITE_DELAY 2
+EFI_STATUS
+I2cInit (
+ IN UINT8 Bus,
+ IN UINT16 Address,
+ IN UINT8 Speed,
+ IN OUT UINT32 *I2cBaseAddress
+ );
-/**
- Program LPSS I2C PCI controller's BAR0 and enable memory decode.
+EFI_STATUS
+I2cPoll (
+ IN UINT32 I2cBaseAddress
+ );
- @retval EFI_SUCCESS - I2C controller's BAR0 is programmed and memory decode enabled.
-**/
+//
+// Desc: Read a byte from the I2C controller
+// Input: I2cBaseAddress - MMIO base address for the I2C controller
+// Data - Pointer to where to store the data
+// Start - Send start bit?
+// End - Send end bit?
+// Output: EFI_SUCCESS - Read completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
+EFI_STATUS
+I2cRead (
+ IN UINT32 I2cBaseAddress,
+ IN OUT UINT8 *Data,
+ IN BOOLEAN Start,
+ IN BOOLEAN End
+ );
+
+//
+// Desc: Resets the I2C controller into a known good state
+// Input: I2cBaseAddress - MMIO base address for the I2C controller
+// Output: EFI_SUCCESS - Write completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
+EFI_STATUS
+I2cReset (
+ IN UINT32 I2cBaseAddress,
+ IN UINT8 Bus,
+ IN UINT16 Address,
+ IN UINT8 Speed
+ );
+
+EFI_STATUS
+I2cSendCommand (
+ IN UINT32 I2cBaseAddress,
+ IN UINT32 *Data,
+ IN BOOLEAN Start,
+ IN BOOLEAN End
+ );
+
+//
+// Desc: Set I2C slave offset
+// Input: I2cBaseAddress - MMIO base address for the I2C controller
+// Offset - Pointer to offset data
+// Size - Size of the offset data
+// Output: EFI_SUCCESS - Write completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
+EFI_STATUS
+I2cSetOffset (
+ IN UINT32 I2cBaseAddress,
+ IN UINT8 *Offset,
+ IN UINT8 Size
+ );
+
+//
+// Desc: Write a byte to the I2C controller
+// Input: I2cBaseAddress - MMIO base address for the I2C controller
+// Data - Data from the I2C controller
+// Start - Send start bit?
+// End - Send end bit?
+// Output: EFI_SUCCESS - Write completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
EFI_STATUS
-ProgramPciLpssI2C (
- IN UINT8 BusNo
+I2cWrite (
+ IN UINT32 I2cBaseAddress,
+ IN UINT8 Data,
+ IN BOOLEAN Start,
+ IN BOOLEAN End
);
/**
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLib/I2CLib.c b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLib/I2CLib.c
index f205a6c..b7ecaca 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLib/I2CLib.c
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLib/I2CLib.c
@@ -1,8 +1,7 @@
/** @file
- Dxe library for I2C bus driver.
+ I2C library instance.
-@copyright
- Copyright (c) 1999 - 2018 Intel Corporation. All rights reserved
+ Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -11,44 +10,15 @@
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
**/
-#include <Library/DebugLib.h>
-#include <Library/I2CLib.h>
-#include <Library/TimerLib.h>
-#include <PlatformBaseAddresses.h>
-#include <SaAccess.h>
-#include <ScAccess.h>
-#include <ScRegs/RegsI2c.h>
-
-#pragma pack(push, 1)
-typedef struct _LPSS_PCI_DEVICE_INFO {
- UINTN Segment;
- UINTN BusNum;
- UINTN DeviceNum;
- UINTN FunctionNum;
- UINTN Bar0;
- UINTN Bar1;
-} LPSS_PCI_DEVICE_INFO;
-
-typedef enum {
- Standard_Speed = 1,
- Fast_Speed = 2,
- High_Speed = 3,
-} I2C_SPEED;
-
-typedef struct _LPSS_I2C_CLOCK_SCL_INFO {
- UINT8 I2c_Speed;
- UINT16 SS_SCL_HCNT;
- UINT16 SS_SCL_LCNT;
- UINT16 FS_SCL_HCNT;
- UINT16 FS_SCL_LCNT;
- UINT16 HS_SCL_HCNT;
- UINT16 HS_SCL_LCNT;
-} LPSS_I2C_CLOCK_SCL_INFO;
-#pragma pack(pop)
-
-LPSS_PCI_DEVICE_INFO mLpssPciDeviceList[] = {
+#include "I2cLib.h"
+
+//
+// List of I2C controllers
+//
+I2C_LPSS_PCI_DEVICE_INFO mI2cLpssPciDeviceList[] = {
{0, DEFAULT_PCI_BUS_NUMBER_SC, PCI_DEVICE_NUMBER_LPSS_I2C0, PCI_FUNCTION_NUMBER_LPSS_I2C0, LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*0), LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*0) + LPSS_I2C_TMP_BAR1_OFFSET},
{0, DEFAULT_PCI_BUS_NUMBER_SC, PCI_DEVICE_NUMBER_LPSS_I2C0, PCI_FUNCTION_NUMBER_LPSS_I2C1, LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*1), LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*1) + LPSS_I2C_TMP_BAR1_OFFSET},
{0, DEFAULT_PCI_BUS_NUMBER_SC, PCI_DEVICE_NUMBER_LPSS_I2C0, PCI_FUNCTION_NUMBER_LPSS_I2C2, LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*2), LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*2) + LPSS_I2C_TMP_BAR1_OFFSET},
@@ -56,44 +26,405 @@ LPSS_PCI_DEVICE_INFO mLpssPciDeviceList[] = {
{0, DEFAULT_PCI_BUS_NUMBER_SC, PCI_DEVICE_NUMBER_LPSS_I2C1, PCI_FUNCTION_NUMBER_LPSS_I2C4, LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*4), LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*4) + LPSS_I2C_TMP_BAR1_OFFSET},
{0, DEFAULT_PCI_BUS_NUMBER_SC, PCI_DEVICE_NUMBER_LPSS_I2C1, PCI_FUNCTION_NUMBER_LPSS_I2C5, LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*5), LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*5) + LPSS_I2C_TMP_BAR1_OFFSET},
{0, DEFAULT_PCI_BUS_NUMBER_SC, PCI_DEVICE_NUMBER_LPSS_I2C1, PCI_FUNCTION_NUMBER_LPSS_I2C6, LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*6), LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*6) + LPSS_I2C_TMP_BAR1_OFFSET},
- {0, DEFAULT_PCI_BUS_NUMBER_SC, PCI_DEVICE_NUMBER_LPSS_I2C1, PCI_FUNCTION_NUMBER_LPSS_I2C7, LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*7), LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*7) + LPSS_I2C_TMP_BAR1_OFFSET},
+ {0, DEFAULT_PCI_BUS_NUMBER_SC, PCI_DEVICE_NUMBER_LPSS_I2C1, PCI_FUNCTION_NUMBER_LPSS_I2C7, LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*7), LPSS_I2C0_TMP_BAR0 + (LPSS_I2C_TMP_BAR0_DELTA*7) + LPSS_I2C_TMP_BAR1_OFFSET}
};
+#define I2C_LPSS_PCI_DEVICE_NUMBER (sizeof (mI2cLpssPciDeviceList) / sizeof (I2C_LPSS_PCI_DEVICE_INFO))
-#define LPSS_PCI_DEVICE_NUMBER sizeof(mLpssPciDeviceList)/sizeof(LPSS_PCI_DEVICE_INFO)
-
+//
+// List of I2C controller clock values
+//
LPSS_I2C_CLOCK_SCL_INFO mLPSS_I2C_CLOCK_SCL_INFO[] = {
- {Fast_Speed, 0x244, 0x2D0, 0x64, 0xC8, 0x06, 0x13},
- {Fast_Speed, 0x244, 0x2D0, 0x64, 0xC8, 0x06, 0x13},
- {Fast_Speed, 0x244, 0x2D0, 0x64, 0xC8, 0x06, 0x13},
- {High_Speed, 0x244, 0x2DA, 0x1E, 0x3C, 0x06, 0x13},
- {High_Speed, 0x244, 0x2DA, 0x1E, 0x50, 0x06, 0x13},
- {Fast_Speed, 0x244, 0x2D0, 0x69, 0xC8, 0x06, 0x13},
- {Fast_Speed, 0x244, 0x2D0, 0x69, 0xC8, 0x06, 0x13},
- {Fast_Speed, 0x244, 0x2D0, 0x70, 0xC8, 0x06, 0x13},
+ {0x244, 0x2D0, 0x64, 0xC8, 0x06, 0x13},
+ {0x244, 0x2D0, 0x64, 0xC8, 0x06, 0x13},
+ {0x244, 0x2D0, 0x64, 0xC8, 0x06, 0x13},
+ {0x244, 0x2DA, 0x1E, 0x3C, 0x06, 0x13},
+ {0x244, 0x2DA, 0x1E, 0x50, 0x06, 0x13},
+ {0x244, 0x2D0, 0x69, 0xC8, 0x06, 0x13},
+ {0x244, 0x2D0, 0x69, 0xC8, 0x06, 0x13},
+ {0x244, 0x2D0, 0x70, 0xC8, 0x06, 0x13}
+};
+#define LPSS_I2C_CLOCK_SCL_INFO_NUMBER (sizeof (mLPSS_I2C_CLOCK_SCL_INFO) / sizeof (LPSS_I2C_CLOCK_SCL_INFO))
+
+//
+// List of I2C controller PAD settings
+//
+BXT_GPIO_PAD_INIT mI2C_LPSS_PAD_INFO[] = {
+ BXT_GPIO_PAD_CONF (L"GPIO_124 LPSS_I2C0_SDA", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D1RxDRx1I, EnPu, GPIO_PADBAR + 0x0000, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_125 LPSS_I2C0_SCL", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D1RxDRx1I, EnPu, GPIO_PADBAR + 0x0008, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_126 LPSS_I2C1_SDA", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D1RxDRx1I, EnPu, GPIO_PADBAR + 0x0010, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_127 LPSS_I2C1_SCL", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D1RxDRx1I, EnPu, GPIO_PADBAR + 0x0018, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_128 LPSS_I2C2_SDA", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D1RxDRx1I, EnPu, GPIO_PADBAR + 0x0020, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_129 LPSS_I2C2_SCL", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D1RxDRx1I, EnPu, GPIO_PADBAR + 0x0028, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_130 LPSS_I2C3_SDA", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D1RxDRx1I, EnPu, GPIO_PADBAR + 0x0030, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_131 LPSS_I2C3_SCL", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D1RxDRx1I, EnPu, GPIO_PADBAR + 0x0038, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_132 LPSS_I2C4_SDA", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D1RxDRx1I, EnPu, GPIO_PADBAR + 0x0040, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_133 LPSS_I2C4_SCL", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D1RxDRx1I, EnPu, GPIO_PADBAR + 0x0048, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_134 LPSS_I2C5_SDA", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D1RxDRx1I, EnPu, GPIO_PADBAR + 0x0050, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_135 LPSS_I2C5_SCL", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D1RxDRx1I, EnPu, GPIO_PADBAR + 0x0058, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_136 LPSS_I2C6_SDA", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D1RxDRx1I, EnPu, GPIO_PADBAR + 0x0060, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_137 LPSS_I2C6_SCL", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D1RxDRx1I, EnPu, GPIO_PADBAR + 0x0068, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_138 LPSS_I2C7_SDA", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D0RxDRx0I, EnPu, GPIO_PADBAR + 0x0070, WEST),
+ BXT_GPIO_PAD_CONF (L"GPIO_139 LPSS_I2C7_SCL", M1, NA, NA, NA, NA, Wake_Disabled, P_20K_H, NA, NA, D0RxDRx0I, EnPu, GPIO_PADBAR + 0x0078, WEST)
};
-#define LPSS_I2C_CLOCK_SCL_INFO_NUMBER sizeof(mLPSS_I2C_CLOCK_SCL_INFO)/sizeof(LPSS_I2C_CLOCK_SCL_INFO)
+BOOLEAN gI2cDebugFlag = FALSE;
+
+////
+//// Internal I2C functions
+////
+//
+// Desc: Clears the interrupts on this I2C controller
+// Input: I2cBaseAddress - Pointer to the MMIO base address for the I2C controller
+// Output: NA
+//
+VOID
+I2cClearInterrupts (
+ IN UINT32 I2cBaseAddress
+ )
+{
+ MmioRead32 (I2cBaseAddress + R_IC_CLR_INTR);
+ return;
+}
+//
+// Desc: Clears the TX Abort on this I2C controller
+// Input: I2cBaseAddress - Pointer to the MMIO base address for the I2C controller
+// Output: NA
+//
+VOID
+I2cClearTxAbort (
+ IN UINT32 I2cBaseAddress
+ )
+{
+ MmioRead32 (I2cBaseAddress + R_IC_CLR_TX_ABRT);
+ return;
+}
+
+//
+// Desc: Disable this I2C controller
+// Input: I2cBaseAddress - Pointer to the MMIO base address for the I2C controller
+// Output: Status - EFI_SUCCESS - I2C host controller is completely inactive
+// EFI_NOT_READY - I2C host controller is still in an enabled state
+//
+EFI_STATUS
+I2cDisable (
+ IN UINT32 I2cBaseAddress
+ )
+{
+ UINT32 NumTries;
+ EFI_STATUS Status;
+
+ //
+ // Initialize variables
+ //
+ Status = EFI_SUCCESS;
+
+ //
+ // Disable I2C controller
+ //
+ MmioWrite32 (I2cBaseAddress + R_IC_ENABLE, 0);
+ NumTries = 10000; // 0.1 seconds
+ while (0 != (MmioRead32 (I2cBaseAddress + R_IC_ENABLE_STATUS) & 0x03)) {
+ MicroSecondDelay (10);
+ NumTries --;
+ if (0 == NumTries) {
+ Status = EFI_NOT_READY;
+ goto Exit;
+ }
+ }
+
+Exit:
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - Ending with %r\n", __FUNCTION__, __LINE__, Status));
+ }
+ return Status;
+}
+
+/**
+ Enable I2C host controller
+
+ @param[in] I2CBaseAddress - BAR0 address of I2C host controller
+
+ @retval EFI_SUCCESS - I2C host controller is in an enabled state.
+ @retval EFI_NOT_READY - I2C host controller is still inactive.
+**/
+EFI_STATUS
+I2cEnable (
+ IN UINT32 I2cBaseAddress
+ )
+{
+ UINT32 NumTries;
+ EFI_STATUS Status;
+
+ //
+ // Initialize variables
+ //
+ NumTries = 10000; // 0.1 seconds
+ Status = EFI_SUCCESS;
+
+ //
+ // Enable I2C controller
+ //
+ MmioWrite32 (I2cBaseAddress + R_IC_ENABLE, I2C_ENABLE_ENABLE);
+ while (I2C_ENABLE_ENABLE != (MmioRead32 (I2cBaseAddress + R_IC_ENABLE_STATUS) & I2C_ENABLE_ENABLE)) {
+ MicroSecondDelay (10);
+ NumTries --;
+ if (0 == NumTries) {
+ Status = EFI_NOT_READY;
+ goto Exit;
+ }
+ }
+
+Exit:
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - Ending with %r\n", __FUNCTION__, __LINE__, Status));
+ }
+ return Status;
+}
+
+UINT16
+I2cGetTxAbortStatus (
+ IN UINT32 I2cBaseAddress
+ )
+{
+ UINT16 TxAbortStatus;
+
+ if (I2cBaseAddress == 0) {
+ TxAbortStatus = 0xFFFF;
+ } else {
+ TxAbortStatus = (UINT16) (MmioRead32 (I2cBaseAddress + R_IC_TX_ABRT_SOURCE) & 0xFFFF);
+ }
+ return TxAbortStatus;
+}
+
+/**
+ Get I2C controller raw interrupt status
+
+ @param[in] I2CBaseAddress - BAR0 address of I2C host controller
+
+ @retval UINT16 - Raw interrupt status bit flags
+**/
+UINT16
+I2cGetRawStatus (
+ IN UINT32 I2cBaseAddress
+ )
+{
+ UINT16 RawStatus;
+
+ if (I2cBaseAddress == 0) {
+ RawStatus = 0xFFFF;
+ } else {
+ RawStatus = (UINT16) (MmioRead32 (I2cBaseAddress + R_IC_RAW_INTR_STAT) & 0x3FFF);
+ }
+
+ return RawStatus;
+}
+
+/**
+ Get I2C controller RX FIFO count
+
+ @param[in] I2CBaseAddress - BAR0 address of I2C host controller
+
+ @retval UINT16 - RX FIFO count
+**/
+UINT16
+I2cGetRxFifo (
+ IN UINT32 I2cBaseAddress
+ )
+{
+ UINT16 RxFifo;
+
+ if (I2cBaseAddress == 0) {
+ RxFifo = 0xFFFF;
+ } else {
+ RxFifo = (UINT16) (MmioRead32 (I2cBaseAddress + R_IC_RXFLR) & 0x01FF);
+ }
+
+ return RxFifo;
+}
+
+/**
+ Get I2C controller status
+
+ @param[in] I2CBaseAddress - BAR0 address of I2C host controller
+
+ @retval UINT16 - Status bit flags
+**/
+UINT16
+I2cGetStatus (
+ IN UINT32 I2cBaseAddress
+ )
+{
+ UINT16 I2cStatus;
+
+ if (I2cBaseAddress == 0) {
+ I2cStatus = 0xFFFF;
+ } else {
+ I2cStatus = (UINT16) (MmioRead32 (I2cBaseAddress + R_IC_STATUS) & 0x007F);
+ }
+
+ return I2cStatus;
+}
+
+/**
+ Get I2C controller TX FIFO count
+
+ @param[in] I2CBaseAddress - BAR0 address of I2C host controller
+
+ @retval UINT16 - TX FIFO count
+**/
+UINT16
+I2cGetTxFifo (
+ IN UINT32 I2cBaseAddress
+ )
+{
+ UINT16 TxFifo;
+
+ if (I2cBaseAddress == 0) {
+ TxFifo = 0xFFFF;
+ } else {
+ TxFifo = (UINT16) (MmioRead32 (I2cBaseAddress + R_IC_TXFLR) & 0x01FF);
+ }
+
+ return TxFifo;
+}
+
+EFI_STATUS
+I2cProgramPad (
+ IN UINT8 Bus
+ )
+{
+ UINT8 index;
+ EFI_STATUS Status;
+
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - Programming PADs for bus #%d\n", __FUNCTION__, __LINE__, Bus));
+
+ //
+ // Initialize variables
+ //
+ Status = EFI_SUCCESS;
+
+ //
+ // Sanity checks
+ //
+ if (Bus > MAX_I2C_BUS) {
+ Status = EFI_INVALID_PARAMETER;
+ goto Exit;
+ }
+
+ //
+ // Program SDA/SCL
+ //
+ for (index = 0; index < 2; index++) {
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - Programming PAD %s\n", __FUNCTION__, __LINE__, mI2C_LPSS_PAD_INFO[(Bus * 2) + index].pad_name));
+ GpioPadConfigTable (1, &mI2C_LPSS_PAD_INFO[(Bus * 2) + index]);
+ }
+
+ //
+ // Pause a bit
+ //
+ MicroSecondDelay (I2C_ROUTINE_DELAY);
+
+Exit:
+ return Status;
+}
+
+/**
+ Set the I2C controller bus clock frequency.
+
+ The software and controller do a best case effort of using the specified
+ frequency for the I2C bus. If the frequency does not match exactly then
+ the controller will use a slightly lower frequency for the I2C to avoid
+ exceeding the operating conditions for any of the I2C devices on the bus.
+ For example if 400 KHz was specified and the controller's divide network
+ only supports 402 KHz or 398 KHz then the controller would be set to 398
+ KHz. However if the desired frequency is 400 KHz and the controller only
+ supports 1 MHz and 100 KHz then this routine would return EFI_UNSUPPORTED.
+
+ @param[in] Bus - I2C Bus number to which the I2C device has been connected
+ @param[in] I2CBaseAddress - BAR0 address of I2C host controller
+
+ @retval EFI_SUCCESS - The bus frequency was set successfully.
+**/
+EFI_STATUS
+I2cSetBusFrequency (
+ IN UINT8 Bus,
+ IN UINT32 I2cBaseAddress
+ )
+{
+ EFI_STATUS Status;
+
+ //
+ // Initialize variables
+ //
+ Status = EFI_SUCCESS;
+
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - I2cBusFrequencySet bus: %d\n", __FUNCTION__, __LINE__, Bus));
+ ASSERT ((Bus < LPSS_I2C_CLOCK_SCL_INFO_NUMBER));
+ //
+ // Set the 100 KHz clock divider according to SV result and I2C spec
+ //
+ MmioWrite32 (I2cBaseAddress + R_IC_SS_SCL_HCNT, (UINT16) mLPSS_I2C_CLOCK_SCL_INFO[Bus].SS_SCL_HCNT);
+ MmioWrite32 (I2cBaseAddress + R_IC_SS_SCL_LCNT, (UINT16) mLPSS_I2C_CLOCK_SCL_INFO[Bus].SS_SCL_LCNT);
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - I2cBusFrequencySet R_IC_SS_SCL_HCNT: 0x%08X, R_IC_SS_SCL_LCNT: 0x%08X\r\n",
+ __FUNCTION__,
+ __LINE__,
+ MmioRead32 (I2cBaseAddress + R_IC_SS_SCL_HCNT),
+ MmioRead32 (I2cBaseAddress + R_IC_SS_SCL_LCNT)));
+ //
+ // Set the 400 KHz clock divider according to SV result and I2C spec
+ //
+ MmioWrite32 (I2cBaseAddress + R_IC_FS_SCL_HCNT, (UINT16) mLPSS_I2C_CLOCK_SCL_INFO[Bus].FS_SCL_HCNT);
+ MmioWrite32 (I2cBaseAddress + R_IC_FS_SCL_LCNT, (UINT16) mLPSS_I2C_CLOCK_SCL_INFO[Bus].FS_SCL_LCNT);
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - I2cBusFrequencySet R_IC_FS_SCL_HCNT: 0x%08X, R_IC_FS_SCL_LCNT: 0x%08X\r\n",
+ __FUNCTION__,
+ __LINE__,
+ MmioRead32 (I2cBaseAddress + R_IC_FS_SCL_HCNT),
+ MmioRead32 (I2cBaseAddress + R_IC_FS_SCL_LCNT)));
+ //
+ // Set the 3.4MHz clock divider according to SV result and I2C spec
+ //
+ MmioWrite32 (I2cBaseAddress + R_IC_HS_SCL_HCNT, (UINT16)mLPSS_I2C_CLOCK_SCL_INFO[Bus].HS_SCL_HCNT);
+ MmioWrite32 (I2cBaseAddress + R_IC_HS_SCL_LCNT, (UINT16)mLPSS_I2C_CLOCK_SCL_INFO[Bus].HS_SCL_LCNT);
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - I2cBusFrequencySet R_IC_HS_SCL_HCNT: 0x%08X, R_IC_HS_SCL_LCNT: 0x%08X\r\n",
+ __FUNCTION__,
+ __LINE__,
+ MmioRead32 (I2cBaseAddress + R_IC_HS_SCL_HCNT),
+ MmioRead32 (I2cBaseAddress + R_IC_HS_SCL_LCNT)));
+
+ //
+ // Set hold register
+ //
+ MmioWrite32 (I2cBaseAddress + R_IC_SDA_HOLD, (UINT16) 0x06);
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - I2cBusFrequencySet R_IC_SDA_HOLD: 0x%08X\r\n", __FUNCTION__, __LINE__, MmioRead32 (I2cBaseAddress + R_IC_SDA_HOLD)));
+
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - Ending with %r\n", __FUNCTION__, __LINE__, Status));
+ }
+ return Status;
+}
/**
Program LPSS I2C PCI controller's BAR0 and enable memory decode.
- @param[in] BusNo - I2C Bus number to which the I2C device has been connected
+ @param[in] Bus - I2C Bus number to which the I2C device has been connected
@retval EFI_SUCCESS - I2C controller's BAR0 is programmed and memory decode enabled.
@retval EFI_NOT_READY - I2C controller's is not exist or its function has been disabled.
+ @retval EFI_DEVICE_ERROR - I2C controller can't be enabled.
**/
EFI_STATUS
ProgramPciLpssI2C (
- IN UINT8 BusNo
+ IN UINT8 Bus
)
{
- UINTN PciMmBase=0;
- UINT32 I2CBar0;
- UINT32 I2CBar1;
- UINT32 PmcBase;
- UINT32 D32;
- UINT32 I2cPortDisable[] = {
+ UINT32 Data32;
+ UINT32 I2CBar0;
+ UINT32 I2CBar1;
+ UINTN PciMmBase;
+ UINT32 PmcBase;
+ EFI_STATUS Status;
+ UINT32 I2cPortDisable[] = {
B_PMC_FUNC_DIS_LPSS_I2C0,
B_PMC_FUNC_DIS_LPSS_I2C1,
B_PMC_FUNC_DIS_LPSS_I2C2,
@@ -104,43 +435,60 @@ ProgramPciLpssI2C (
B_PMC_FUNC_DIS_LPSS_I2C7
};
- DEBUG ((DEBUG_INFO, "ProgramPciLpssI2C() Start\n"));
+ //
+ // Initialize variables
+ //
+ PciMmBase = 0;
+ Status = EFI_SUCCESS;
+
+ //
+ // Set PADs to I2C mode
+ //
+ I2cProgramPad (Bus);
//
// Check PMC disable register
//
PmcBase = PMC_BASE_ADDRESS;
- D32 = MmioRead32 (PmcBase + R_PMC_FUNC_DIS);
+ Data32 = MmioRead32 (PmcBase + R_PMC_FUNC_DIS);
- if (D32 == 0xFFFFFFFF) {
- DEBUG ((DEBUG_INFO, "ProgramPciLpssI2C() PMC disable register not available. [%08x]\n", PMC_BASE_ADDRESS));
+ if (Data32 == 0xFFFFFFFF) {
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - ProgramPciLpssI2C() PMC disable register not available. [%08x]\n", __FUNCTION__, __LINE__, PMC_BASE_ADDRESS));
} else {
- if ((D32 & I2cPortDisable[BusNo]) != 0) {
+ if ((Data32 & I2cPortDisable[Bus]) != 0) {
// This I2C port is disabled. Turn it on.
- D32 &= ~I2cPortDisable[BusNo];
- MmioWrite32 (PmcBase + R_PMC_FUNC_DIS, D32);
- DEBUG ((DEBUG_INFO, "ProgramPciLpssI2C() enable I2C controller #%x\n", BusNo));
+ Data32 &= ~I2cPortDisable[Bus];
+ MmioWrite32 (PmcBase + R_PMC_FUNC_DIS, Data32);
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - ProgramPciLpssI2C() enable I2C controller #%x\n", __FUNCTION__, __LINE__, Bus));
// Make sure it took.
- if (D32 != MmioRead32 (PmcBase + R_PMC_FUNC_DIS)) {
- DEBUG ((DEBUG_ERROR, "ProgramPciLpssI2C() failed to enable I2C controller #%x [%08x:%08x]\n", BusNo, D32, MmioRead32 (PmcBase + R_PMC_FUNC_DIS)));
- return EFI_DEVICE_ERROR;
+ if (Data32 != MmioRead32 (PmcBase + R_PMC_FUNC_DIS)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - ProgramPciLpssI2C() failed to enable I2C controller #%x [%08x:%08x]\n",
+ __FUNCTION__,
+ __LINE__,
+ Bus,
+ Data32,
+ MmioRead32 (PmcBase + R_PMC_FUNC_DIS)));
+ Status = EFI_DEVICE_ERROR;
+ goto Exit;
}
}
}
- DEBUG ((DEBUG_INFO, "ProgramPciLpssI2C()------------BusNo=%x\n", BusNo));
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - ProgramPciLpssI2C()------------BusNo=%x\n", __FUNCTION__, __LINE__, Bus));
PciMmBase = MmPciAddress (
- mLpssPciDeviceList[BusNo].Segment,
- mLpssPciDeviceList[BusNo].BusNum,
- mLpssPciDeviceList[BusNo].DeviceNum,
- mLpssPciDeviceList[BusNo].FunctionNum,
+ mI2cLpssPciDeviceList[Bus].Segment,
+ mI2cLpssPciDeviceList[Bus].BusNum,
+ mI2cLpssPciDeviceList[Bus].DeviceNum,
+ mI2cLpssPciDeviceList[Bus].FunctionNum,
0
);
- DEBUG ((DEBUG_INFO, "Program Pci Lpss I2C Device %x %x %x PciMmBase:%x\n", \
- mLpssPciDeviceList[BusNo].BusNum, \
- mLpssPciDeviceList[BusNo].DeviceNum, \
- mLpssPciDeviceList[BusNo].FunctionNum, PciMmBase));
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - Program Pci Lpss I2C Device %x %x %x PciMmBase:%x\n",
+ __FUNCTION__,
+ __LINE__,
+ mI2cLpssPciDeviceList[Bus].BusNum,
+ mI2cLpssPciDeviceList[Bus].DeviceNum,
+ mI2cLpssPciDeviceList[Bus].FunctionNum, PciMmBase));
//
// Check if device present
@@ -153,290 +501,683 @@ ProgramPciLpssI2C (
//
I2CBar0 = MmioRead32 (PciMmBase + R_LPSS_IO_BAR) & B_LPSS_IO_BAR_BA;
I2CBar1 = MmioRead32 (PciMmBase + R_LPSS_IO_BAR1) & B_LPSS_IO_BAR_BA;
- if ((I2CBar0 != (UINT32)mLpssPciDeviceList[BusNo].Bar0) || (I2CBar1 != (UINT32)mLpssPciDeviceList[BusNo].Bar1)) {
- mLpssPciDeviceList[BusNo].Bar0 = MmioRead32 (PciMmBase + R_LPSS_IO_BAR) & B_LPSS_IO_BAR_BA; // get the address allocated.
- mLpssPciDeviceList[BusNo].Bar1 = MmioRead32 (PciMmBase + R_LPSS_IO_BAR1) & B_LPSS_IO_BAR_BA;
- DEBUG ((DEBUG_INFO, "Get bar0:0x%x bar1:0x%x\n", mLpssPciDeviceList[BusNo].Bar0, mLpssPciDeviceList[BusNo].Bar1));
+ if ((I2CBar0 != (UINT32) mI2cLpssPciDeviceList[Bus].Bar0) || (I2CBar1 != (UINT32) mI2cLpssPciDeviceList[Bus].Bar1)) {
+ mI2cLpssPciDeviceList[Bus].Bar0 = MmioRead32 (PciMmBase + R_LPSS_IO_BAR) & B_LPSS_IO_BAR_BA; // get the address allocated.
+ mI2cLpssPciDeviceList[Bus].Bar1 = MmioRead32 (PciMmBase + R_LPSS_IO_BAR1) & B_LPSS_IO_BAR_BA;
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - Get bar0:0x%x bar1:0x%x\n",
+ __FUNCTION__,
+ __LINE__,
+ mI2cLpssPciDeviceList[Bus].Bar0,
+ mI2cLpssPciDeviceList[Bus].Bar1));
}
} else {
//
// Program BAR 0
//
- ASSERT (((mLpssPciDeviceList[BusNo].Bar0 & B_LPSS_IO_BAR_BA) == mLpssPciDeviceList[BusNo].Bar0) && (mLpssPciDeviceList[BusNo].Bar0 != 0));
- MmioWrite32 ((UINTN) (PciMmBase + R_LPSS_IO_BAR), (UINT32) (mLpssPciDeviceList[BusNo].Bar0 & B_LPSS_IO_BAR_BA));
+ ASSERT (((mI2cLpssPciDeviceList[Bus].Bar0 & B_LPSS_IO_BAR_BA) == mI2cLpssPciDeviceList[Bus].Bar0) && (mI2cLpssPciDeviceList[Bus].Bar0 != 0));
+ MmioWrite32 ((UINTN) (PciMmBase + R_LPSS_IO_BAR), (UINT32) (mI2cLpssPciDeviceList[Bus].Bar0 & B_LPSS_IO_BAR_BA));
//
// Program BAR 1
//
- ASSERT (((mLpssPciDeviceList[BusNo].Bar1 & B_LPSS_IO_BAR1_BA) == mLpssPciDeviceList[BusNo].Bar1) && (mLpssPciDeviceList[BusNo].Bar1 != 0));
- MmioWrite32 ((UINTN) (PciMmBase + R_LPSS_IO_BAR1), (UINT32) (mLpssPciDeviceList[BusNo].Bar1 & B_LPSS_IO_BAR1_BA));
+ ASSERT (((mI2cLpssPciDeviceList[Bus].Bar1 & B_LPSS_IO_BAR1_BA) == mI2cLpssPciDeviceList[Bus].Bar1) && (mI2cLpssPciDeviceList[Bus].Bar1 != 0));
+ MmioWrite32 ((UINTN) (PciMmBase + R_LPSS_IO_BAR1), (UINT32) (mI2cLpssPciDeviceList[Bus].Bar1 & B_LPSS_IO_BAR1_BA));
//
// Bus Master Enable & Memory Space Enable
//
MmioOr32 ((UINTN) (PciMmBase + R_LPSS_IO_STSCMD), (UINT32) (B_LPSS_IO_STSCMD_BME | B_LPSS_IO_STSCMD_MSE));
- ASSERT (MmioRead32 (mLpssPciDeviceList[BusNo].Bar0) != 0xFFFFFFFF);
+ ASSERT (MmioRead32 (mI2cLpssPciDeviceList[Bus].Bar0) != 0xFFFFFFFF);
}
//
// Release Resets
//
- MmioWrite32 (mLpssPciDeviceList[BusNo].Bar0 + R_LPSS_IO_MEM_RESETS, B_LPSS_IO_MEM_HC_RESET_REL | B_LPSS_IO_MEM_iDMA_RESET_REL);
+ MmioWrite32 (mI2cLpssPciDeviceList[Bus].Bar0 + R_LPSS_IO_MEM_RESETS, B_LPSS_IO_MEM_HC_RESET_REL | B_LPSS_IO_MEM_iDMA_RESET_REL);
- DEBUG ((DEBUG_INFO, "ProgramPciLpssI2C() Programmed()\n"));
- return EFI_SUCCESS;
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - ProgramPciLpssI2C() Programmed()\n", __FUNCTION__, __LINE__));
+ Status = EFI_SUCCESS;
+ goto Exit;
} else {
- DEBUG ((DEBUG_ERROR, "Pci Lpss I2C Device %x %x %x is not existing!\n",
- mLpssPciDeviceList[BusNo].BusNum,
- mLpssPciDeviceList[BusNo].DeviceNum,
- mLpssPciDeviceList[BusNo].FunctionNum));
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - Pci Lpss I2C Device %x %x %x does not exist!\n",
+ __FUNCTION__,
+ __LINE__,
+ mI2cLpssPciDeviceList[Bus].BusNum,
+ mI2cLpssPciDeviceList[Bus].DeviceNum,
+ mI2cLpssPciDeviceList[Bus].FunctionNum));
+
+ Status = EFI_NOT_READY;
+ goto Exit;
+ }
- return EFI_NOT_READY;
+Exit:
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - Ending with %r\n", __FUNCTION__, __LINE__, Status));
}
+ return Status;
}
-/**
- Disable I2C host controller
+////
+//// Public I2C functions
+////
+//
+// Desc: Initializes the controller and returns the MMIO base address
+// Input: Bus - I2C controller, 0 based
+// Address - 7-bit slave address
+// Speed - Uses the I2C_SPEED_ENUM enum to set the controller speed
+// I2cBaseAddress - Pointer to the MMIO base address for the I2C controller
+// Output: EFI_SUCCESS - Initialization completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
+EFI_STATUS
+I2cInit (
+ IN UINT8 Bus,
+ IN UINT16 Address,
+ IN UINT8 Speed,
+ IN OUT UINT32 *I2cBaseAddress
+ )
+{
+ UINT32 BaseAddress;
+ UINTN PciMmBase;
+ EFI_STATUS Status;
- @param[in] I2CBaseAddress - BAR0 address of I2C host controller
+ //
+ // Sanity checks
+ //
+ if (Bus > MAX_I2C_BUS) {
+ Status = EFI_INVALID_PARAMETER;
+ goto Exit;
+ }
+ if (Address > MAX_I2C_ADDRESS) {
+ Status = EFI_INVALID_PARAMETER;
+ goto Exit;
+ }
+ if (Speed > Max_Speed) {
+ Status = EFI_INVALID_PARAMETER;
+ goto Exit;
+ }
+ if (I2cBaseAddress == NULL) {
+ Status = EFI_INVALID_PARAMETER;
+ goto Exit;
+ }
- @retval EFI_SUCCESS - I2C host controller is completely inactive.
- @retval EFI_NOT_READY - I2C host controller is still in an enabled state.
-**/
+ //
+ // Initialize variables
+ //
+ *I2cBaseAddress = 0;
+
+ //
+ // Get current MMIO base address
+ //
+ PciMmBase = MmPciAddress (
+ mI2cLpssPciDeviceList[Bus].Segment,
+ mI2cLpssPciDeviceList[Bus].BusNum,
+ mI2cLpssPciDeviceList[Bus].DeviceNum,
+ mI2cLpssPciDeviceList[Bus].FunctionNum,
+ 0
+ );
+ BaseAddress = MmioRead32 (PciMmBase + R_LPSS_IO_BAR) & B_LPSS_IO_BAR_BA;
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - I2CBaseAddress = 0x%08x:0x%08x \n", __FUNCTION__, __LINE__, BaseAddress, (UINT32) mI2cLpssPciDeviceList[Bus].Bar0));
+
+ //
+ // Skip reinit if targeting the same I2C bus
+ //
+ if (BaseAddress == (UINT32) mI2cLpssPciDeviceList[Bus].Bar0) {
+ MmioWrite32 (BaseAddress + R_IC_TAR, Address);
+ *I2cBaseAddress = BaseAddress;
+ Status = EFI_SUCCESS;
+ goto Exit;
+ }
+
+ //
+ // Program I2C controller
+ //
+ Status = ProgramPciLpssI2C (Bus);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - ProgramPciLpssI2C failed! %r\n", __FUNCTION__, __LINE__, Status));
+ goto Exit;
+ }
+
+ //
+ // Retrieve I2C MMIO base address
+ //
+ BaseAddress = (UINT32) mI2cLpssPciDeviceList[Bus].Bar0;
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - I2CBaseAddress = 0x%x \n", __FUNCTION__, __LINE__, BaseAddress));
+
+ //
+ // Reset controller
+ //
+ Status = I2cReset (BaseAddress, Bus, Address, Speed);
+ if (EFI_ERROR (Status)) {
+ goto Exit;
+ }
+
+ //
+ // Pause a bit
+ //
+ MicroSecondDelay (I2C_ROUTINE_DELAY);
+
+ //
+ // Pass out MMIO base
+ //
+ *I2cBaseAddress = BaseAddress;
+ Status = EFI_SUCCESS;
+
+Exit:
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - Ending with %r\n", __FUNCTION__, __LINE__, Status));
+ }
+ return Status;
+}
+
+//
+// Desc: Polls the I2C controller with reads until it responds.
+// Input: I2cBaseAddress - Pointer to the MMIO base address for the I2C controller
+// Output: EFI_SUCCESS - Initialization completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+//
EFI_STATUS
-I2cDisable (
- IN UINTN I2CBaseAddress
+I2cPoll (
+ IN UINT32 I2cBaseAddress
)
{
- UINT32 NumTries = 10000; // 0.1 seconds
+ EFI_STATUS Status;
+ UINT16 Timeout;
+ UINT8 Value;
- MmioWrite32 (I2CBaseAddress + R_IC_ENABLE, 0);
- while (0 != ( MmioRead32 ( I2CBaseAddress + R_IC_ENABLE_STATUS) & 1)) {
+ //
+ // Use a read to poll the slave
+ //
+ Status = EFI_DEVICE_ERROR;
+ Timeout = 0;
+ while (EFI_ERROR (Status) && Timeout < 1000) {
MicroSecondDelay (10);
- NumTries --;
- if (0 == NumTries) return EFI_NOT_READY;
+ Status = I2cRead (I2cBaseAddress, &Value, TRUE, TRUE);
+ Timeout++;
}
- return EFI_SUCCESS;
-}
-
-/**
- Enable I2C host controller
- @param[in] I2CBaseAddress - BAR0 address of I2C host controller
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - Ending with %r\n", __FUNCTION__, __LINE__, Status));
+ }
+ return Status;
+}
- @retval EFI_SUCCESS - I2C host controller is in an enabled state.
- @retval EFI_NOT_READY - I2C host controller is still inactive.
-**/
+//
+// Desc: Read a byte from the I2C controller
+// Input: I2cBaseAddress - MMIO base address for the I2C controller
+// Data - Pointer to where to store the data
+// Start - Send start bit?
+// End - Send end bit?
+// Output: EFI_SUCCESS - Read completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
EFI_STATUS
-I2cEnable (
- IN UINTN I2CBaseAddress
+I2cRead (
+ IN UINT32 I2cBaseAddress,
+ IN OUT UINT8 *Data,
+ IN BOOLEAN Start,
+ IN BOOLEAN End
)
{
- UINT32 NumTries = 10000; // 0.1 seconds
+ UINT32 Data32;
+ EFI_STATUS Status;
- MmioWrite32 (I2CBaseAddress + R_IC_ENABLE, 1);
- while (0 == (MmioRead32 (I2CBaseAddress + R_IC_ENABLE_STATUS) & 1)) {
- MicroSecondDelay (10);
- NumTries --;
- if (0 == NumTries) return EFI_NOT_READY;
- }
- return EFI_SUCCESS;
-}
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - Starting\n", __FUNCTION__, __LINE__));
-/**
- Set the I2C controller bus clock frequency.
+ //
+ // Sanity checks
+ //
+ if (Data == NULL) {
+ Status = EFI_INVALID_PARAMETER;
+ goto Exit;
+ }
- The software and controller do a best case effort of using the specified
- frequency for the I2C bus. If the frequency does not match exactly then
- the controller will use a slightly lower frequency for the I2C to avoid
- exceeding the operating conditions for any of the I2C devices on the bus.
- For example if 400 KHz was specified and the controller's divide network
- only supports 402 KHz or 398 KHz then the controller would be set to 398
- KHz. However if the desired frequency is 400 KHz and the controller only
- supports 1 MHz and 100 KHz then this routine would return EFI_UNSUPPORTED.
+ //
+ // Send CMD for read
+ //
+ Data32 = B_READ_CMD;
+ Status = I2cSendCommand (I2cBaseAddress, &Data32, Start, End);
+ *Data = (UINT8) (Data32 & 0xFF);
- @param[in] BusNo - I2C Bus number to which the I2C device has been connected
- @param[in] I2CBaseAddress - BAR0 address of I2C host controller
- @param[out] I2cMode - I2C operation mode.
- Standard Speed: 100 KHz
- Fast Speed : 400 KHz
- High Speed : 3.4 MHz
+Exit:
+ //
+ // Pause a bit
+ //
+ MicroSecondDelay (I2C_ROUTINE_DELAY);
+ //
+ // Display error messages
+ //
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - Ending with %r\n", __FUNCTION__, __LINE__, Status));
+ }
+ return Status;
+}
- @retval EFI_SUCCESS - The bus frequency was set successfully.
-**/
+//
+// Desc: Resets the I2C controller into a known good state
+// Input: I2cBaseAddress - MMIO base address for the I2C controller
+// Bus - I2C controller, 0 based
+// Address - 7-bit slave address
+// Speed - Uses the I2C_SPEED_ENUM enum to set the controller speed
+// Output: EFI_SUCCESS - Write completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
EFI_STATUS
-I2cBusFrequencySet (
- IN UINT8 BusNo,
- IN UINTN I2CBaseAddress,
- OUT UINT16 *I2cMode
+I2cReset (
+ IN UINT32 I2cBaseAddress,
+ IN UINT8 Bus,
+ IN UINT16 Address,
+ IN UINT8 Speed
)
{
- DEBUG ((DEBUG_INFO, "I2cBusFrequencySet bus: %d\r\n", BusNo));
- ASSERT ((BusNo < LPSS_I2C_CLOCK_SCL_INFO_NUMBER));
+ UINT16 I2cMode;
+ UINT32 NumTries;
+ EFI_STATUS Status;
+
//
- // Set the 100 KHz clock divider according to SV result and I2C spec
+ // Wait for master activity to stop
//
- MmioWrite32 (I2CBaseAddress + R_IC_SS_SCL_HCNT, (UINT16)mLPSS_I2C_CLOCK_SCL_INFO[BusNo].SS_SCL_HCNT);
- MmioWrite32 (I2CBaseAddress + R_IC_SS_SCL_LCNT, (UINT16)mLPSS_I2C_CLOCK_SCL_INFO[BusNo].SS_SCL_LCNT);
- DEBUG ((DEBUG_INFO, "I2cBusFrequencySet R_IC_SS_SCL_HCNT: 0x%08X, R_IC_SS_SCL_LCNT: 0x%08X\r\n",\
- MmioRead32 (I2CBaseAddress + R_IC_SS_SCL_HCNT), MmioRead32 (I2CBaseAddress + R_IC_SS_SCL_LCNT)));
+ NumTries = 10000; // 1 seconds
+ while ((STAT_MST_ACTIVITY == (I2cGetStatus (I2cBaseAddress) & STAT_MST_ACTIVITY))) {
+ MicroSecondDelay (10);
+ NumTries--;
+ if (0 == NumTries) {
+ DEBUG ((DEBUG_ERROR, "%a(#%4d) - Try timeout\n", __FUNCTION__, __LINE__));
+ Status = EFI_DEVICE_ERROR;
+ goto Exit;
+ }
+ }
//
- // Set the 400 KHz clock divider according to SV result and I2C spec
+ // Abort controller
//
- MmioWrite32 (I2CBaseAddress + R_IC_FS_SCL_HCNT, (UINT16)mLPSS_I2C_CLOCK_SCL_INFO[BusNo].FS_SCL_HCNT);
- MmioWrite32 (I2CBaseAddress + R_IC_FS_SCL_LCNT, (UINT16)mLPSS_I2C_CLOCK_SCL_INFO[BusNo].FS_SCL_LCNT);
- DEBUG ((DEBUG_INFO, "I2cBusFrequencySet R_IC_FS_SCL_HCNT: 0x%08X, R_IC_FS_SCL_LCNT: 0x%08X\r\n",\
- MmioRead32 (I2CBaseAddress + R_IC_FS_SCL_HCNT), MmioRead32 (I2CBaseAddress + R_IC_FS_SCL_LCNT)));
+ MmioWrite32 (I2cBaseAddress + R_IC_ENABLE, I2C_ENABLE_ABORT);
+ MicroSecondDelay (10 * I2C_ROUTINE_DELAY);
//
- // Set the 3.4MHz clock divider according to SV result and I2C spec
+ // Disable I2C controller
//
- MmioWrite32 (I2CBaseAddress + R_IC_HS_SCL_HCNT, (UINT16)mLPSS_I2C_CLOCK_SCL_INFO[BusNo].HS_SCL_HCNT);
- MmioWrite32 (I2CBaseAddress + R_IC_HS_SCL_LCNT, (UINT16)mLPSS_I2C_CLOCK_SCL_INFO[BusNo].HS_SCL_LCNT);
- DEBUG ((DEBUG_INFO, "I2cBusFrequencySet R_IC_HS_SCL_HCNT: 0x%08X, R_IC_HS_SCL_LCNT: 0x%08X\r\n",\
- MmioRead32 (I2CBaseAddress + R_IC_HS_SCL_HCNT), MmioRead32 (I2CBaseAddress + R_IC_HS_SCL_LCNT)));
-
- switch (mLPSS_I2C_CLOCK_SCL_INFO[BusNo].I2c_Speed) {
+ Status = I2cDisable (I2cBaseAddress);
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - I2cDisable Status = %r\n", __FUNCTION__, __LINE__, Status));
+ if (EFI_ERROR (Status)) {
+ goto Exit;
+ }
+ MicroSecondDelay (I2C_ROUTINE_DELAY);
+ //
+ // Set I2C controller speed
+ //
+ I2cSetBusFrequency (Bus, I2cBaseAddress); // Set I2cMode
+ MicroSecondDelay (I2C_ROUTINE_DELAY);
+ switch (Speed) {
case Standard_Speed:
- MmioWrite32 ( I2CBaseAddress + R_IC_SDA_HOLD, (UINT16)0x06); //100K
- *I2cMode = V_SPEED_STANDARD;
- DEBUG ((DEBUG_INFO, "I2cBusFrequencySet I2cMode: 0x%04X\r\n", *I2cMode));
+ //100K
+ I2cMode = V_SPEED_STANDARD;
break;
case Fast_Speed:
- MmioWrite32 ( I2CBaseAddress + R_IC_SDA_HOLD, (UINT16)0x06); //400K
- *I2cMode = V_SPEED_FAST;
- DEBUG ((DEBUG_INFO, "I2cBusFrequencySet I2cMode: 0x%04X\r\n", *I2cMode));
+ //400K
+ I2cMode = V_SPEED_FAST;
break;
case High_Speed:
- MmioWrite32 ( I2CBaseAddress + R_IC_SDA_HOLD, (UINT16)0x06); //3.4M
- *I2cMode = V_SPEED_HIGH;
- DEBUG ((DEBUG_INFO, "I2cBusFrequencySet I2cMode: 0x%04X\r\n", *I2cMode));
+ //3.4M
+ I2cMode = V_SPEED_HIGH;
break;
default:
- MmioWrite32 ( I2CBaseAddress + R_IC_SDA_HOLD, (UINT16)0x06); //400K
- *I2cMode = V_SPEED_FAST;
- DEBUG ((DEBUG_INFO, "I2cBusFrequencySet I2cMode: 0x%04X\r\n", *I2cMode));
+ //400K
+ I2cMode = V_SPEED_FAST;
}
-
+ I2cMode |= B_IC_RESTART_EN | B_IC_SLAVE_DISABLE | B_MASTER_MODE;
+ //
+ // Set slave address
+ //
+ MmioWrite32 (I2cBaseAddress + R_IC_INTR_MASK, 0x0);
+ if (Address > MAX_I2C_ADDRESS) {
+ Address = (Address & 0x3FF) | IC_TAR_10BITADDR_MASTER;
+ }
+ MmioWrite32 (I2cBaseAddress + R_IC_TAR, Address);
+ MicroSecondDelay (I2C_ROUTINE_DELAY);
+ //
+ // Set RX & TX FIFO full threshold to 1 byte
+ //
+ MmioWrite32 (I2cBaseAddress + R_IC_RX_TL, 0);
+ MmioWrite32 (I2cBaseAddress + R_IC_TX_TL, 0);
+ MicroSecondDelay (I2C_ROUTINE_DELAY);
+ //
+ // Set I2C Mode
+ //
+ MmioWrite32 (I2cBaseAddress + R_IC_CON, I2cMode);
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - I2cMode: 0x%04x\r\n", __FUNCTION__, __LINE__, I2cMode));
+ MicroSecondDelay (I2C_ROUTINE_DELAY);
+ //
+ // Enable I2C controller
+ //
+ Status = I2cEnable (I2cBaseAddress);
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - I2cEnable Status = %r\n", __FUNCTION__, __LINE__, Status));
+ if (EFI_ERROR (Status)) {
+ goto Exit;
+ }
+ MicroSecondDelay (I2C_ROUTINE_DELAY);
+ //
+ // Clear TX abort
//
- // Select the frequency counter
- // Enable restart condition,
- // Enable master FSM, disable slave FSM
+ I2cClearTxAbort (I2cBaseAddress);
+ MicroSecondDelay (I2C_ROUTINE_DELAY);
//
- *I2cMode |= B_IC_RESTART_EN | B_IC_SLAVE_DISABLE | B_MASTER_MODE;
- DEBUG ((DEBUG_INFO, "I2cBusFrequencySet R_IC_SDA_HOLD: 0x%08X\r\n", MmioRead32 (I2CBaseAddress + R_IC_SDA_HOLD)));
- DEBUG ((DEBUG_INFO, "I2cBusFrequencySet I2cMode: 0x%04X\r\n", *I2cMode));
+ // Clear interrupts
+ //
+ I2cClearInterrupts (I2cBaseAddress);
+ MicroSecondDelay (I2C_ROUTINE_DELAY);
- return EFI_SUCCESS;
+Exit:
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - Ending with %r\n", __FUNCTION__, __LINE__, Status));
+ }
+ return Status;
}
-/**
- Initializes the host controller to execute I2C commands.
-
- @param[in] BusNo - I2C Bus number to which the I2C device has been connected
- @param[in] SlaveAddress - Slave address of the I2C device
- @param[out] I2CBaseAddress - Return BAR0 address of I2C host controller
-
- @retval EFI_SUCCESS - Initialization on the I2C host controller completed.
- @retval EFI_INVALID_PARAMETER - Invalid slave address
- @retval EFI_DEVICE_ERROR - Operation failed, device error
- @retval Others - Failed to initialize I2C host controller
-**/
+//
+// Desc: Write a byte to the I2C controller
+// Input: I2cBaseAddress - MMIO base address for the I2C controller
+// Data - Data from the I2C controller
+// Start - Send start bit?
+// End - Send end bit?
+// Output: EFI_SUCCESS - Write completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
EFI_STATUS
-I2CInit (
- IN UINT8 BusNo,
- IN UINT16 SlaveAddress,
- OUT UINTN *I2CBaseAddress
+I2cSendCommand (
+ IN UINT32 I2cBaseAddress,
+ IN UINT32 *Data,
+ IN BOOLEAN Start,
+ IN BOOLEAN End
)
{
- EFI_STATUS Status;
- UINT32 NumTries;
- UINT16 I2cMode;
- UINTN PciMmBase;
- UINTN BaseAddress;
+ BOOLEAN CommandSent;
+ UINT32 Count;
+ UINT32 CountOut;
+ UINT32 Data32;
+ BOOLEAN ReadFlag;
+ EFI_STATUS Status;
+ UINT16 TxAbortStatus;
//
- // Verify the parameters
+ // Initialize variables
//
- if (1023 < SlaveAddress) {
- Status = EFI_INVALID_PARAMETER;
- DEBUG ((DEBUG_INFO, "I2cStartRequest Exit with Status %r\r\n", Status));
- return Status;
+ CommandSent = FALSE;
+ Count = 0;
+ CountOut = 0x00000100;
+ Status = EFI_NOT_READY;
+ if ((*Data & B_READ_CMD) == B_READ_CMD) {
+ ReadFlag = TRUE;
+ } else {
+ ReadFlag = FALSE;
}
- PciMmBase = MmPciAddress (
- mLpssPciDeviceList[BusNo].Segment,
- mLpssPciDeviceList[BusNo].BusNum,
- mLpssPciDeviceList[BusNo].DeviceNum,
- mLpssPciDeviceList[BusNo].FunctionNum,
- 0
- );
-
- BaseAddress = MmioRead32 (PciMmBase + R_LPSS_IO_BAR) & B_LPSS_IO_BAR_BA;
+ //
+ // Send a command byte
+ //
+ while (CountOut-- > 0) {
+ //
+ // Check for NACK
+ //
+ if ((I2cGetRawStatus (I2cBaseAddress) & I2C_INTR_TX_ABRT) != 0) {
+ TxAbortStatus = I2cGetTxAbortStatus (I2cBaseAddress);
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - TX ABRT [%04x]\n", __FUNCTION__, __LINE__, TxAbortStatus));
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - RX FIFO = %04x\n", __FUNCTION__, __LINE__, I2cGetRxFifo (I2cBaseAddress)));
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - TX FIFO = %04x\n", __FUNCTION__, __LINE__, I2cGetTxFifo (I2cBaseAddress)));
+ //
+ // Clear TX Abort
+ //
+ I2cClearTxAbort (I2cBaseAddress);
+ MicroSecondDelay (I2C_WRITE_TIMEOUT);
+ //
+ // Clear interrupts
+ //
+ I2cClearInterrupts (I2cBaseAddress);
+ MicroSecondDelay (I2C_WRITE_TIMEOUT);
+ //
+ // Set status
+ //
+ if (TxAbortStatus & (I2C_ABRT_7B_ADDR_NOACK | I2C_ABRT_10ADDR1_NOACK | I2C_ABRT_10ADDR2_NOACK)) {
+ DEBUG ((DEBUG_ERROR, "%a(#%4d) - Nobody home!\n", __FUNCTION__, __LINE__));
+ Status = EFI_NO_RESPONSE;
+ } else {
+ Status = EFI_DEVICE_ERROR;
+ }
+ goto Exit;
+ }
+ //
+ // Determine if another byte was received and we were expecting it
+ //
+ if (((I2cGetStatus (I2cBaseAddress) & STAT_RFNE) != 0) && ReadFlag) {
+ *Data = MmioRead32 (I2cBaseAddress + R_IC_DATA_CMD) & 0xFF;
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - MmioRead32, byte 0x%02x was received [%d:%d]\n", __FUNCTION__, __LINE__, *Data, Start, End));
+ MicroSecondDelay (FIFO_WRITE_DELAY);
+ //
+ // Now empty the RX FIFO if stop bit set
+ //
+ while (End && ((I2cGetStatus (I2cBaseAddress) & STAT_RFNE) == STAT_RFNE)) {
+ MmioRead32 (I2cBaseAddress + R_IC_DATA_CMD);
+ MicroSecondDelay (FIFO_WRITE_DELAY);
+ }
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - RX FIFO = %04x\n", __FUNCTION__, __LINE__, I2cGetRxFifo (I2cBaseAddress)));
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - TX FIFO = %04x\n", __FUNCTION__, __LINE__, I2cGetTxFifo (I2cBaseAddress)));
+ Status = EFI_SUCCESS;
+ goto Exit;
+ }
+ //
+ // Wait for room in TX buffer
+ //
+ if ((I2cGetStatus (I2cBaseAddress) & STAT_TFNF) == 0) {
+ MicroSecondDelay (FIFO_WRITE_DELAY);
+ continue;
+ }
+ if (!CommandSent) {
+ //
+ // Send CMD
+ //
+ Data32 = *Data;
+ if (Start) Data32 |= B_CMD_RESTART;
+ if (End) Data32 |= B_CMD_STOP;
+ MmioWrite32 (I2cBaseAddress + R_IC_DATA_CMD, Data32);
+ CommandSent = TRUE;
+ }
+ //
+ // Add a small delay to work around some odd behavior being seen. Without this delay bytes get dropped.
+ //
+ MicroSecondDelay (I2C_WRITE_TIMEOUT);
+ //
+ // Time out check for write CMD
+ //
+ while (!ReadFlag) {
+ if ((I2cGetRawStatus (I2cBaseAddress) & I2C_INTR_TX_ABRT) != 0) {
+ TxAbortStatus = I2cGetTxAbortStatus (I2cBaseAddress);
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - TX ABRT [%04x]\n", __FUNCTION__, __LINE__, TxAbortStatus));
+ //
+ // Clear TX Abort
+ //
+ I2cClearTxAbort (I2cBaseAddress);
+ MicroSecondDelay (I2C_WRITE_TIMEOUT);
+ //
+ // Clear interrupts
+ //
+ I2cClearInterrupts (I2cBaseAddress);
+ MicroSecondDelay (I2C_WRITE_TIMEOUT);
+ //
+ // Set status
+ //
+ if (TxAbortStatus & (I2C_ABRT_7B_ADDR_NOACK | I2C_ABRT_10ADDR1_NOACK | I2C_ABRT_10ADDR2_NOACK)) {
+ DEBUG ((DEBUG_ERROR, "%a(#%4d) - Nobody home!\n", __FUNCTION__, __LINE__));
+ Status = EFI_NO_RESPONSE;
+ } else {
+ Status = EFI_DEVICE_ERROR;
+ }
+ }
+ if (I2cGetTxFifo (I2cBaseAddress) == 0) {
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - MmioRead32, byte 0x%04x was sent [%d:%d]\n", __FUNCTION__, __LINE__, Data32, Start, End));
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - RX FIFO = %04x\n", __FUNCTION__, __LINE__, I2cGetRxFifo (I2cBaseAddress)));
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - TX FIFO = %04x\n", __FUNCTION__, __LINE__, I2cGetTxFifo (I2cBaseAddress)));
+ Status = EFI_SUCCESS;
+ goto Exit;
+ }
+ MicroSecondDelay (I2C_WRITE_TIMEOUT);
+ if (Count++ < 1024) { //to avoid sys hung without ul-pmc device on RVP
+ continue; //Waiting the last request to get data and make (ReceiveDataEnd > ReadBuffer) =TRUE.
+ } else {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - hardware timeout, 1024 times try!\n", __FUNCTION__, __LINE__));
+ Status = EFI_TIMEOUT;
+ goto Exit;
+ }
+ }
+ }
//
- // Skip reinit if targeting the same I2C bus
+ // Check for count out
//
- if (BaseAddress == mLpssPciDeviceList[BusNo].Bar0) {
- MmioWrite32 (BaseAddress + R_IC_TAR, SlaveAddress);
- *I2CBaseAddress = BaseAddress;
- return EFI_SUCCESS;
+ if (CountOut == 0) {
+ Status = EFI_TIMEOUT;
}
- Status = ProgramPciLpssI2C (BusNo);
- if (Status != EFI_SUCCESS) {
- DEBUG((DEBUG_ERROR, "ProgramPciLpssI2C failed ! %r\r\n", Status));
- return Status;
+Exit:
+ //
+ // Pause a bit
+ //
+ MicroSecondDelay (I2C_ROUTINE_DELAY);
+ //
+ // Display error messages
+ //
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - Ending with %r [%x]\n", __FUNCTION__, __LINE__, Status, CountOut));
}
+ return Status;
+}
- BaseAddress = (UINT32) mLpssPciDeviceList[BusNo].Bar0;
- DEBUG ((DEBUG_INFO, "I2CBaseAddress = 0x%x \n", BaseAddress));
+//
+// Desc: Set I2C target slave offset
+// Input: I2cBaseAddress - MMIO base address for the I2C controller
+// Offset - Pointer to offset data
+// Size - Size of the offset data
+// Output: EFI_SUCCESS - Write completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
+EFI_STATUS
+I2cSetOffset (
+ IN UINT32 I2cBaseAddress,
+ IN UINT8 *Offset,
+ IN UINT8 Size
+ )
+{
+ UINT8 index;
+ EFI_STATUS Status;
- NumTries = 10000; // 1 seconds
- while ((STAT_MST_ACTIVITY == (MmioRead32 (BaseAddress + R_IC_STATUS) & STAT_MST_ACTIVITY))) {
- MicroSecondDelay (10);
- NumTries --;
- if (0 == NumTries) {
- DEBUG ((DEBUG_ERROR, "Try timeout\r\n"));
- return EFI_DEVICE_ERROR;
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - Starting\n", __FUNCTION__, __LINE__));
+
+ //
+ // Sanity checks
+ //
+ if (Offset == NULL) {
+ Status = EFI_INVALID_PARAMETER;
+ goto Exit;
+ }
+ if (Size == 0) {
+ Status = EFI_INVALID_PARAMETER;
+ goto Exit;
+ }
+ //
+ // Set offset
+ //
+ for (index = 0; index < Size; index++) {
+ if (index == 0) {
+ //
+ // First byte of the offset
+ //
+ Status = I2cWrite (I2cBaseAddress, Offset[index], TRUE, FALSE);
+ } else {
+ Status = I2cWrite (I2cBaseAddress, Offset[index], FALSE, FALSE);
+ }
+ if (EFI_ERROR (Status)) {
+ goto Exit;
}
+ //
+ // Pause a bit
+ //
+ MicroSecondDelay (I2C_WRITE_TIMEOUT);
}
- Status = I2cDisable(BaseAddress);
- DEBUG ((DEBUG_INFO, "I2cDisable Status = %r\r\n", Status));
- I2cBusFrequencySet(BusNo, BaseAddress, &I2cMode); // Set I2cMode
-
- MmioWrite32 (BaseAddress + R_IC_INTR_MASK, 0x0);
- if (0x7f < SlaveAddress) {
- SlaveAddress = (SlaveAddress & 0x3ff) | IC_TAR_10BITADDR_MASTER;
+Exit:
+ //
+ // Pause a bit
+ //
+ MicroSecondDelay (I2C_ROUTINE_DELAY);
+ //
+ // Display error messages
+ //
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - Ending with %r\n", __FUNCTION__, __LINE__, Status));
}
- MmioWrite32 (BaseAddress + R_IC_TAR, SlaveAddress);
- MmioWrite32 (BaseAddress + R_IC_RX_TL, 0);
- MmioWrite32 (BaseAddress + R_IC_TX_TL, 0);
- MmioWrite32 (BaseAddress + R_IC_CON, I2cMode);
- Status = I2cEnable(BaseAddress);
+ return Status;
+}
- DEBUG((DEBUG_INFO, "I2cEnable Status = %r\r\n", Status));
- MmioRead32 (BaseAddress + R_IC_CLR_TX_ABRT);
- *I2CBaseAddress = BaseAddress;
- return EFI_SUCCESS;
+//
+// Desc: Write a byte to the I2C controller
+// Input: I2cBaseAddress - MMIO base address for the I2C controller
+// Data - Data from the I2C controller
+// Start - Send start bit?
+// End - Send end bit?
+// Output: EFI_SUCCESS - Write completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
+EFI_STATUS
+I2cWrite (
+ IN UINT32 I2cBaseAddress,
+ IN UINT8 Data,
+ IN BOOLEAN Start,
+ IN BOOLEAN End
+ )
+{
+ UINT32 Data32;
+ EFI_STATUS Status;
+
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a (#%4d) - Starting\n", __FUNCTION__, __LINE__));
+
+ //
+ // Send CMD for write
+ //
+ Data32 = Data;
+ Status = I2cSendCommand (I2cBaseAddress, &Data32, Start, End);
+ //
+ // Pause a bit
+ //
+ MicroSecondDelay (I2C_ROUTINE_DELAY);
+ //
+ // Display error messages
+ //
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - Ending with %r\n", __FUNCTION__, __LINE__, Status));
+ }
+ return Status;
}
/**
Read bytes from I2C Device
This is actual I2C hardware operation function.
- @param[in] BusNo - I2C Bus number to which the I2C device has been connected
- @param[in] SlaveAddress - Slave address of the I2C device (7-bit)
- @param[in] ReadBytes - Number of bytes to be read
- @param[out] ReadBuffer - Address to which the value read has to be stored
- @param[in] Start - It controls whether a RESTART is issued before the byte is sent or received.
- @param[in] End - It controls whether a STOP is issued after the byte is sent or received.
-
- @retval EFI_SUCCESS - The byte value read successfully
- @retval EFI_DEVICE_ERROR - Operation failed
- @retval EFI_TIMEOUT - Hardware retry timeout
- @retval Others - Failed to read a byte via I2C
+ @param[in] BusNo I2C Bus number to which the I2C device has been connected
+ @param[in] SlaveAddress Slave address of the I2C device (7-bit)
+ @param[in] ReadBytes Number of bytes to be read
+ @param[out] ReadBuffer Address to which the value read has to be stored
+ @param[in] Start It controls whether a RESTART is issued before the byte is sent or received.
+ @param[in] End It controls whether a STOP is issued after the byte is sent or received.
+
+ @retval EFI_SUCCESS The byte value read successfully
+ @retval EFI_DEVICE_ERROR Operation failed
+ @retval EFI_TIMEOUT Hardware retry timeout
+ @retval Others Failed to read a byte via I2C
+
**/
EFI_STATUS
ByteReadI2C_Basic (
@@ -448,104 +1189,51 @@ ByteReadI2C_Basic (
IN UINT8 End
)
{
- EFI_STATUS Status;
- UINT32 I2cStatus;
- UINT16 ReceiveData;
- UINT8 *ReceiveDataEnd;
- UINT8 *ReceiveRequest;
- UINT16 raw_intr_stat;
- UINT32 Count = 0;
- UINTN I2CBaseAddress;
- UINT8 *ReadPtr;
+ UINT32 I2cBaseAddress;
+ UINTN index;
+ EFI_STATUS Status;
//
- // Read should always after write, so, base address should already be initialized, then get base address directly
+ // Init I2C controller
//
- I2CBaseAddress = (UINT32) mLpssPciDeviceList[BusNo].Bar0;
- DEBUG ((DEBUG_INFO, "mLpssPciDeviceList returned base address = 0x%08x\n", I2CBaseAddress));
-
- Status = EFI_SUCCESS;
-
- ReceiveDataEnd = &ReadBuffer [ReadBytes];
- ReadPtr = ReadBuffer;
- if (ReadBytes) {
- ReceiveRequest = ReadBuffer;
- //DEBUG((DEBUG_INFO,"Read: ---------------%d bytes to RX\r\n", ReceiveDataEnd - ReceiveRequest));
-
- while ((ReceiveDataEnd > ReceiveRequest) || (ReceiveDataEnd > ReadPtr)) {
- //
- // Check for NACK
- //
- raw_intr_stat = (UINT16)MmioRead32 (I2CBaseAddress + R_IC_RAW_INTR_STAT);
- if (0 != (raw_intr_stat & I2C_INTR_TX_ABRT)) {
- MmioRead32 (I2CBaseAddress + R_IC_CLR_TX_ABRT);
- Status = EFI_DEVICE_ERROR;
- DEBUG ((DEBUG_ERROR, "TX ABRT ,%d bytes hasn't been transferred\r\n", ReceiveDataEnd - ReceiveRequest));
- break;
- }
-
- //
- // Determine if another byte was received
- //
- I2cStatus = (UINT16)MmioRead32 (I2CBaseAddress + R_IC_STATUS);
- if (0 != (I2cStatus & STAT_RFNE)) {
- ReceiveData = (UINT16)MmioRead32 (I2CBaseAddress + R_IC_DATA_CMD);
- *ReadPtr++ = (UINT8)ReceiveData;
- DEBUG ((DEBUG_INFO, "MmioRead32 ,1 byte 0x:%x is received\r\n", ReceiveData));
- }
-
- if (ReceiveDataEnd == ReceiveRequest) {
- MicroSecondDelay (FIFO_WRITE_DELAY);
- Count++;
- if (Count < 1024) { // sys hung avoid no ul-pmc device
- continue; // Waiting the last request to get data and make (ReceiveDataEnd > ReadBuffer) =TRUE.
- } else {
- break;
- }
- }
- //
- // Wait until a read request will fit
- //
- if (0 == (I2cStatus & STAT_TFNF)) {
- MicroSecondDelay (10);
- continue;
- }
+ Status = I2cInit (BusNo, SlaveAddress, Standard_Speed, &I2cBaseAddress);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - I2cInit() = %r\n", __FUNCTION__, __LINE__, Status));
+ goto Exit;
+ }
+ //
+ // Read from I2C device
+ //
+ for (index = 0; index < ReadBytes; index++) {
+ Status = I2cRead (I2cBaseAddress, &ReadBuffer[index], Start, End);
+ if (EFI_ERROR (Status)) {
//
- // Issue the next read request
+ // Something went wrong. Bail from this for loop.
//
- if (End && Start) {
- MmioWrite32 (I2CBaseAddress + R_IC_DATA_CMD, B_READ_CMD|B_CMD_RESTART|B_CMD_STOP);
- } else if (!End && Start) {
- MmioWrite32 (I2CBaseAddress + R_IC_DATA_CMD, B_READ_CMD|B_CMD_RESTART);
- } else if (End && !Start) {
- MmioWrite32 (I2CBaseAddress + R_IC_DATA_CMD, B_READ_CMD|B_CMD_STOP);
- } else if (!End && !Start) {
- MmioWrite32 (I2CBaseAddress + R_IC_DATA_CMD, B_READ_CMD);
- }
- MicroSecondDelay (FIFO_WRITE_DELAY); //wait after send cmd
-
- ReceiveRequest += 1;
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - I2cRead() = %r\n", __FUNCTION__, __LINE__, Status));
+ break;
}
}
+Exit:
return Status;
-
}
/**
Write bytes to I2C Device
This is actual I2C hardware operation function.
- @param[in] BusNo - I2C Bus number to which the I2C device has been connected
- @param[in] SlaveAddress - Slave address of the I2C device (7-bit)
- @param[in] WriteBytes - Number of bytes to be written
- @param[in] WriteBuffer - Address to which the byte value has to be written
- @param[in] Start - It controls whether a RESTART is issued before the byte is sent or received.
- @param[in] End - It controls whether a STOP is issued after the byte is sent or received.
-
- @retval EFI_SUCCESS - The byte value written successfully
- @retval EFI_DEVICE_ERROR - Operation failed
- @retval EFI_TIMEOUT - Hardware retry timeout
- @retval Others - Failed to write a byte via I2C
+ @param[in] BusNo I2C Bus number to which the I2C device has been connected
+ @param[in] SlaveAddress Slave address of the I2C device (7-bit)
+ @param[in] WriteBytes Number of bytes to be written
+ @param[in] WriteBuffer Address to which the byte value has to be written
+ @param[in] Start It controls whether a RESTART is issued before the byte is sent or received.
+ @param[in] End It controls whether a STOP is issued after the byte is sent or received.
+
+ @retval EFI_SUCCESS The byte value written successfully
+ @retval EFI_DEVICE_ERROR Operation failed
+ @retval EFI_TIMEOUT Hardware retry timeout
+ @retval Others Failed to write a byte via I2C
+
**/
EFI_STATUS
ByteWriteI2C_Basic (
@@ -557,104 +1245,47 @@ ByteWriteI2C_Basic (
IN UINT8 End
)
{
- UINT16 Data16;
- EFI_STATUS Status;
- UINT32 I2cStatus;
- UINT8 *TransmitPtr;
- UINT8 *TransmitEnd;
- UINT16 raw_intr_stat;
- UINT32 Count=0;
- UINTN I2CBaseAddress;
-
- Status = I2CInit (BusNo, SlaveAddress, &I2CBaseAddress);
- if (Status != EFI_SUCCESS) {
- DEBUG ((DEBUG_ERROR, "I2CInit failed ! %r\r\n", Status));
- return Status;
- }
- DEBUG ((DEBUG_INFO, "I2CInit returned base address = 0x%08x\n", I2CBaseAddress));
-
- TransmitPtr = WriteBuffer;
- TransmitEnd = &WriteBuffer [WriteBytes];
- if (WriteBytes) {
- raw_intr_stat = (UINT16)MmioRead32 (I2CBaseAddress + R_IC_RAW_INTR_STAT);
- if (0 != (raw_intr_stat & I2C_INTR_TX_ABRT)) {
- MmioRead32 (I2CBaseAddress + R_IC_CLR_TX_ABRT);
- DEBUG ((DEBUG_ERROR, "%a(#%d) - raw_intr_stat = %04x\n", __FUNCTION__, __LINE__, TransmitEnd, TransmitPtr, raw_intr_stat));
- }
-
- //DEBUG ((DEBUG_INFO, "Write: --------------%d bytes to TX\r\n", TransmitEnd - WriteBuffer));
- while (TransmitEnd > TransmitPtr) {
- I2cStatus = MmioRead32 (I2CBaseAddress + R_IC_STATUS);
- raw_intr_stat = (UINT16)MmioRead32 (I2CBaseAddress + R_IC_RAW_INTR_STAT);
- if (0 != (raw_intr_stat & I2C_INTR_TX_ABRT)) {
- MmioRead32 (I2CBaseAddress + R_IC_CLR_TX_ABRT);
- Status = EFI_DEVICE_ERROR;
- DEBUG ((DEBUG_ERROR, "%a(#%d) - TX ABRT TransmitEnd:0x%x WritePtr:0x%x\r\n", __FUNCTION__, __LINE__, TransmitEnd, TransmitPtr));
- break;
- }
- if (0 == (I2cStatus & STAT_TFNF)) {
- MicroSecondDelay (FIFO_WRITE_DELAY);
- continue;
- }
-
- Data16 = (UINT16) *TransmitPtr;
- if (End && Start) {
- Data16 |= (B_CMD_RESTART | B_CMD_STOP);
- } else if (!End && Start) {
- Data16 |= B_CMD_RESTART;
- } else if (End && !Start) {
- Data16 |= B_CMD_STOP;
- }
- Data16 = MmioWrite16 (I2CBaseAddress + R_IC_DATA_CMD, Data16);
- TransmitPtr++;
+ UINT32 I2cBaseAddress;
+ UINTN index;
+ EFI_STATUS Status;
+ //
+ // Init I2C controller
+ //
+ Status = I2cInit (BusNo, SlaveAddress, Standard_Speed, &I2cBaseAddress);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - I2cInit() = %r\n", __FUNCTION__, __LINE__, Status));
+ goto Exit;
+ }
+ //
+ // Write to I2C device
+ //
+ for (index = 0; index < WriteBytes; index++) {
+ Status = I2cWrite (I2cBaseAddress, WriteBuffer[index], Start, End);
+ if (EFI_ERROR (Status)) {
//
- // Add a small delay to work around some odd behavior being seen. Without this delay bytes get dropped.
- //
- MicroSecondDelay (FIFO_WRITE_DELAY);
- //
- // Time out
+ // Something went wrong. Bail from this for loop.
//
- while (1) {
- raw_intr_stat = MmioRead16 (I2CBaseAddress + R_IC_RAW_INTR_STAT);
- if (0 != ( raw_intr_stat & I2C_INTR_TX_ABRT)) {
- MmioRead16 (I2CBaseAddress + R_IC_CLR_TX_ABRT);
- Status = EFI_DEVICE_ERROR;
- DEBUG ((DEBUG_ERROR, "TX ABRT TransmitEnd:0x%x WriteBuffer:0x%x\r\n", TransmitEnd, WriteBuffer));
- }
- if (0 == MmioRead16(I2CBaseAddress + R_IC_TXFLR)) break;
-
- MicroSecondDelay (FIFO_WRITE_DELAY);
- Count++;
- if (Count < 1024) { //to avoid sys hung without ul-pmc device on RVP
- continue; //Waiting the last request to get data and make (ReceiveDataEnd > ReadBuffer) =TRUE.
- } else {
- DEBUG ((DEBUG_ERROR, "hardware timeout, 1024 times try!\r\n"));
- Status = EFI_TIMEOUT;
- break;
- }
- }//while( 1 )
-
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - I2cWrite() = %r\n", __FUNCTION__, __LINE__, Status));
+ break;
}
-
}
- if (EFI_ERROR (Status))
- DEBUG ((DEBUG_ERROR, "I2cStartRequest Exit with Status %r\r\n", Status));
-
+Exit:
return Status;
}
/**
Read bytes from I2C Device
- @param[in] BusNo - I2C Bus number to which the I2C device has been connected
- @param[in] SlaveAddress - Slave address of the I2C device (7-bit)
- @param[in] Offset - Register offset from which the data has to be read
- @param[in] ReadBytes - Number of bytes to be read
- @param[out] ReadBuffer - Address to which the value read has to be stored
+ @param[in] BusNo I2C Bus number to which the I2C device has been connected
+ @param[in] SlaveAddress Slave address of the I2C device (7-bit)
+ @param[in] Offset Register offset from which the data has to be read
+ @param[in] ReadBytes Number of bytes to be read
+ @param[out] ReadBuffer Address to which the value read has to be stored
+
+ @retval EFI_SUCCESS Read bytes from I2C device successfully
+ @retval Others Return status depends on ByteReadI2C_Basic
- @retval EFI_SUCCESS - Read bytes from I2C device successfully
- @retval Others - Return status depends on ByteReadI2C_Basic
**/
EFI_STATUS
ByteReadI2C (
@@ -665,33 +1296,47 @@ ByteReadI2C (
OUT UINT8 *ReadBuffer
)
{
+ UINT32 I2cBaseAddress;
EFI_STATUS Status;
- //DEBUG ((EFI_D_INFO, "ByteReadI2C:---offset:0x%x\n",Offset));
- Status = ByteWriteI2C_Basic (BusNo, SlaveAddress, 1, &Offset, TRUE, FALSE);
- if (!EFI_ERROR (Status)) {
- Status = ByteReadI2C_Basic (BusNo, SlaveAddress, ReadBytes, ReadBuffer, TRUE, TRUE);
- } else {
- DEBUG ((DEBUG_ERROR, "ByteReadI2C/ByteWriteI2C_Basic: %r\n", Status));
+ //
+ // Init I2C controller
+ //
+ Status = I2cInit (BusNo, SlaveAddress, Standard_Speed, &I2cBaseAddress);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - I2cInit() = %r\n", __FUNCTION__, __LINE__, Status));
+ goto Exit;
+ }
+ //
+ // Set offset
+ //
+ Status = I2cSetOffset (I2cBaseAddress, &Offset, 1);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - I2cSetOffset() = %r [%02x:%02x:%04x]\n", __FUNCTION__, __LINE__, Status, BusNo, SlaveAddress, Offset));
+ goto Exit;
}
+ Status = ByteReadI2C_Basic (BusNo, SlaveAddress, ReadBytes, ReadBuffer, TRUE, TRUE);
if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "ByteReadI2C: %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - ByteReadI2C_Basic() = %r\n", __FUNCTION__, __LINE__, Status));
+ goto Exit;
}
+Exit:
return Status;
}
/**
Write bytes to I2C Device
- @param[in] BusNo - I2C Bus number to which the I2C device has been connected
- @param[in] SlaveAddress - Slave address of the I2C device (7-bit)
- @param[in] Offset - Register offset from which the data has to be read
- @param[in] WriteBytes - Number of bytes to be written
- @param[in] WriteBuffer - Address to which the byte value has to be written
+ @param[in] BusNo I2C Bus number to which the I2C device has been connected
+ @param[in] SlaveAddress Slave address of the I2C device (7-bit)
+ @param[in] Offset Register offset from which the data has to be read
+ @param[in] WriteBytes Number of bytes to be written
+ @param[in] WriteBuffer Address to which the byte value has to be written
+
+ @retval EFI_SUCCESS Write bytes to I2C device successfully
+ @retval Others Return status depends on ByteWriteI2C_Basic
- @retval EFI_SUCCESS - Write bytes to I2C device successfully
- @retval Others - Return status depends on ByteWriteI2C_Basic
**/
EFI_STATUS
ByteWriteI2C (
@@ -702,18 +1347,32 @@ ByteWriteI2C (
IN UINT8 *WriteBuffer
)
{
+ UINT32 I2cBaseAddress;
EFI_STATUS Status;
- //DEBUG ((EFI_D_INFO, "ByteWriteI2C:---offset/bytes/buf:0x%x,0x%x,0x%x,0x%x\n",Offset,WriteBytes,WriteBuffer,*WriteBuffer));
- Status = ByteWriteI2C_Basic (BusNo, SlaveAddress, 1, &Offset, TRUE, FALSE);
- if (!EFI_ERROR (Status)) {
- Status = ByteWriteI2C_Basic (BusNo, SlaveAddress, WriteBytes, WriteBuffer, FALSE, TRUE);
- } else {
- DEBUG ((DEBUG_ERROR, "ByteWriteI2C/ByteWriteI2C_Basic: %r\n", Status));
+ //
+ // Init I2C controller
+ //
+ Status = I2cInit (BusNo, SlaveAddress, Standard_Speed, &I2cBaseAddress);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - I2cInit() = %r\n", __FUNCTION__, __LINE__, Status));
+ goto Exit;
+ }
+ //
+ // Set offset
+ //
+ Status = I2cSetOffset (I2cBaseAddress, &Offset, 1);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - I2cSetOffset() = %r [%02x:%02x:%04x]\n", __FUNCTION__, __LINE__, Status, BusNo, SlaveAddress, Offset));
+ goto Exit;
}
+ Status = ByteWriteI2C_Basic (BusNo, SlaveAddress, WriteBytes, WriteBuffer, FALSE, TRUE);
if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "ByteWriteI2C: %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "%a (#%4d) - ByteWriteI2C_Basic() = %r\n", __FUNCTION__, __LINE__, Status));
+ goto Exit;
}
+Exit:
return Status;
}
+
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLib/I2CLib.inf b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLib/I2CLib.inf
index 81fe55a..fb9210d 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLib/I2CLib.inf
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLib/I2CLib.inf
@@ -1,50 +1,45 @@
-### @file
-# Dxe library for I2C bus driver.
+## @file
+# Library producing I2C functionality.
#
-#@copyright
-# Copyright (c) 2010 - 2018 Intel Corporation. All rights reserved
+# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
+# which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php.
#
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-###
+#
+##
[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = I2CLib
- FILE_GUID = 7f62bf44-2ba7-4c2d-9d4a-91c8906ff053
- MODULE_TYPE = BASE
+ INF_VERSION = 0x00010017
+ BASE_NAME = I2cLib
+ FILE_GUID = BF7853AF-54D6-4CA5-8449-D8E43CF13D10
VERSION_STRING = 1.0
- LIBRARY_CLASS = I2CLib
-# CONSTRUCTOR = IntelI2CLibConstructor
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-# VALID_ARCHITECTURES = IA32 X64 IPF EBC
-#
+ MODULE_TYPE = BASE
+ LIBRARY_CLASS = I2cLib
-[Sources.common]
- I2CLib.c
+[Depex]
+ TRUE
[LibraryClasses]
BaseLib
- IoLib
+ DebugLib
+ GpioLib
+ PcdLib
TimerLib
[Packages]
MdePkg/MdePkg.dec
+ MdeModulePkg/MdeModulePkg.dec
BroxtonSiPkg/BroxtonSiPkg.dec
-[Protocols]
-
[Pcd]
- gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress ## SOMETIMES_CONSUMES
gEfiBxtTokenSpaceGuid.PcdPmcGcrBaseAddress ## SOMETIMES_CONSUMES
+ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress ## SOMETIMES_CONSUMES
-
-
+[Sources]
+ I2cLib.c
+ I2cLib.h
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CAccess.h b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CAccess.h
deleted file mode 100644
index 792a483..0000000
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CAccess.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-/** @file
- Macros that simplify accessing I2C device's registers.
-
- Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
-
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#ifndef _I2C_ACCESS_H_
-#define _I2C_ACCESS_H_
-
-///
-/// Memory Mapped PCI Access macros
-///
-
-#include "I2CIoLibPei.h"
-
-#define DEFAULT_PCI_BUS_NUMBER_SC 0
-
-#define PCI_DEVICE_NUMBER_LPC 31
-#define PCI_FUNCTION_NUMBER_LPC 0
-
-#define R_LPC_ACPI_BASE 0x40 ///< ABASE, 16bit
-#define R_LPC_ACPI_BASEADR 0x400 ///< ABASE, 16bit
-#define B_LPC_ACPI_BASE_EN BIT1 ///< Enable Bit
-#define B_LPC_ACPI_BASE_BAR 0x0000FF80 ///< Base Address, 128 Bytes
-#define V_ACPI_PM1_TMR_MAX_VAL 0x1000000 ///< The timer is 24 bit overflow
-#define B_ACPI_PM1_TMR_VAL 0xFFFFFF ///< The timer value mask
-
-#define R_ACPI_PM1_TMR 0x08 ///< Power Management 1 Timer
-#define V_ACPI_PM1_TMR_FREQUENCY 3579545 ///< Timer Frequency
-
-
-#define ScLpcPciCfg8(Register) I2CLibPeiMmioRead8 (MmPciAddress (0, DEFAULT_PCI_BUS_NUMBER_SC, PCI_DEVICE_NUMBER_LPC, 0, Register))
-
-#define MmPciAddress( Segment, Bus, Device, Function, Register ) \
- ( (UINTN)PcdGet64 (PcdPciExpressBaseAddress)+ \
- (UINTN)(Bus << 20) + \
- (UINTN)(Device << 15) + \
- (UINTN)(Function << 12) + \
- (UINTN)(Register) \
- )
-#endif
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CDelayPei.h b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CDelayPei.h
deleted file mode 100644
index 53ab6e0..0000000
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CDelayPei.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/** @file
- imer prototype for I2C Pei Library.
-
- Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
-
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#ifndef _I2C_DELAY_PEI_
-#define _I2C_DELAY_PEI_
-
-#include <PiPei.h>
-
-/**
- Stalls the CPU for at least the given number of microseconds.
-
- @param[in] MicroSeconds The minimum number of microseconds to delay.
-
- @retval EFI_SUCCESS Time delay successfully
-**/
-EFI_STATUS
-EFIAPI
-MicroSecondDelay (
- IN UINTN MicroSeconds
- );
-
-#endif
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CIoLibPei.c b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CIoLibPei.c
deleted file mode 100644
index f4cc843..0000000
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CIoLibPei.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/** @file
- IO instance for I2C Pei Library.
-
- Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
-
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <PiPei.h>
-#include <Library/DebugLib.h>
-#include <Library/PeiServicesTablePointerLib.h>
-
-
-/**
- Reads an 8-bit MMIO register.
-
- Reads the 8-bit MMIO register specified by Address. The 8-bit read value is
- returned. This function must guarantee that all MMIO read and write
- operations are serialized.
-
- If 8-bit MMIO register operations are not supported, then ASSERT().
-
- @param[in] Address - The MMIO register to read.
-
- @retval UINT8 - The UINT8 value read.
-**/
-UINT8
-EFIAPI
-I2CLibPeiMmioRead8 (
- IN UINTN Address
- )
-{
- UINT8 Value;
-
- Value = *(volatile UINT8*)Address;
- return Value;
-}
-
-/**
- Reads a 16-bit MMIO register.
-
- Reads the 16-bit MMIO register specified by Address. The 16-bit read value is
- returned. This function must guarantee that all MMIO read and write
- operations are serialized.
-
- If 16-bit MMIO register operations are not supported, then ASSERT().
- If Address is not aligned on a 16-bit boundary, then ASSERT().
-
- @param[in] Address - The MMIO register to read.
-
- @retval UINT16 - The UINT16 value read.
-**/
-UINT16
-EFIAPI
-I2CLibPeiMmioRead16 (
- IN UINTN Address
- )
-{
- UINT16 Value;
-
- ASSERT ((Address & 1) == 0);
- Value = *(volatile UINT16*)Address;
- return Value;
-}
-
-/**
- Writes a 16-bit MMIO register.
-
- Writes the 16-bit MMIO register specified by Address with the value specified
- by Value and returns Value. This function must guarantee that all MMIO read
- and write operations are serialized.
-
- If 16-bit MMIO register operations are not supported, then ASSERT().
- If Address is not aligned on a 16-bit boundary, then ASSERT().
-
- @param[in] Address - The MMIO register to write.
- @param[in] Value - The value to write to the MMIO register.
-
- @retval UINT16 - The UINT16 value written.
-**/
-UINT16
-EFIAPI
-I2CLibPeiMmioWrite16 (
- IN UINTN Address,
- IN UINT16 Value
- )
-{
- ASSERT ((Address & 1) == 0);
- *(volatile UINT16*)Address = Value;
- return Value;
-}
-
-/**
- Reads a 32-bit MMIO register.
-
- Reads the 32-bit MMIO register specified by Address. The 32-bit read value is
- returned. This function must guarantee that all MMIO read and write
- operations are serialized.
-
- If 32-bit MMIO register operations are not supported, then ASSERT().
- If Address is not aligned on a 32-bit boundary, then ASSERT().
-
- @param[in] Address - The MMIO register to read.
-
- @retval UINT32 - The UINT32 value read.
-
-**/
-UINT32
-EFIAPI
-I2CLibPeiMmioRead32 (
- IN UINTN Address
- )
-{
- UINT32 Value;
-
- ASSERT ((Address & 3) == 0);
- Value = *(volatile UINT32*)Address;
-
- return Value;
-}
-
-/**
- Writes a 32-bit MMIO register.
-
- Writes the 32-bit MMIO register specified by Address with the value specified
- by Value and returns Value. This function must guarantee that all MMIO read
- and write operations are serialized.
-
- If 32-bit MMIO register operations are not supported, then ASSERT().
- If Address is not aligned on a 32-bit boundary, then ASSERT().
-
- @param[in] Address - The MMIO register to write.
- @param[in] Value - The value to write to the MMIO register.
-
- @retval UINT32 - The UINT32 value written.
-**/
-UINT32
-EFIAPI
-I2CLibPeiMmioWrite32 (
- IN UINTN Address,
- IN UINT32 Value
- )
-{
- ASSERT ((Address & 3) == 0);
- *(volatile UINT32*)Address = Value;
- return Value;
-}
-
-/**
- Do logical OR operation with the value read from the 32-bit MMIO register
- and write it back to 32-bit MMIO register.
-
- @param[in] Address - The MMIO register to write.
- @param[in] OrData - The value to do logical OR operation with the value read from the MMIO register.
-
- @retval UINT32 - The final value written to the MMIO register.
-**/
-UINT32
-EFIAPI
-I2CLibPeiMmioOr32 (
- IN UINTN Address,
- IN UINT32 OrData
- )
-{
- return I2CLibPeiMmioWrite32 (Address, I2CLibPeiMmioRead32 (Address) | OrData);
-}
-
-
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CIoLibPei.h b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CIoLibPei.h
deleted file mode 100644
index 0ea1727..0000000
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CIoLibPei.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/** @file
- IO prototype for I2C Pei Library.
-
- Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
-
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#ifndef _I2C_IOLIB_PEI_
-#define _I2C_IOLIB_PEI_
-
-#include <PiPei.h>
-
-/**
- Reads an 8-bit MMIO register.
-
- Reads the 8-bit MMIO register specified by Address. The 8-bit read value is
- returned. This function must guarantee that all MMIO read and write
- operations are serialized.
-
- If 8-bit MMIO register operations are not supported, then ASSERT().
-
- @param[in] Address - The MMIO register to read.
-
- @retval UINT8 - The UINT8 value read.
-**/
-UINT8
-EFIAPI
-I2CLibPeiMmioRead8 (
- IN UINTN Address
- );
-
-
-/**
- Reads a 16-bit MMIO register.
-
- Reads the 16-bit MMIO register specified by Address. The 16-bit read value is
- returned. This function must guarantee that all MMIO read and write
- operations are serialized.
-
- If 16-bit MMIO register operations are not supported, then ASSERT().
- If Address is not aligned on a 16-bit boundary, then ASSERT().
-
- @param[in] Address - The MMIO register to read.
-
- @retval UINT16 - The UINT16 value read.
-**/
-UINT16
-EFIAPI
-I2CLibPeiMmioRead16 (
- IN UINTN Address
- );
-
-
-/**
- Writes a 16-bit MMIO register.
-
- Writes the 16-bit MMIO register specified by Address with the value specified
- by Value and returns Value. This function must guarantee that all MMIO read
- and write operations are serialized.
-
- If 16-bit MMIO register operations are not supported, then ASSERT().
- If Address is not aligned on a 16-bit boundary, then ASSERT().
-
- @param[in] Address - The MMIO register to write.
- @param[in] Value - The value to write to the MMIO register.
-
- @retval UINT16 - The UINT16 value written.
-**/
-UINT16
-EFIAPI
-I2CLibPeiMmioWrite16 (
- IN UINTN Address,
- IN UINT16 Value
- );
-
-
-/**
- Reads a 32-bit MMIO register.
-
- Reads the 32-bit MMIO register specified by Address. The 32-bit read value is
- returned. This function must guarantee that all MMIO read and write
- operations are serialized.
-
- If 32-bit MMIO register operations are not supported, then ASSERT().
- If Address is not aligned on a 32-bit boundary, then ASSERT().
-
- @param[in] Address - The MMIO register to read.
-
- @retval UINT32 - The UINT32 value read.
-
-**/
-UINT32
-EFIAPI
-I2CLibPeiMmioRead32 (
- IN UINTN Address
- );
-
-
-/**
- Writes a 32-bit MMIO register.
-
- Writes the 32-bit MMIO register specified by Address with the value specified
- by Value and returns Value. This function must guarantee that all MMIO read
- and write operations are serialized.
-
- If 32-bit MMIO register operations are not supported, then ASSERT().
- If Address is not aligned on a 32-bit boundary, then ASSERT().
-
- @param[in] Address - The MMIO register to write.
- @param[in] Value - The value to write to the MMIO register.
-
- @retval UINT32 - The UINT32 value written.
-**/
-UINT32
-EFIAPI
-I2CLibPeiMmioWrite32 (
- IN UINTN Address,
- IN UINT32 Value
- );
-
-
-/**
- Do logical OR operation with the value read from the 32-bit MMIO register
- and write it back to 32-bit MMIO register.
-
- @param[in] Address - The MMIO register to write.
- @param[in] OrData - The value to do logical OR operation with the value read from the MMIO register.
-
- @retval UINT32 - The final value written to the MMIO register.
-**/
-UINT32
-EFIAPI
-I2CLibPeiMmioOr32 (
- IN UINTN Address,
- IN UINT32 OrData
- );
-
-#endif
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CLibPei.c b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CLibPei.c
deleted file mode 100644
index ad154d5..0000000
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CLibPei.c
+++ /dev/null
@@ -1,665 +0,0 @@
-/** @file
- Pei library for I2C bus driver.
-
- Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
-
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include "I2CDelayPei.h"
-#include "I2CIoLibPei.h"
-#include "I2CAccess.h"
-#include <Library/I2CLib.h>
-#include <PlatformBaseAddresses.h>
-#include <Library/DebugLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/PeiServicesTablePointerLib.h>
-#include <Library/HobLib.h>
-#include <ScRegs/RegsPcu.h>
-#include <ScRegs/RegsPmc.h>
-#include <ScRegs/RegsLpss.h>
-#include <ScRegs/RegsI2c.h>
-
-EFI_GUID mI2CPeiInitGuid = {
- 0x96DED71A, 0xB9E7, 0x4EAD, {0x96, 0x2C, 0x01, 0x69, 0x3C, 0xED, 0x2A, 0x64}
-};
-
-
-#define LPSS_PCI_DEVICE_NUMBER 8
-
-
-#define GPIO_PAD_CFG_DW0_GPIO_124_OFFSET 0x400 ///< This is the first gpio pin of I2C0
-
-/* Name Function Offset of GPIO WEST
- GPIO_124 LPSS_I2C0_SDA 0x400 + 16*0
- GPIO_125 LPSS_I2C0_SCL
-
- GPIO_126 LPSS_I2C1_SDA 0x400 + 16*1
- GPIO_127 LPSS_I2C1_SCL
-
- GPIO_128 LPSS_I2C2_SDA
- GPIO_129 LPSS_I2C2_SCL
-
- GPIO_130 LPSS_I2C3_SDA
- GPIO_131 LPSS_I2C3_SCL
-
- GPIO_132 LPSS_I2C4_SDA
- GPIO_133 LPSS_I2C4_SCL
-
- GPIO_134 LPSS_I2C5_SDA
- GPIO_135 LPSS_I2C5_SCL
-
- GPIO_136 LPSS_I2C6_SDA
- GPIO_137 LPSS_I2C6_SCL
-
- GPIO_138 LPSS_I2C7_SDA 0x400 + 16*7
- GPIO_139 LPSS_I2C7_SCL
-*/
-
-EFI_STATUS
-EFIAPI
-IntelI2CPeiLibConstructor (
- VOID
- )
-{
- UINTN Index;
-//UINT32 Value;
- UINT32 gpio_pad_cfg_dw0_offset;
-
- // Program GPIO pins for I2C 0~7, need to set GPIO to Function 1 and misc settings.
- for (Index = 0; Index < 8; Index ++) {
- // Config I2C[Index] SDA pin DW0
- gpio_pad_cfg_dw0_offset = GPIO_PAD_CFG_DW0_GPIO_124_OFFSET + 16 * Index;
- {
- //Value = 0; // FIXME: the right GPIO setting, need to get updated from GPIO config owner. Dummy code here.
- //SideBandCR32Write (SB_PORTID_GPIOW, gpio_pad_cfg_dw0_offset, Value);
- }
-
- // Config I2C[Index] SDA pin DW1
- gpio_pad_cfg_dw0_offset += 4;
- {
- //Value = 0; // FIXME: the right GPIO setting, need to get updated from GPIO config owner. Dummy code here.
- //SideBandCR32Write (SB_PORTID_GPIOW, gpio_pad_cfg_dw0_offset, Value);
- }
-
- // Config I2C[Index] SCL pin DW0
- gpio_pad_cfg_dw0_offset += 4;
- {
- //Value = 0; // FIXME: the right GPIO setting, need to get updated from GPIO config owner. Dummy code here.
- //SideBandCR32Write (SB_PORTID_GPIOW, gpio_pad_cfg_dw0_offset, Value);
- }
-
- // Config I2C[Index] SCL pin DW1
- gpio_pad_cfg_dw0_offset += 4;
- {
- //Value = 0; // FIXME: the right GPIO setting, need to get updated from GPIO config owner. Dummy code here.
- //SideBandCR32Write (SB_PORTID_GPIOW, gpio_pad_cfg_dw0_offset, Value);
- }
- }
-
- return EFI_SUCCESS;
-}
-
-/**
- Program LPSS I2C PCI controller's BAR0 and enable memory decode.
-
- @retval EFI_SUCCESS - I2C controller's BAR0 is programmed and memory decode enabled.
-**/
-EFI_STATUS
-ProgramPciLpssI2C (
- IN UINT8 BusNo
- )
-{
- UINT32 PmcBase;
- UINT32 DevID;
- UINTN PciMmBase=0;
- UINTN Index;
- UINTN Bar0;
- UINTN Bar1;
-
- DEBUG ((EFI_D_INFO, "Pei ProgramPciLpssI2C() Start\n"));
-
- //
- // Set the BXT Function Disable Register to ZERO
- //
- PmcBase = PMC_BASE_ADDRESS;
-
- if (I2CLibPeiMmioRead32 (PmcBase + R_PMC_FUNC_DIS) &
- (B_PMC_FUNC_DIS_LPSS_I2C0 | B_PMC_FUNC_DIS_LPSS_I2C1 | B_PMC_FUNC_DIS_LPSS_I2C2 | B_PMC_FUNC_DIS_LPSS_I2C3|
- B_PMC_FUNC_DIS_LPSS_I2C4 | B_PMC_FUNC_DIS_LPSS_I2C5 | B_PMC_FUNC_DIS_LPSS_I2C6 | B_PMC_FUNC_DIS_LPSS_I2C7)) {
- I2CLibPeiMmioWrite32 (
- PmcBase + R_PMC_FUNC_DIS,
- I2CLibPeiMmioRead32 (PmcBase + R_PMC_FUNC_DIS) &
- ~(B_PMC_FUNC_DIS_LPSS_I2C0| B_PMC_FUNC_DIS_LPSS_I2C1|B_PMC_FUNC_DIS_LPSS_I2C2| B_PMC_FUNC_DIS_LPSS_I2C3|
- B_PMC_FUNC_DIS_LPSS_I2C4| B_PMC_FUNC_DIS_LPSS_I2C5|B_PMC_FUNC_DIS_LPSS_I2C6| B_PMC_FUNC_DIS_LPSS_I2C7)
- );
-
- DEBUG ((EFI_D_INFO, "ProgramPciLpssI2C() enable all I2C controllers\n"));
- }
-
- for (Index = 0; Index < LPSS_PCI_DEVICE_NUMBER; Index ++) {
- if (Index < 4) {
- PciMmBase = MmPciAddress (
- 0,
- DEFAULT_PCI_BUS_NUMBER_SC,
- PCI_DEVICE_NUMBER_LPSS_I2C0,
- Index,
- 0
- );
- } else {
- PciMmBase = MmPciAddress (
- 0,
- DEFAULT_PCI_BUS_NUMBER_SC,
- PCI_DEVICE_NUMBER_LPSS_I2C1,
- (Index - 4),
- 0
- );
- }
-
- DevID = I2CLibPeiMmioRead32 (PciMmBase);
- Bar0 = LPSS_I2C0_TMP_BAR0 + Index * LPSS_I2C_TMP_BAR0_DELTA;
- Bar1 = Bar0 + LPSS_I2C_TMP_BAR1_OFFSET;
-
- //
- // Check if device present
- //
- if (DevID != 0xFFFFFFFF) {
- if ((I2CLibPeiMmioRead32 (PciMmBase + R_LPSS_I2C_STSCMD) & B_LPSS_I2C_STSCMD_MSE)) {
- //
- // In PEI stage, we always disable Bus master, and memory space enabling for BAR re-programming
- // In DXE stage, will read existing BAR value instead of re-programming
- //
- I2CLibPeiMmioWrite32 ((UINTN) (PciMmBase + R_LPSS_I2C_STSCMD), 0);
- }
- //
- // Program BAR 0
- //
- I2CLibPeiMmioWrite32 ((UINTN) (PciMmBase + R_LPSS_I2C_BAR), (UINT32) (Bar0 & B_LPSS_I2C_BAR_BA));
-
- //
- // Program BAR 1
- //
- I2CLibPeiMmioWrite32 ((UINTN) (PciMmBase + R_LPSS_I2C_BAR1), (UINT32) (Bar1 & B_LPSS_I2C_BAR1_BA));
-
- //
- // Bus Master Enable & Memory Space Enable
- //
- I2CLibPeiMmioWrite32 ((UINTN) (PciMmBase + R_LPSS_I2C_STSCMD), (UINT32) (B_LPSS_I2C_STSCMD_BME | B_LPSS_I2C_STSCMD_MSE));
- }
-
- //
- // Release Resets
- //
- I2CLibPeiMmioWrite32 (Bar0 + R_LPSS_IO_MEM_RESETS, B_LPSS_IO_MEM_HC_RESET_REL | B_LPSS_IO_MEM_iDMA_RESET_REL);
- }
-
- DEBUG ((EFI_D_INFO, "Pei ProgramPciLpssI2C() End\n"));
-
- return EFI_SUCCESS;
-}
-
-/**
- Disable I2C host controller
-
- @param[in] BusNo - I2C Bus number to which the I2C device has been connected
-
- @retval EFI_SUCCESS - I2C host controller is completely inactive.
- @retval EFI_NOT_READY - I2C host controller is still in an enabled state.
-**/
-EFI_STATUS
-I2cDisable (
- IN UINT8 BusNo
- )
-{
- UINTN I2CBaseAddress;
- UINT32 NumTries = 10000; // 0.1 seconds
-
- I2CBaseAddress = (UINT32) LPSS_I2C0_TMP_BAR0 + (BusNo * LPSS_I2C_TMP_BAR0_DELTA);
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_ENABLE, 0);
- while (0 != (I2CLibPeiMmioRead16 (I2CBaseAddress + R_IC_ENABLE) & 1)) {
- MicroSecondDelay (10);
- NumTries--;
- if (NumTries == 0) return EFI_NOT_READY;
- }
- return EFI_SUCCESS;
-}
-
-
-/**
- Enable I2C host controller
-
- @param[in] BusNo - I2C Bus number to which the I2C device has been connected
-
- @retval EFI_SUCCESS - I2C host controller is in an enabled state.
- @retval EFI_NOT_READY - I2C host controller is still inactive.
-**/
-EFI_STATUS
-I2cEnable (
- IN UINT8 BusNo
- )
-{
- UINTN I2CBaseAddress;
- UINT32 NumTries = 10000; //0.1 seconds
-
- I2CBaseAddress = (UINT32) LPSS_I2C0_TMP_BAR0 + (BusNo * LPSS_I2C_TMP_BAR0_DELTA);
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_ENABLE, 1);
- while (0 == (I2CLibPeiMmioRead16 (I2CBaseAddress + R_IC_ENABLE ) & 1)) {
- MicroSecondDelay (10);
- NumTries --;
- if (NumTries == 0) return EFI_NOT_READY;
- }
- return EFI_SUCCESS;
-}
-
-
-/**
- Set the I2C controller bus clock frequency.
-
- The software and controller do a best case effort of using the specified
- frequency for the I2C bus. If the frequency does not match exactly then
- the controller will use a slightly lower frequency for the I2C to avoid
- exceeding the operating conditions for any of the I2C devices on the bus.
- For example if 400 KHz was specified and the controller's divide network
- only supports 402 KHz or 398 KHz then the controller would be set to 398
- KHz. However if the desired frequency is 400 KHz and the controller only
- supports 1 MHz and 100 KHz then this routine would return EFI_UNSUPPORTED.
-
- @param[in] I2CBaseAddress - BAR0 address of I2C host controller
- @param[in] BusClockHertz - New I2C bus clock frequency in Hertz
- @param[out] I2cMode - I2C operation mode.
- Standard Speed: 100 KHz
- Fast Speed : 400 KHz
- High Speed : 3.4 MHz
-
- @retval EFI_SUCCESS - The bus frequency was set successfully.
-**/
-
-EFI_STATUS
-I2cBusFrequencySet (
- IN UINTN I2CBaseAddress,
- IN UINTN BusClockHertz,
- OUT UINT16 *I2cMode,
- IN BOOLEAN DebugFlag
- )
-{
- if (DebugFlag) DEBUG ((EFI_D_INFO, "InputFreq BusClockHertz: %d\r\n", BusClockHertz));
-
- *I2cMode = B_IC_RESTART_EN | B_IC_SLAVE_DISABLE | B_MASTER_MODE;
-
- //
- // Set the 100 KHz clock divider
- // From Table 10 of the I2C specification
- // High: 4.00 uS
- // Low: 4.70 uS
- //
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_SS_SCL_HCNT, (UINT16)0x214);
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_SS_SCL_LCNT, (UINT16)0x272);
-
- //
- // Set the 400 KHz clock divider
- // From Table 10 of the I2C specification
- // High: 0.60 uS
- // Low: 1.30 uS
- //
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_FS_SCL_HCNT, (UINT16)0x50);
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_FS_SCL_LCNT, (UINT16)0xAD);
-
- switch (BusClockHertz) {
- case 100 * 1000:
- I2CLibPeiMmioWrite32 (I2CBaseAddress + R_IC_SDA_HOLD, (UINT16)0x40);//100K
- *I2cMode |= V_SPEED_STANDARD;
- break;
- case 400 * 1000:
- I2CLibPeiMmioWrite32 (I2CBaseAddress + R_IC_SDA_HOLD, (UINT16)0x32);//400K
- *I2cMode |= V_SPEED_FAST;
- break;
- default:
- I2CLibPeiMmioWrite32 (I2CBaseAddress + R_IC_SDA_HOLD, (UINT16)0x09);//3.4M
- *I2cMode |= V_SPEED_HIGH;
- }
-
- return EFI_SUCCESS;
-}
-
-/**
- Initializes the host controller to execute I2C commands.
-
- @param[in] BusNo - I2C Bus number to which the I2C device has been connected
- @param[in] SlaveAddress - Slave address of the I2C device
-
- @retval EFI_SUCCESS - Opcode initialization on the I2C host controller completed.
- @retval EFI_INVALID_PARAMETER - Invalid slave address
- @retval EFI_DEVICE_ERROR - Operation failed, device error
- @retval Others - Failed to initialize I2C host controller
-**/
-EFI_STATUS
-I2CInit (
- IN UINT8 BusNo,
- IN UINT16 SlaveAddress
- )
-{
- EFI_STATUS Status;
- UINT32 NumTries = 0;
- UINTN I2CBaseAddress;
- UINT16 I2cMode;
- UINTN PciMmBase = 0;
- BOOLEAN DebugFlag = TRUE;
-
- if (BusNo < 4) {
- PciMmBase = MmPciAddress (
- 0,
- DEFAULT_PCI_BUS_NUMBER_SC,
- PCI_DEVICE_NUMBER_LPSS_I2C0,
- BusNo,
- 0
- );
- } else {
- PciMmBase = MmPciAddress (
- 0,
- DEFAULT_PCI_BUS_NUMBER_SC,
- PCI_DEVICE_NUMBER_LPSS_I2C1,
- (BusNo - 4),
- 0
- );
- }
-
- I2CBaseAddress = (I2CLibPeiMmioRead32 (PciMmBase + R_LPSS_I2C_BAR) & 0xFFFFFFF8);
-
- //
- // Verify the parameters
- //
- if (1023 < SlaveAddress) {
- Status = EFI_INVALID_PARAMETER;
- if (DebugFlag) DEBUG ((DEBUG_ERROR, "I2cStartRequest Exit with Status %r\r\n", Status));
- return Status;
- }
-
- if (I2CBaseAddress == (LPSS_I2C0_TMP_BAR0 + (BusNo * LPSS_I2C_TMP_BAR0_DELTA))) {
- DebugFlag = FALSE;
- } else {
- //
- // Need to enable the I2C PCI device
- //
- ProgramPciLpssI2C (BusNo);
-
- I2CBaseAddress = (UINT32) (LPSS_I2C0_TMP_BAR0 + (BusNo * LPSS_I2C_TMP_BAR0_DELTA));
- if (DebugFlag) DEBUG ((DEBUG_INFO, "I2CBaseAddress = 0x%x \n", I2CBaseAddress));
- }
-
- NumTries = 10000; // 1 seconds
- while ((1 == (I2CLibPeiMmioRead32 (I2CBaseAddress + R_IC_STATUS) & STAT_MST_ACTIVITY ))) {
- MicroSecondDelay (10);
- NumTries --;
- if (0 == NumTries)
- return EFI_DEVICE_ERROR;
- }
-
- Status = I2cDisable (BusNo);
- if (DebugFlag) DEBUG ((DEBUG_INFO, "I2cDisable Status = %r\r\n", Status));
-
- I2cBusFrequencySet (I2CBaseAddress, 400 * 1000, &I2cMode, DebugFlag); // Set I2cMode
-
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_INTR_MASK, 0x0);
- if (0x7F < SlaveAddress) {
- SlaveAddress = (SlaveAddress & 0x3FF) | IC_TAR_10BITADDR_MASTER;
- }
-
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_TAR, (UINT16) SlaveAddress);
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_RX_TL, 0);
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_TX_TL, 0);
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_CON, I2cMode);
-
- Status = I2cEnable (BusNo);
- if (DebugFlag) DEBUG ((DEBUG_INFO, "I2cEnable Status = %r\r\n", Status));
-
- I2CLibPeiMmioRead16 (I2CBaseAddress + R_IC_CLR_TX_ABRT);
- return EFI_SUCCESS;
-}
-
-/**
- Read bytes from I2C Device
- This is actual I2C hardware operation function.
-
- @param[in] BusNo - I2C Bus number to which the I2C device has been connected
- @param[in] SlaveAddress - Slave address of the I2C device (7-bit)
- @param[in] ReadBytes - Number of bytes to be read
- @param[out] ReadBuffer - Address to which the value read has to be stored
- @param[in] Start - It controls whether a RESTART is issued before the byte is sent or received.
- @param[in] End - It controls whether a STOP is issued after the byte is sent or received.
-
- @retval EFI_SUCCESS - The byte value read successfully
- @retval EFI_DEVICE_ERROR - Operation failed
- @retval EFI_TIMEOUT - Hardware retry timeout
- @retval Others - Failed to read a byte via I2C
-**/
-EFI_STATUS
-ByteReadI2C_Basic (
- IN UINT8 BusNo,
- IN UINT8 SlaveAddress,
- IN UINTN ReadBytes,
- OUT UINT8 *ReadBuffer,
- IN UINT8 Start,
- IN UINT8 End
- )
-{
- EFI_STATUS Status;
- UINT32 I2cStatus;
- UINT16 ReceiveData;
- UINT8 *ReceiveDataEnd;
- UINT8 *ReceiveRequest;
- UINT16 raw_intr_stat;
- UINTN I2CBaseAddress;
-
- I2CBaseAddress = (UINT32) (LPSS_I2C0_TMP_BAR0 + (BusNo * LPSS_I2C_TMP_BAR0_DELTA));
-
- Status = EFI_SUCCESS;
-
- I2CInit (BusNo, SlaveAddress);
-
- ReceiveDataEnd = &ReadBuffer [ReadBytes];
- if (ReadBytes) {
- ReceiveRequest = ReadBuffer;
-
- while ((ReceiveDataEnd > ReceiveRequest) ||
- (ReceiveDataEnd > ReadBuffer)) {
- //
- // Check for NACK
- //
- raw_intr_stat = I2CLibPeiMmioRead16 (I2CBaseAddress + R_IC_RAW_INTR_STAT);
- if (0 != (raw_intr_stat & I2C_INTR_TX_ABRT)) {
- I2CLibPeiMmioRead16 (I2CBaseAddress + R_IC_CLR_TX_ABRT);
- Status = RETURN_DEVICE_ERROR;
- DEBUG ((DEBUG_INFO,"TX ABRT ,%d bytes hasn't been transferred\r\n", ReceiveDataEnd - ReceiveRequest));
- break;
- }
-
- //
- // Determine if another byte was received
- //
- I2cStatus = I2CLibPeiMmioRead16 (I2CBaseAddress + R_IC_STATUS);
- if (0 != (I2cStatus & STAT_RFNE)) {
- ReceiveData = I2CLibPeiMmioRead16 (I2CBaseAddress + R_IC_DATA_CMD);
- *ReadBuffer++ = (UINT8)ReceiveData;
- }
-
- if (ReceiveDataEnd == ReceiveRequest) {
- continue; //Waiting the last request to get data and make (ReceiveDataEnd > ReadBuffer) =TRUE.
- }
-
- //
- // Wait until a read request will fit
- //
- if (0 == (I2cStatus & STAT_TFNF)) {
- MicroSecondDelay (10);
- continue;
- }
-
- //
- // Issue the next read request
- //
- if (End && Start) {
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_DATA_CMD, B_READ_CMD | B_CMD_RESTART | B_CMD_STOP);
- } else if (!End && Start) {
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_DATA_CMD, B_READ_CMD | B_CMD_RESTART);
- } else if (End && !Start) {
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_DATA_CMD, B_READ_CMD | B_CMD_STOP);
- } else if (!End && !Start) {
- I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_DATA_CMD, B_READ_CMD);
- }
- ReceiveRequest += 1;
- }
- }
- return Status;
-
-}
-
-/**
- Write bytes to I2C Device
- This is actual I2C hardware operation function.
-
- @param[in] BusNo - I2C Bus number to which the I2C device has been connected
- @param[in] SlaveAddress - Slave address of the I2C device (7-bit)
- @param[in] WriteBytes - Number of bytes to be written
- @param[in] WriteBuffer - Address to which the byte value has to be written
- @param[in] Start - It controls whether a RESTART is issued before the byte is sent or received.
- @param[in] End - It controls whether a STOP is issued after the byte is sent or received.
-
- @retval EFI_SUCCESS - The byte value written successfully
- @retval EFI_DEVICE_ERROR - Operation failed
- @retval EFI_TIMEOUT - Hardware retry timeout
- @retval Others - Failed to write a byte via I2C
-**/
-EFI_STATUS
-ByteWriteI2C_Basic (
- IN UINT8 BusNo,
- IN UINT8 SlaveAddress,
- IN UINTN WriteBytes,
- IN UINT8 *WriteBuffer,
- IN UINT8 Start,
- IN UINT8 End
- )
-{
- UINT16 Data16;
- EFI_STATUS Status;
- UINT32 I2cStatus;
- UINT8 *TransmitPtr;
- UINT8 *TransmitEnd;
- UINT16 raw_intr_stat;
- UINTN I2CBaseAddress;
-
-
- I2CBaseAddress = (UINT32)LPSS_I2C0_TMP_BAR0 + (BusNo * LPSS_I2C_TMP_BAR0_DELTA);
- Status = EFI_SUCCESS;
- I2CInit (BusNo, SlaveAddress);
-
- TransmitPtr = WriteBuffer;
- TransmitEnd = &WriteBuffer[WriteBytes];
- if (WriteBytes > 0x00) {
-
-
- while (TransmitEnd > TransmitPtr) {
- I2cStatus = I2CLibPeiMmioRead16 (I2CBaseAddress + R_IC_STATUS);
- raw_intr_stat = I2CLibPeiMmioRead16 (I2CBaseAddress + R_IC_RAW_INTR_STAT);
- if (0 != (raw_intr_stat & I2C_INTR_TX_ABRT)) {
- I2CLibPeiMmioRead16 (I2CBaseAddress + R_IC_CLR_TX_ABRT);
- Status = RETURN_DEVICE_ERROR;
- DEBUG ((DEBUG_ERROR,"TX ABRT TransmitEnd:0x%x WritePtr:0x%x\r\n", TransmitEnd, TransmitPtr));
- break;
- }
- if (0 == (I2cStatus & STAT_TFNF)) {
- DEBUG ((DEBUG_INFO,"%a(#%d) - 0 == (I2cStatus & STAT_TFNF)\n", __FUNCTION__, __LINE__));
- continue;
- }
-
- Data16 = (UINT16) *TransmitPtr;
- if (End && Start) {
- Data16 |= (B_CMD_RESTART | B_CMD_STOP);
- } else if (!End && Start) {
- Data16 |= B_CMD_RESTART;
- } else if (End && !Start) {
- Data16 |= B_CMD_STOP;
- }
- Data16 = I2CLibPeiMmioWrite16 (I2CBaseAddress + R_IC_DATA_CMD, Data16);
- TransmitPtr++;
-
- //
- // Add a small delay to work around some odd behavior being seen. Without this delay bytes get dropped.
- //
- MicroSecondDelay (FIFO_WRITE_DELAY);
- }
-
- }
-
- if (EFI_ERROR (Status))
- DEBUG ((EFI_D_INFO,"I2cStartRequest Exit with Status %r\r\n", Status));
-
- return Status;
-}
-
-
-/**
- Read bytes from I2C Device
-
- @param[in] BusNo - I2C Bus number to which the I2C device has been connected
- @param[in] SlaveAddress - Slave address of the I2C device (7-bit)
- @param[in] Offset - Register offset from which the data has to be read
- @param[in] ReadBytes - Number of bytes to be read
- @param[out] ReadBuffer - Address to which the value read has to be stored
-
- @retval EFI_SUCCESS - Read bytes from I2C device successfully
- @retval Others - Return status depends on ByteReadI2C_Basic
-**/
-EFI_STATUS
-ByteReadI2C (
- IN UINT8 BusNo,
- IN UINT8 SlaveAddress,
- IN UINT8 Offset,
- IN UINTN ReadBytes,
- OUT UINT8 *ReadBuffer
- )
-{
- EFI_STATUS Status;
-
- Status = ByteWriteI2C_Basic (BusNo, SlaveAddress, 1, &Offset, TRUE, FALSE);
- if (EFI_ERROR (Status)) return Status;
- Status = ByteReadI2C_Basic (BusNo, SlaveAddress, ReadBytes, ReadBuffer, TRUE, TRUE);
-
- return Status;
-}
-
-/**
- Write bytes to I2C Device
-
- @param[in] BusNo - I2C Bus number to which the I2C device has been connected
- @param[in] SlaveAddress - Slave address of the I2C device (7-bit)
- @param[in] Offset - Register offset from which the data has to be read
- @param[in] WriteBytes - Number of bytes to be written
- @param[in] WriteBuffer - Address to which the byte value has to be written
-
- @retval EFI_SUCCESS - Write bytes to I2C device successfully
- @retval Others - Return status depends on ByteWriteI2C_Basic
-**/
-EFI_STATUS
-ByteWriteI2C (
- IN UINT8 BusNo,
- IN UINT8 SlaveAddress,
- IN UINT8 Offset,
- IN UINTN WriteBytes,
- IN UINT8 *WriteBuffer
- )
-{
- EFI_STATUS Status;
-
- Status = ByteWriteI2C_Basic (BusNo, SlaveAddress, 1, &Offset, TRUE, FALSE);
- if (EFI_ERROR (Status)) return Status;
- Status = ByteWriteI2C_Basic (BusNo, SlaveAddress, WriteBytes, WriteBuffer, FALSE, TRUE);
-
- return Status;
-}
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CLibPei.inf b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CLibPei.inf
deleted file mode 100644
index 1f920bb..0000000
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CLibPei.inf
+++ /dev/null
@@ -1,51 +0,0 @@
-## @file
-# Pei library for I2C bus driver.
-#
-# Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>
-#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-##
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = I2CLibPei
- FILE_GUID = 8EF61509-890B-4FF2-B352-1C0E9CDDEC8B
- MODULE_TYPE = BASE
- VERSION_STRING = 1.0
- LIBRARY_CLASS = I2CLibPei
-
- CONSTRUCTOR = IntelI2CPeiLibConstructor
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-# VALID_ARCHITECTURES = IA32 X64 IPF EBC
-#
-
-[Sources.common]
- I2CLibPei.c
- I2CDelayPei.c
- I2CIoLibPei.c
-
-[LibraryClasses]
-
-[PPIs]
- gEfiPeiStallPpiGuid ## CONSUMES
-
-[Packages]
- MdePkg/MdePkg.dec
- BroxtonSiPkg/BroxtonSiPkg.dec
-
-[Pcd]
- gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress ## SOMETIMES_CONSUMES
- gEfiBxtTokenSpaceGuid.PcdPmcGcrBaseAddress ## CONSUMES
-
-
-
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cLib.h b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cLib.h
new file mode 100644
index 0000000..0083211
--- /dev/null
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cLib.h
@@ -0,0 +1,60 @@
+/** @file
+ Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
+
+ This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution. The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php.
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef _I2C_COMMON_H_
+#define _I2C_COMMON_H_
+////
+//// Header files
+////
+#include <Uefi.h>
+
+#include <Library/BaseLib.h>
+#include <Library/DebugLib.h>
+#include <Library/GpioLib.h>
+#include <Library/I2cLib.h>
+#include <Library/PcdLib.h>
+#include <Library/TimerLib.h>
+
+#include <PlatformBaseAddresses.h>
+#include <SaAccess.h>
+#include <ScAccess.h>
+#include <ScRegs/RegsI2c.h>
+
+//
+// Externs
+//
+extern BOOLEAN gI2cDebugFlag;
+
+//
+// Structures
+//
+typedef struct _I2C_LPSS_PCI_DEVICE_INFO {
+ UINT8 Segment;
+ UINT8 BusNum;
+ UINT8 DeviceNum;
+ UINT8 FunctionNum;
+ UINT32 Bar0;
+ UINT32 Bar1;
+} I2C_LPSS_PCI_DEVICE_INFO;
+
+typedef struct _LPSS_I2C_CLOCK_SCL_INFO {
+ UINT16 SS_SCL_HCNT;
+ UINT16 SS_SCL_LCNT;
+ UINT16 FS_SCL_HCNT;
+ UINT16 FS_SCL_LCNT;
+ UINT16 HS_SCL_HCNT;
+ UINT16 HS_SCL_LCNT;
+} LPSS_I2C_CLOCK_SCL_INFO;
+
+#endif // _I2C_COMMON_H_
+
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cNullLib.c b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cNullLib.c
new file mode 100644
index 0000000..6536939
--- /dev/null
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cNullLib.c
@@ -0,0 +1,281 @@
+/** @file
+ I2C library instance.
+
+ Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
+
+ This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution. The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php.
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#include "I2cLibNull.h"
+
+BOOLEAN gI2cDebugFlag = FALSE;
+
+////
+//// Public I2C functions
+////
+//
+// Desc: Initializes the controller and returns the MMIO base address
+// Input: Bus - I2C controller, 0 based
+// Address - 7-bit slave address
+// Speed - Uses the I2C_SPEED_ENUM enum to set the controller speed
+// I2cBaseAddress - Pointer to the MMIO base address for the I2C controller
+// Output: EFI_SUCCESS - Initialization completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
+EFI_STATUS
+I2cInit (
+ IN UINT8 Bus,
+ IN UINT16 Address,
+ IN UINT8 Speed,
+ IN OUT UINT32 *I2cBaseAddress
+ )
+{
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a(#%4d) - Starting...\n", __FUNCTION__, __LINE__));
+ return EFI_NOT_READY;
+}
+
+//
+// Desc: Polls the I2C controller with reads until it responds.
+// Input: I2cBaseAddress - Pointer to the MMIO base address for the I2C controller
+// Output: EFI_SUCCESS - Initialization completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+//
+EFI_STATUS
+I2cPoll (
+ IN UINT32 I2cBaseAddress
+ )
+{
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a(#%4d) - Starting...\n", __FUNCTION__, __LINE__));
+ return EFI_NOT_READY;
+}
+
+//
+// Desc: Read a byte from the I2C controller
+// Input: I2cBaseAddress - MMIO base address for the I2C controller
+// Data - Pointer to where to store the data
+// Start - Send start bit?
+// End - Send end bit?
+// Output: EFI_SUCCESS - Read completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
+EFI_STATUS
+I2cRead (
+ IN UINT32 I2cBaseAddress,
+ IN OUT UINT8 *Data,
+ IN BOOLEAN Start,
+ IN BOOLEAN End
+ )
+{
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a(#%4d) - Starting...\n", __FUNCTION__, __LINE__));
+ return EFI_NOT_READY;
+}
+
+//
+// Desc: Resets the I2C controller into a known good state
+// Input: I2cBaseAddress - MMIO base address for the I2C controller
+// Bus - I2C controller, 0 based
+// Address - 7-bit slave address
+// Speed - Uses the I2C_SPEED_ENUM enum to set the controller speed
+// Output: EFI_SUCCESS - Write completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
+EFI_STATUS
+I2cReset (
+ IN UINT32 I2cBaseAddress,
+ IN UINT8 Bus,
+ IN UINT16 Address,
+ IN UINT8 Speed
+ )
+{
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a(#%4d) - Starting...\n", __FUNCTION__, __LINE__));
+ return EFI_NOT_READY;
+}
+
+//
+// Desc: Write a byte to the I2C controller
+// Input: I2cBaseAddress - MMIO base address for the I2C controller
+// Data - Data from the I2C controller
+// Start - Send start bit?
+// End - Send end bit?
+// Output: EFI_SUCCESS - Write completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
+EFI_STATUS
+I2cSendCommand (
+ IN UINT32 I2cBaseAddress,
+ IN UINT32 *Data,
+ IN BOOLEAN Start,
+ IN BOOLEAN End
+ )
+{
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a(#%4d) - Starting...\n", __FUNCTION__, __LINE__));
+ return EFI_NOT_READY;
+}
+
+//
+// Desc: Set I2C target slave offset
+// Input: I2cBaseAddress - MMIO base address for the I2C controller
+// Offset - Pointer to offset data
+// Size - Size of the offset data
+// Output: EFI_SUCCESS - Write completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
+EFI_STATUS
+I2cSetOffset (
+ IN UINT32 I2cBaseAddress,
+ IN UINT8 *Offset,
+ IN UINT8 Size
+ )
+{
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a(#%4d) - Starting...\n", __FUNCTION__, __LINE__));
+ return EFI_NOT_READY;
+}
+
+//
+// Desc: Write a byte to the I2C controller
+// Input: I2cBaseAddress - MMIO base address for the I2C controller
+// Data - Data from the I2C controller
+// Start - Send start bit?
+// End - Send end bit?
+// Output: EFI_SUCCESS - Write completed successfully
+// EFI_DEVICE_ERROR - I2C controller error
+// EFI_INVALID_PARAMETER - Invalid input parameter
+//
+EFI_STATUS
+I2cWrite (
+ IN UINT32 I2cBaseAddress,
+ IN UINT8 Data,
+ IN BOOLEAN Start,
+ IN BOOLEAN End
+ )
+{
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a(#%4d) - Starting...\n", __FUNCTION__, __LINE__));
+ return EFI_NOT_READY;
+}
+
+/**
+ Read bytes from I2C Device
+ This is actual I2C hardware operation function.
+
+ @param[in] BusNo I2C Bus number to which the I2C device has been connected
+ @param[in] SlaveAddress Slave address of the I2C device (7-bit)
+ @param[in] ReadBytes Number of bytes to be read
+ @param[out] ReadBuffer Address to which the value read has to be stored
+ @param[in] Start It controls whether a RESTART is issued before the byte is sent or received.
+ @param[in] End It controls whether a STOP is issued after the byte is sent or received.
+
+ @retval EFI_SUCCESS The byte value read successfully
+ @retval EFI_DEVICE_ERROR Operation failed
+ @retval EFI_TIMEOUT Hardware retry timeout
+ @retval Others Failed to read a byte via I2C
+
+**/
+EFI_STATUS
+ByteReadI2C_Basic (
+ IN UINT8 BusNo,
+ IN UINT8 SlaveAddress,
+ IN UINTN ReadBytes,
+ OUT UINT8 *ReadBuffer,
+ IN UINT8 Start,
+ IN UINT8 End
+ )
+{
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a(#%4d) - Starting...\n", __FUNCTION__, __LINE__));
+ return EFI_NOT_READY;
+}
+
+/**
+ Write bytes to I2C Device
+ This is actual I2C hardware operation function.
+
+ @param[in] BusNo I2C Bus number to which the I2C device has been connected
+ @param[in] SlaveAddress Slave address of the I2C device (7-bit)
+ @param[in] WriteBytes Number of bytes to be written
+ @param[in] WriteBuffer Address to which the byte value has to be written
+ @param[in] Start It controls whether a RESTART is issued before the byte is sent or received.
+ @param[in] End It controls whether a STOP is issued after the byte is sent or received.
+
+ @retval EFI_SUCCESS The byte value written successfully
+ @retval EFI_DEVICE_ERROR Operation failed
+ @retval EFI_TIMEOUT Hardware retry timeout
+ @retval Others Failed to write a byte via I2C
+
+**/
+EFI_STATUS
+ByteWriteI2C_Basic (
+ IN UINT8 BusNo,
+ IN UINT8 SlaveAddress,
+ IN UINTN WriteBytes,
+ IN UINT8 *WriteBuffer,
+ IN UINT8 Start,
+ IN UINT8 End
+ )
+{
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a(#%4d) - Starting...\n", __FUNCTION__, __LINE__));
+ return EFI_NOT_READY;
+}
+
+/**
+ Read bytes from I2C Device
+
+ @param[in] BusNo I2C Bus number to which the I2C device has been connected
+ @param[in] SlaveAddress Slave address of the I2C device (7-bit)
+ @param[in] Offset Register offset from which the data has to be read
+ @param[in] ReadBytes Number of bytes to be read
+ @param[out] ReadBuffer Address to which the value read has to be stored
+
+ @retval EFI_SUCCESS Read bytes from I2C device successfully
+ @retval Others Return status depends on ByteReadI2C_Basic
+
+**/
+EFI_STATUS
+ByteReadI2C (
+ IN UINT8 BusNo,
+ IN UINT8 SlaveAddress,
+ IN UINT8 Offset,
+ IN UINTN ReadBytes,
+ OUT UINT8 *ReadBuffer
+ )
+{
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a(#%4d) - Starting...\n", __FUNCTION__, __LINE__));
+ return EFI_NOT_READY;
+}
+
+/**
+ Write bytes to I2C Device
+
+ @param[in] BusNo I2C Bus number to which the I2C device has been connected
+ @param[in] SlaveAddress Slave address of the I2C device (7-bit)
+ @param[in] Offset Register offset from which the data has to be read
+ @param[in] WriteBytes Number of bytes to be written
+ @param[in] WriteBuffer Address to which the byte value has to be written
+
+ @retval EFI_SUCCESS Write bytes to I2C device successfully
+ @retval Others Return status depends on ByteWriteI2C_Basic
+
+**/
+EFI_STATUS
+ByteWriteI2C (
+ IN UINT8 BusNo,
+ IN UINT8 SlaveAddress,
+ IN UINT8 Offset,
+ IN UINTN WriteBytes,
+ IN UINT8 *WriteBuffer
+ )
+{
+ if (gI2cDebugFlag) DEBUG ((DEBUG_INFO, "%a(#%4d) - Starting...\n", __FUNCTION__, __LINE__));
+ return EFI_NOT_READY;
+}
+
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CDelayPei.c b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cNullLib.h
similarity index 61%
rename from Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CDelayPei.c
rename to Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cNullLib.h
index 89c3e02..45ca316 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CDelayPei.c
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cNullLib.h
@@ -1,7 +1,5 @@
/** @file
- Timer instance for I2C Pei Library.
-
- Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -13,11 +11,20 @@
**/
-#include <PiPei.h>
-#include "I2CAccess.h"
-#include "I2CDelayPei.h"
+#ifndef _I2C_COMMON_NULL_H_
+#define _I2C_COMMON_NULL_H_
+////
+//// Header files
+////
+#include <Uefi.h>
+
#include <Library/DebugLib.h>
-#include <Library/PeiServicesTablePointerLib.h>
-#include <Ppi/Stall.h>
+#include <Library/I2cLib.h>
+
+//
+// Externs
+//
+extern BOOLEAN gI2cDebugFlag;
+#endif // _I2C_COMMON_NULL_H_
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cNullLib.inf b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cNullLib.inf
new file mode 100644
index 0000000..aec234c
--- /dev/null
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2cLib/I2cNullLib.inf
@@ -0,0 +1,37 @@
+## @file
+# Library producing I2C functionality.
+#
+# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
+#
+# This program and the accompanying materials
+# are licensed and made available under the terms and conditions of the BSD License
+# which accompanies this distribution. The full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+##
+
+[Defines]
+ INF_VERSION = 0x00010017
+ BASE_NAME = I2cNullLib
+ FILE_GUID = AFFEF156-2BF4-46C7-B93B-CFAA4093DFEC
+ VERSION_STRING = 1.0
+ MODULE_TYPE = BASE
+ LIBRARY_CLASS = I2cNullLib
+
+[Depex]
+ TRUE
+
+[LibraryClasses]
+ DebugLib
+
+[Packages]
+ MdePkg/MdePkg.dec
+ MdeModulePkg/MdeModulePkg.dec
+ BroxtonSiPkg/BroxtonSiPkg.dec
+
+[Sources]
+ I2cLib.c
+ I2cLib.h
--
2.10.1.windows.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-08-17 9:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-17 9:33 [Patch][edk2-platforms/devel-IntelAtomProcessorE3900 7Merged the I2C libraries Guo, Mang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox