summaryrefslogtreecommitdiff
path: root/src/soc/intel/apollolake
diff options
context:
space:
mode:
authorVenkateswarlu Vinjamuri <venkateswarlu.v.vinjamuri@intel.com>2018-04-09 11:14:42 -0700
committerPatrick Georgi <pgeorgi@google.com>2018-04-17 10:42:32 +0000
commitefeb6903fe08cd043dcd029d1c492be51f78aa50 (patch)
tree81a0a4d46bbaedede6d78bc380987cfbb7c00a96 /src/soc/intel/apollolake
parenta4e8f67b94f4167cb7f31b9bcb3b811cd38f0efb (diff)
soc/intel/apollolake: Configure PCIe root port #1 for APL WiFi
APL uses PCIe root port 1 (PCIe ID 14.0) for discrete PCIe wifi card. BUG=None BRANCH=None TEST=Use Stone Peak discrete wifi card and test s0ix. Change-Id: Ia81722f4533916fe93009a73d86765e5de9dab08 Signed-off-by: Venkateswarlu Vinjamuri <venkateswarlu.v.vinjamuri@intel.com> Reviewed-on: https://review.coreboot.org/25637 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/soc/intel/apollolake')
-rw-r--r--src/soc/intel/apollolake/acpi/pcie.asl108
-rw-r--r--src/soc/intel/apollolake/chip.c2
2 files changed, 4 insertions, 106 deletions
diff --git a/src/soc/intel/apollolake/acpi/pcie.asl b/src/soc/intel/apollolake/acpi/pcie.asl
index 050f2f0286..da9959123a 100644
--- a/src/soc/intel/apollolake/acpi/pcie.asl
+++ b/src/soc/intel/apollolake/acpi/pcie.asl
@@ -13,114 +13,12 @@
* GNU General Public License for more details.
*/
+/* PCIe Ports */
+
Device (RP01)
{
Name (_ADR, 0x00140000)
Name (_DDN, "PCIe-B 0")
- Name (PDST, 0) /* present Detect status */
-
- /* lowest D-state supported by
- * PCIe root port during S0 state
- */
- Name (_S0W, 4)
-
- /* Dynamic Opregion needed to access registers
- * when the controller is in D3 cold
- */
- OperationRegion (PX01, PCI_Config, 0x00, 0xFF)
- Field (PX01, AnyAcc, NoLock, Preserve)
- {
- Offset(0x5A),
- , 6,
- PDS, 1, /* 6, Presence detect Change */
- Offset(0xE2), /* RPPGEN - Root Port Power Gating Enable */
- , 2,
- L23E, 1, /* 2, L23_Rdy Entry Request (L23ER) */
- L23R, 1, /* 3, L23_Rdy to Detect Transition (L23R2DT) */
- Offset(0xF4), /* BLKPLLEN */
- , 10,
- BPLL, 1,
- }
-
- OperationRegion (PX02, PCI_Config, 0x338, 0x4)
- Field (PX02, AnyAcc, NoLock, Preserve)
- {
- , 26,
- BDQA, 1 /* BLKDQDA */
- }
-
- PowerResource (PXP, 0, 0)
- {
- /* Define the PowerResource for PCIe slot */
- Method (_STA, 0, Serialized)
- {
- Store (PDS, PDST)
- If (LEqual (PDS, 1)) {
- Return (0xf)
- } Else {
- Return (0)
- }
- }
-
- Method (_ON, 0, Serialized)
- {
- If (LAnd (LEqual (PDST, 1), LNotEqual (\PRT0, 0))) {
- /* Enter this condition if device
- * is connected
- */
-
- /* De-assert PERST */
- \_SB.PCI0.PRDA (\PRT0)
-
- Store (0, BDQA) /* Set BLKDQDA to 0 */
- Store (0, BPLL) /* Set BLKPLLEN to 0 */
-
- /* Set L23_Rdy to Detect Transition
- * (L23R2DT)
- */
- Store (1, L23R)
- Sleep (16)
- Store (0, Local0)
-
- /* Delay for transition Detect
- * and link to train
- */
- While (L23R) {
- If (Lgreater (Local0, 4)) {
- Break
- }
- Sleep (16)
- Increment (Local0)
- }
- } /* End PDS condition check */
- }
-
- Method (_OFF, 0, Serialized)
- {
- /* Set L23_Rdy Entry Request (L23ER) */
- If (LAnd (LEqual (PDST, 1), LNotEqual (\PRT0, 0))) {
- /* enter this condition if device
- * is connected
- */
- Store (1, L23E)
- Sleep (16)
- Store (0, Local0)
- While (L23E) {
- If (Lgreater (Local0, 4)) {
- Break
- }
- Sleep (16)
- Increment (Local0)
- }
- Store (1, BDQA) /* Set BLKDQDA to 1 */
- Store (1, BPLL) /* Set BLKPLLEN to 1 */
-
- /* Assert PERST */
- \_SB.PCI0.PRAS (\PRT0)
- } /* End PDS condition check */
- } /* End of Method_OFF */
- } /* End PXP */
- Name(_PR0, Package() { PXP })
- Name(_PR3, Package() { PXP })
+ #include "pcie_port.asl"
}
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index cac2c0061c..79374cadd1 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -111,7 +111,7 @@ static const char *soc_acpi_name(const struct device *dev)
case PCH_DEVFN_SDIO:
return "SDIO";
/* PCIe */
- case PCH_DEVFN_PCIE1:
+ case PCH_DEVFN_PCIE5:
return "RP01";
}