-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
hw-mgmt: patches: Modify reset callback
Modify patches: - v5.10 - #312. - v6.1 - #25. Signed-off-by: Vadim Pasternak <[email protected]> Reviewed-by: Felix Radensky <[email protected]>
- Loading branch information
1 parent
a13ba17
commit 79b798c
Showing
2 changed files
with
11 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| From 78a6193c8cd1e4294ca8d7820a8aa23265f93d50 Mon Sep 17 00:00:00 2001 | ||
| From da7974fb05d1d1f8b4312e98401cf2bd56b15385 Mon Sep 17 00:00:00 2001 | ||
| From: Vadim Pasternak <[email protected]> | ||
| Date: Mon, 24 Jul 2023 06:36:18 +0000 | ||
| Subject: [PATCH backport 5.10.179 20/26] platform: mellanox: mlx-platform: Add | ||
| reset callback | ||
| Subject: [PATCH backport 5.10 1/1] platform: mellanox: mlx-platform: Add reset | ||
| callback | ||
|
|
||
| On L1 switches reset should include special actions against CPLD device | ||
| for performing graceful operations. | ||
|
|
@@ -15,7 +15,7 @@ Reviewed-by: Michael Shych <[email protected]> | |
| 1 file changed, 43 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c | ||
| index 26aefcb70..36c30d7b8 100644 | ||
| index 26aefcb70..272a61e19 100644 | ||
| --- a/drivers/platform/x86/mlx-platform.c | ||
| +++ b/drivers/platform/x86/mlx-platform.c | ||
| @@ -37,6 +37,7 @@ | ||
|
|
@@ -93,8 +93,8 @@ index 26aefcb70..36c30d7b8 100644 | |
| + | ||
| + ret = regmap_read(priv->regmap, MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET, ®val); | ||
| + | ||
| + if (action == SYS_RESTART && !ret && !(regval & BIT(0))) | ||
| + regmap_write(priv->regmap, MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET, | ||
| + if (action == SYS_RESTART && !ret && regval & BIT(0)) | ||
| + regmap_write(priv->regmap, MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET, | ||
| + MLXPLAT_CPLD_RESET_MASK); | ||
| + | ||
| + return NOTIFY_DONE; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From d86898e51cb14630da1d1b4b0c6b4fb6200f9261 Mon Sep 17 00:00:00 2001 | ||
| From cf4adb9d63d684594f50d8897808cd2f07be4efa Mon Sep 17 00:00:00 2001 | ||
| From: Vadim Pasternak <[email protected]> | ||
| Date: Sun, 30 Jul 2023 20:50:15 +0000 | ||
| Subject: [PATCH backport 6.1.42 25/85] platform: mellanox: mlx-platform: Add | ||
| Subject: [PATCH backport 6.1.42 1/1] platform: mellanox: mlx-platform: Add | ||
| reset callback | ||
|
|
||
| On L1 switches reset should include special actions against CPLD device | ||
|
|
@@ -15,7 +15,7 @@ Reviewed-by: Michael Shych <[email protected]> | |
| 1 file changed, 43 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c | ||
| index 1010064d54e9..83a9e0ce2ab7 100644 | ||
| index 1010064d54e9..b577ce572ab1 100644 | ||
| --- a/drivers/platform/x86/mlx-platform.c | ||
| +++ b/drivers/platform/x86/mlx-platform.c | ||
| @@ -35,6 +35,7 @@ | ||
|
|
@@ -93,8 +93,8 @@ index 1010064d54e9..83a9e0ce2ab7 100644 | |
| + | ||
| + ret = regmap_read(priv->regmap, MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET, ®val); | ||
| + | ||
| + if (action == SYS_RESTART && !ret && !(regval & BIT(0))) | ||
| + regmap_write(priv->regmap, MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET, | ||
| + if (action == SYS_RESTART && !ret && regval & BIT(0)) | ||
| + regmap_write(priv->regmap, MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET, | ||
| + MLXPLAT_CPLD_RESET_MASK); | ||
| + | ||
| + return NOTIFY_DONE; | ||
|
|
||