Skip to content

[ mvebu ] Fix clearfog pci to msata switching #1770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Heisath merged 1 commit into from
Jan 31, 2020
Merged

[ mvebu ] Fix clearfog pci to msata switching #1770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions patch/u-boot/u-boot-mvebu/clearfog-pci0=msata.patch.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
This turns pci0 (on clearfogpro the farthest from the cpu) into mSATA
On clearfogbase this is the only mSATA/mPCIe
---
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
index 6b3e196..4400c71 100644
--- a/configs/clearfog_defconfig
+++ b/configs/clearfog_defconfig
@@ -47,0 +47,1 @@ CONFIG_DEBUG_UART_BASE=0xd0012000
+CONFIG_CLEARFOG_CON3_SATA=y

9 changes: 9 additions & 0 deletions patch/u-boot/u-boot-mvebu/clearfog-pci1=msata.patch.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
This turns the pci1 (on clearfogpro the closest from the cpu) into mSATA
---
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
index 6b3e196..4400c71 100644
--- a/configs/clearfog_defconfig
+++ b/configs/clearfog_defconfig
@@ -47,0 +47,1 @@ CONFIG_DEBUG_UART_BASE=0xd0012000
+CONFIG_CLEARFOG_CON2_SATA=y

44 changes: 44 additions & 0 deletions patch/u-boot/u-boot-mvebu/swap-sata-serdes-rx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
From f95ec9a3e97c9e1be4b444f776e47201e03d9783 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Wed, 13 Jun 2018 16:25:20 +0300
Subject: [PATCH] clearfog: sata serdes needs Rx swap

Both SATA serdes configurations need to enable the swap_rx field in
serdes_map to allow proper communication with SATA devices.

Apply the fix to Pro and Base.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
board/solidrun/clearfog/clearfog.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 34dc50d94b2..cec9c764a89 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -41,13 +41,13 @@ static struct serdes_map board_serdes_map[] = {
{SATA0, SERDES_SPEED_3_GBPS, SERDES_DEFAULT_MODE, 0, 0},
{SGMII1, SERDES_SPEED_1_25_GBPS, SERDES_DEFAULT_MODE, 0, 0},
#ifdef CONFIG_CLEARFOG_CON3_SATA
- {SATA1, SERDES_SPEED_3_GBPS, SERDES_DEFAULT_MODE, 0, 0},
+ {SATA1, SERDES_SPEED_3_GBPS, SERDES_DEFAULT_MODE, 1, 0},
#else
{PEX1, SERDES_SPEED_5_GBPS, PEX_ROOT_COMPLEX_X1, 0, 0},
#endif
{USB3_HOST1, SERDES_SPEED_5_GBPS, SERDES_DEFAULT_MODE, 0, 0},
#ifdef CONFIG_CLEARFOG_CON2_SATA
- {SATA2, SERDES_SPEED_3_GBPS, SERDES_DEFAULT_MODE, 0, 0},
+ {SATA2, SERDES_SPEED_3_GBPS, SERDES_DEFAULT_MODE, 1, 0},
#else
{PEX2, SERDES_SPEED_5_GBPS, PEX_ROOT_COMPLEX_X1, 0, 0},
#endif
@@ -64,7 +64,7 @@ static struct serdes_map board_serdes_map[] = {
{SATA0, SERDES_SPEED_3_GBPS, SERDES_DEFAULT_MODE, 0, 0},
{SGMII1, SERDES_SPEED_1_25_GBPS, SERDES_DEFAULT_MODE, 0, 0},
#ifdef CONFIG_CLEARFOG_CON3_SATA
- {SATA1, SERDES_SPEED_3_GBPS, SERDES_DEFAULT_MODE, 0, 0},
+ {SATA1, SERDES_SPEED_3_GBPS, SERDES_DEFAULT_MODE, 1, 0},
#else
{PEX1, SERDES_SPEED_5_GBPS, PEX_ROOT_COMPLEX_X1, 0, 0},
#endif