* [PATCH platform-next 0/5] platform/x86: mlx-platform: Topology fixes and configuration updates
@ 2020-09-23 17:20 Vadim Pasternak
2020-09-23 17:20 ` [PATCH platform-next 1/5] platform/x86: mlx-platform: Remove PSU EEPROM configuration Vadim Pasternak
` (5 more replies)
0 siblings, 6 replies; 12+ messages in thread
From: Vadim Pasternak @ 2020-09-23 17:20 UTC (permalink / raw)
To: andy.shevchenko, dvhart; +Cc: platform-driver-x86, Vadim Pasternak
The patchset provides topology fixes for power units related structure
and extension of FAN structure with capability field.
The patchset includes:
Patch#1 - Removes PSU EEPROM configuration for systems class equipped
with 200x32Gb switch.
Patch#2 - Changes topology for the next generation systems.
Patch#3 - Updates module license to SPDX.
Patches#4-#5 - Add capability field for core platform data structure.
Vadim Pasternak (5):
platform/x86: mlx-platform: Remove PSU EEPROM configuration
platform/x86: mlx-platform: Fix extended topology configuration for
power supply units
platform_data/mlxreg: Update module license
platform_data/mlxreg: Extend core platform structure
platform/x86: mlx-platform: Add capability field to platform FAN
description
drivers/platform/x86/mlx-platform.c | 28 +++++++++++++---------------
include/linux/platform_data/mlxreg.h | 34 ++++------------------------------
2 files changed, 17 insertions(+), 45 deletions(-)
--
2.11.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH platform-next 1/5] platform/x86: mlx-platform: Remove PSU EEPROM configuration
2020-09-23 17:20 [PATCH platform-next 0/5] platform/x86: mlx-platform: Topology fixes and configuration updates Vadim Pasternak
@ 2020-09-23 17:20 ` Vadim Pasternak
2020-09-24 8:33 ` Hans de Goede
2020-09-23 17:20 ` [PATCH platform-next 2/5] platform/x86: mlx-platform: Fix extended topology configuration for power supply units Vadim Pasternak
` (4 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Vadim Pasternak @ 2020-09-23 17:20 UTC (permalink / raw)
To: andy.shevchenko, dvhart; +Cc: platform-driver-x86, Vadim Pasternak
Remove PSU EEPROM configuration for systems class equipped with
Mellanox chip Spectrume-2. Till now all the systems from this class
used few types of power units, all equipped with EEPROM device with
address space two bytes. Thus, all these devices have been handled by
EEPROM driver "24c32".
There is a new requirement is to support power unit replacement by "off
the shelf" device, matching electrical required parameters. Such device
could be equipped with different EEPROM type, which could be one byte
address space addressing or even could be not equipped with EEPROM.
In such case "24c32" will not work.
Fixes: 1bd42d94ccab ("platform/x86: mlx-platform: Add support for new 200G IB and Ethernet systems")
Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
---
drivers/platform/x86/mlx-platform.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c
index 8cf8c1be2666..e57d2471dfcb 100644
--- a/drivers/platform/x86/mlx-platform.c
+++ b/drivers/platform/x86/mlx-platform.c
@@ -329,15 +329,6 @@ static struct i2c_board_info mlxplat_mlxcpld_psu[] = {
},
};
-static struct i2c_board_info mlxplat_mlxcpld_ng_psu[] = {
- {
- I2C_BOARD_INFO("24c32", 0x51),
- },
- {
- I2C_BOARD_INFO("24c32", 0x50),
- },
-};
-
static struct i2c_board_info mlxplat_mlxcpld_pwr[] = {
{
I2C_BOARD_INFO("dps460", 0x59),
@@ -762,15 +753,13 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_ng_psu_items_data[] = {
.label = "psu1",
.reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
.mask = BIT(0),
- .hpdev.brdinfo = &mlxplat_mlxcpld_ng_psu[0],
- .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
+ .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
},
{
.label = "psu2",
.reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
.mask = BIT(1),
- .hpdev.brdinfo = &mlxplat_mlxcpld_ng_psu[1],
- .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
+ .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
},
};
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH platform-next 2/5] platform/x86: mlx-platform: Fix extended topology configuration for power supply units
2020-09-23 17:20 [PATCH platform-next 0/5] platform/x86: mlx-platform: Topology fixes and configuration updates Vadim Pasternak
2020-09-23 17:20 ` [PATCH platform-next 1/5] platform/x86: mlx-platform: Remove PSU EEPROM configuration Vadim Pasternak
@ 2020-09-23 17:20 ` Vadim Pasternak
2020-09-24 8:33 ` Hans de Goede
2020-09-23 17:20 ` [PATCH platform-next 3/5] platform_data/mlxreg: Update module license Vadim Pasternak
` (3 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Vadim Pasternak @ 2020-09-23 17:20 UTC (permalink / raw)
To: andy.shevchenko, dvhart; +Cc: platform-driver-x86, Vadim Pasternak
Fix topology configuration for power supply units in structure
'mlxplat_mlxcpld_ext_pwr_items_data', due to hardware change.
Note: no need to backport the fix, since there is no such hardware yet
(equipped with four power) at the filed.
Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
---
drivers/platform/x86/mlx-platform.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c
index e57d2471dfcb..04a745095c37 100644
--- a/drivers/platform/x86/mlx-platform.c
+++ b/drivers/platform/x86/mlx-platform.c
@@ -171,7 +171,6 @@
#define MLXPLAT_CPLD_NR_NONE -1
#define MLXPLAT_CPLD_PSU_DEFAULT_NR 10
#define MLXPLAT_CPLD_PSU_MSNXXXX_NR 4
-#define MLXPLAT_CPLD_PSU_MSNXXXX_NR2 3
#define MLXPLAT_CPLD_FAN1_DEFAULT_NR 11
#define MLXPLAT_CPLD_FAN2_DEFAULT_NR 12
#define MLXPLAT_CPLD_FAN3_DEFAULT_NR 13
@@ -338,6 +337,15 @@ static struct i2c_board_info mlxplat_mlxcpld_pwr[] = {
},
};
+static struct i2c_board_info mlxplat_mlxcpld_ext_pwr[] = {
+ {
+ I2C_BOARD_INFO("dps460", 0x5b),
+ },
+ {
+ I2C_BOARD_INFO("dps460", 0x5a),
+ },
+};
+
static struct i2c_board_info mlxplat_mlxcpld_fan[] = {
{
I2C_BOARD_INFO("24c32", 0x50),
@@ -910,15 +918,15 @@ static struct mlxreg_core_data mlxplat_mlxcpld_ext_pwr_items_data[] = {
.label = "pwr3",
.reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET,
.mask = BIT(2),
- .hpdev.brdinfo = &mlxplat_mlxcpld_pwr[0],
- .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR2,
+ .hpdev.brdinfo = &mlxplat_mlxcpld_ext_pwr[0],
+ .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
},
{
.label = "pwr4",
.reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET,
.mask = BIT(3),
- .hpdev.brdinfo = &mlxplat_mlxcpld_pwr[1],
- .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR2,
+ .hpdev.brdinfo = &mlxplat_mlxcpld_ext_pwr[1],
+ .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
},
};
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH platform-next 3/5] platform_data/mlxreg: Update module license
2020-09-23 17:20 [PATCH platform-next 0/5] platform/x86: mlx-platform: Topology fixes and configuration updates Vadim Pasternak
2020-09-23 17:20 ` [PATCH platform-next 1/5] platform/x86: mlx-platform: Remove PSU EEPROM configuration Vadim Pasternak
2020-09-23 17:20 ` [PATCH platform-next 2/5] platform/x86: mlx-platform: Fix extended topology configuration for power supply units Vadim Pasternak
@ 2020-09-23 17:20 ` Vadim Pasternak
2020-09-24 8:33 ` Hans de Goede
2020-09-23 17:20 ` [PATCH platform-next 4/5] platform_data/mlxreg: Extend core platform structure Vadim Pasternak
` (2 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Vadim Pasternak @ 2020-09-23 17:20 UTC (permalink / raw)
To: andy.shevchenko, dvhart; +Cc: platform-driver-x86, Vadim Pasternak
Update license to SPDX-License.
Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
---
include/linux/platform_data/mlxreg.h | 32 ++------------------------------
1 file changed, 2 insertions(+), 30 deletions(-)
diff --git a/include/linux/platform_data/mlxreg.h b/include/linux/platform_data/mlxreg.h
index 1af9c01563f9..0a727d405a7a 100644
--- a/include/linux/platform_data/mlxreg.h
+++ b/include/linux/platform_data/mlxreg.h
@@ -1,34 +1,6 @@
+/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */
/*
- * Copyright (c) 2017 Mellanox Technologies. All rights reserved.
- * Copyright (c) 2017 Vadim Pasternak <vadimp@mellanox.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (C) 2017-2020 Mellanox Technologies Ltd.
*/
#ifndef __LINUX_PLATFORM_DATA_MLXREG_H
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH platform-next 4/5] platform_data/mlxreg: Extend core platform structure
2020-09-23 17:20 [PATCH platform-next 0/5] platform/x86: mlx-platform: Topology fixes and configuration updates Vadim Pasternak
` (2 preceding siblings ...)
2020-09-23 17:20 ` [PATCH platform-next 3/5] platform_data/mlxreg: Update module license Vadim Pasternak
@ 2020-09-23 17:20 ` Vadim Pasternak
2020-09-24 8:36 ` Hans de Goede
2020-09-23 17:20 ` [PATCH platform-next 5/5] platform/x86: mlx-platform: Add capability field to platform FAN description Vadim Pasternak
2020-10-07 21:24 ` [PATCH platform-next 0/5] platform/x86: mlx-platform: Topology fixes and configuration updates Hans de Goede
5 siblings, 1 reply; 12+ messages in thread
From: Vadim Pasternak @ 2020-09-23 17:20 UTC (permalink / raw)
To: andy.shevchenko, dvhart; +Cc: platform-driver-x86, Vadim Pasternak
Add 'capability' field to structure 'mlxreg_core_platform_data'.
The purpose of this filed to indicate the actual number of the
components within the particular group. Such components could be,
for example the number of the FAN drawers. Some systems are equipped
with FAN drawers with one tachometer inside, others with FAN drawers
with several tachometers inside.
Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
---
include/linux/platform_data/mlxreg.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/linux/platform_data/mlxreg.h b/include/linux/platform_data/mlxreg.h
index 0a727d405a7a..101333fe2b8d 100644
--- a/include/linux/platform_data/mlxreg.h
+++ b/include/linux/platform_data/mlxreg.h
@@ -109,6 +109,7 @@ struct mlxreg_core_item {
* @features: supported features of device;
* @version: implementation version;
* @identity: device identity name;
+ * @capability: device capability register;
*/
struct mlxreg_core_platform_data {
struct mlxreg_core_data *data;
@@ -117,6 +118,7 @@ struct mlxreg_core_platform_data {
u32 features;
u32 version;
char identity[MLXREG_CORE_LABEL_MAX_SIZE];
+ u32 capability;
};
/**
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH platform-next 5/5] platform/x86: mlx-platform: Add capability field to platform FAN description
2020-09-23 17:20 [PATCH platform-next 0/5] platform/x86: mlx-platform: Topology fixes and configuration updates Vadim Pasternak
` (3 preceding siblings ...)
2020-09-23 17:20 ` [PATCH platform-next 4/5] platform_data/mlxreg: Extend core platform structure Vadim Pasternak
@ 2020-09-23 17:20 ` Vadim Pasternak
2020-09-24 8:36 ` Hans de Goede
2020-10-07 21:24 ` [PATCH platform-next 0/5] platform/x86: mlx-platform: Topology fixes and configuration updates Hans de Goede
5 siblings, 1 reply; 12+ messages in thread
From: Vadim Pasternak @ 2020-09-23 17:20 UTC (permalink / raw)
To: andy.shevchenko, dvhart; +Cc: platform-driver-x86, Vadim Pasternak
Set 'capability' field to FAN core platform data..
The content of 'capability' register allows to set the mapping between
the drawers and tachometers.
The motivation is to avoid adding a new code in the future in order to
distinct between the systems types supporting a different kinds of the
FAN drawers.
Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
---
drivers/platform/x86/mlx-platform.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c
index 04a745095c37..986ad3dda1c1 100644
--- a/drivers/platform/x86/mlx-platform.c
+++ b/drivers/platform/x86/mlx-platform.c
@@ -1939,6 +1939,7 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_fan_data[] = {
static struct mlxreg_core_platform_data mlxplat_default_fan_data = {
.data = mlxplat_mlxcpld_default_fan_data,
.counter = ARRAY_SIZE(mlxplat_mlxcpld_default_fan_data),
+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
};
/* Watchdog type1: hardware implementation version1
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH platform-next 1/5] platform/x86: mlx-platform: Remove PSU EEPROM configuration
2020-09-23 17:20 ` [PATCH platform-next 1/5] platform/x86: mlx-platform: Remove PSU EEPROM configuration Vadim Pasternak
@ 2020-09-24 8:33 ` Hans de Goede
0 siblings, 0 replies; 12+ messages in thread
From: Hans de Goede @ 2020-09-24 8:33 UTC (permalink / raw)
To: Vadim Pasternak, andy.shevchenko, dvhart; +Cc: platform-driver-x86
Hi,
On 9/23/20 7:20 PM, Vadim Pasternak wrote:
> Remove PSU EEPROM configuration for systems class equipped with
> Mellanox chip Spectrume-2. Till now all the systems from this class
> used few types of power units, all equipped with EEPROM device with
> address space two bytes. Thus, all these devices have been handled by
> EEPROM driver "24c32".
> There is a new requirement is to support power unit replacement by "off
> the shelf" device, matching electrical required parameters. Such device
> could be equipped with different EEPROM type, which could be one byte
> address space addressing or even could be not equipped with EEPROM.
> In such case "24c32" will not work.
>
> Fixes: 1bd42d94ccab ("platform/x86: mlx-platform: Add support for new 200G IB and Ethernet systems")
> Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
Patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> drivers/platform/x86/mlx-platform.c | 15 ++-------------
> 1 file changed, 2 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c
> index 8cf8c1be2666..e57d2471dfcb 100644
> --- a/drivers/platform/x86/mlx-platform.c
> +++ b/drivers/platform/x86/mlx-platform.c
> @@ -329,15 +329,6 @@ static struct i2c_board_info mlxplat_mlxcpld_psu[] = {
> },
> };
>
> -static struct i2c_board_info mlxplat_mlxcpld_ng_psu[] = {
> - {
> - I2C_BOARD_INFO("24c32", 0x51),
> - },
> - {
> - I2C_BOARD_INFO("24c32", 0x50),
> - },
> -};
> -
> static struct i2c_board_info mlxplat_mlxcpld_pwr[] = {
> {
> I2C_BOARD_INFO("dps460", 0x59),
> @@ -762,15 +753,13 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_ng_psu_items_data[] = {
> .label = "psu1",
> .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
> .mask = BIT(0),
> - .hpdev.brdinfo = &mlxplat_mlxcpld_ng_psu[0],
> - .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
> + .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
> },
> {
> .label = "psu2",
> .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
> .mask = BIT(1),
> - .hpdev.brdinfo = &mlxplat_mlxcpld_ng_psu[1],
> - .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
> + .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
> },
> };
>
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH platform-next 2/5] platform/x86: mlx-platform: Fix extended topology configuration for power supply units
2020-09-23 17:20 ` [PATCH platform-next 2/5] platform/x86: mlx-platform: Fix extended topology configuration for power supply units Vadim Pasternak
@ 2020-09-24 8:33 ` Hans de Goede
0 siblings, 0 replies; 12+ messages in thread
From: Hans de Goede @ 2020-09-24 8:33 UTC (permalink / raw)
To: Vadim Pasternak, andy.shevchenko, dvhart; +Cc: platform-driver-x86
Hi,
On 9/23/20 7:20 PM, Vadim Pasternak wrote:
> Fix topology configuration for power supply units in structure
> 'mlxplat_mlxcpld_ext_pwr_items_data', due to hardware change.
>
> Note: no need to backport the fix, since there is no such hardware yet
> (equipped with four power) at the filed.
>
> Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
Patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> drivers/platform/x86/mlx-platform.c | 18 +++++++++++++-----
> 1 file changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c
> index e57d2471dfcb..04a745095c37 100644
> --- a/drivers/platform/x86/mlx-platform.c
> +++ b/drivers/platform/x86/mlx-platform.c
> @@ -171,7 +171,6 @@
> #define MLXPLAT_CPLD_NR_NONE -1
> #define MLXPLAT_CPLD_PSU_DEFAULT_NR 10
> #define MLXPLAT_CPLD_PSU_MSNXXXX_NR 4
> -#define MLXPLAT_CPLD_PSU_MSNXXXX_NR2 3
> #define MLXPLAT_CPLD_FAN1_DEFAULT_NR 11
> #define MLXPLAT_CPLD_FAN2_DEFAULT_NR 12
> #define MLXPLAT_CPLD_FAN3_DEFAULT_NR 13
> @@ -338,6 +337,15 @@ static struct i2c_board_info mlxplat_mlxcpld_pwr[] = {
> },
> };
>
> +static struct i2c_board_info mlxplat_mlxcpld_ext_pwr[] = {
> + {
> + I2C_BOARD_INFO("dps460", 0x5b),
> + },
> + {
> + I2C_BOARD_INFO("dps460", 0x5a),
> + },
> +};
> +
> static struct i2c_board_info mlxplat_mlxcpld_fan[] = {
> {
> I2C_BOARD_INFO("24c32", 0x50),
> @@ -910,15 +918,15 @@ static struct mlxreg_core_data mlxplat_mlxcpld_ext_pwr_items_data[] = {
> .label = "pwr3",
> .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET,
> .mask = BIT(2),
> - .hpdev.brdinfo = &mlxplat_mlxcpld_pwr[0],
> - .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR2,
> + .hpdev.brdinfo = &mlxplat_mlxcpld_ext_pwr[0],
> + .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
> },
> {
> .label = "pwr4",
> .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET,
> .mask = BIT(3),
> - .hpdev.brdinfo = &mlxplat_mlxcpld_pwr[1],
> - .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR2,
> + .hpdev.brdinfo = &mlxplat_mlxcpld_ext_pwr[1],
> + .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
> },
> };
>
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH platform-next 3/5] platform_data/mlxreg: Update module license
2020-09-23 17:20 ` [PATCH platform-next 3/5] platform_data/mlxreg: Update module license Vadim Pasternak
@ 2020-09-24 8:33 ` Hans de Goede
0 siblings, 0 replies; 12+ messages in thread
From: Hans de Goede @ 2020-09-24 8:33 UTC (permalink / raw)
To: Vadim Pasternak, andy.shevchenko, dvhart; +Cc: platform-driver-x86
Hi,
On 9/23/20 7:20 PM, Vadim Pasternak wrote:
> Update license to SPDX-License.
>
> Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
Patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> include/linux/platform_data/mlxreg.h | 32 ++------------------------------
> 1 file changed, 2 insertions(+), 30 deletions(-)
>
> diff --git a/include/linux/platform_data/mlxreg.h b/include/linux/platform_data/mlxreg.h
> index 1af9c01563f9..0a727d405a7a 100644
> --- a/include/linux/platform_data/mlxreg.h
> +++ b/include/linux/platform_data/mlxreg.h
> @@ -1,34 +1,6 @@
> +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */
> /*
> - * Copyright (c) 2017 Mellanox Technologies. All rights reserved.
> - * Copyright (c) 2017 Vadim Pasternak <vadimp@mellanox.com>
> - *
> - * Redistribution and use in source and binary forms, with or without
> - * modification, are permitted provided that the following conditions are met:
> - *
> - * 1. Redistributions of source code must retain the above copyright
> - * notice, this list of conditions and the following disclaimer.
> - * 2. Redistributions in binary form must reproduce the above copyright
> - * notice, this list of conditions and the following disclaimer in the
> - * documentation and/or other materials provided with the distribution.
> - * 3. Neither the names of the copyright holders nor the names of its
> - * contributors may be used to endorse or promote products derived from
> - * this software without specific prior written permission.
> - *
> - * Alternatively, this software may be distributed under the terms of the
> - * GNU General Public License ("GPL") version 2 as published by the Free
> - * Software Foundation.
> - *
> - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
> - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
> - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> - * POSSIBILITY OF SUCH DAMAGE.
> + * Copyright (C) 2017-2020 Mellanox Technologies Ltd.
> */
>
> #ifndef __LINUX_PLATFORM_DATA_MLXREG_H
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH platform-next 4/5] platform_data/mlxreg: Extend core platform structure
2020-09-23 17:20 ` [PATCH platform-next 4/5] platform_data/mlxreg: Extend core platform structure Vadim Pasternak
@ 2020-09-24 8:36 ` Hans de Goede
0 siblings, 0 replies; 12+ messages in thread
From: Hans de Goede @ 2020-09-24 8:36 UTC (permalink / raw)
To: Vadim Pasternak, andy.shevchenko, dvhart; +Cc: platform-driver-x86
Hi,
On 9/23/20 7:20 PM, Vadim Pasternak wrote:
> Add 'capability' field to structure 'mlxreg_core_platform_data'.
> The purpose of this filed to indicate the actual number of the
> components within the particular group. Such components could be,
> for example the number of the FAN drawers. Some systems are equipped
> with FAN drawers with one tachometer inside, others with FAN drawers
> with several tachometers inside.
>
> Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
Patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> include/linux/platform_data/mlxreg.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/include/linux/platform_data/mlxreg.h b/include/linux/platform_data/mlxreg.h
> index 0a727d405a7a..101333fe2b8d 100644
> --- a/include/linux/platform_data/mlxreg.h
> +++ b/include/linux/platform_data/mlxreg.h
> @@ -109,6 +109,7 @@ struct mlxreg_core_item {
> * @features: supported features of device;
> * @version: implementation version;
> * @identity: device identity name;
> + * @capability: device capability register;
> */
> struct mlxreg_core_platform_data {
> struct mlxreg_core_data *data;
> @@ -117,6 +118,7 @@ struct mlxreg_core_platform_data {
> u32 features;
> u32 version;
> char identity[MLXREG_CORE_LABEL_MAX_SIZE];
> + u32 capability;
> };
>
> /**
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH platform-next 5/5] platform/x86: mlx-platform: Add capability field to platform FAN description
2020-09-23 17:20 ` [PATCH platform-next 5/5] platform/x86: mlx-platform: Add capability field to platform FAN description Vadim Pasternak
@ 2020-09-24 8:36 ` Hans de Goede
0 siblings, 0 replies; 12+ messages in thread
From: Hans de Goede @ 2020-09-24 8:36 UTC (permalink / raw)
To: Vadim Pasternak, andy.shevchenko, dvhart; +Cc: platform-driver-x86
Hi,
On 9/23/20 7:20 PM, Vadim Pasternak wrote:
> Set 'capability' field to FAN core platform data..
> The content of 'capability' register allows to set the mapping between
> the drawers and tachometers.
> The motivation is to avoid adding a new code in the future in order to
> distinct between the systems types supporting a different kinds of the
> FAN drawers.
>
> Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
Patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> drivers/platform/x86/mlx-platform.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c
> index 04a745095c37..986ad3dda1c1 100644
> --- a/drivers/platform/x86/mlx-platform.c
> +++ b/drivers/platform/x86/mlx-platform.c
> @@ -1939,6 +1939,7 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_fan_data[] = {
> static struct mlxreg_core_platform_data mlxplat_default_fan_data = {
> .data = mlxplat_mlxcpld_default_fan_data,
> .counter = ARRAY_SIZE(mlxplat_mlxcpld_default_fan_data),
> + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
> };
>
> /* Watchdog type1: hardware implementation version1
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH platform-next 0/5] platform/x86: mlx-platform: Topology fixes and configuration updates
2020-09-23 17:20 [PATCH platform-next 0/5] platform/x86: mlx-platform: Topology fixes and configuration updates Vadim Pasternak
` (4 preceding siblings ...)
2020-09-23 17:20 ` [PATCH platform-next 5/5] platform/x86: mlx-platform: Add capability field to platform FAN description Vadim Pasternak
@ 2020-10-07 21:24 ` Hans de Goede
5 siblings, 0 replies; 12+ messages in thread
From: Hans de Goede @ 2020-10-07 21:24 UTC (permalink / raw)
To: Vadim Pasternak, andy.shevchenko, dvhart; +Cc: platform-driver-x86
Hi,
On 9/23/20 7:20 PM, Vadim Pasternak wrote:
> The patchset provides topology fixes for power units related structure
> and extension of FAN structure with capability field.
> The patchset includes:
> Patch#1 - Removes PSU EEPROM configuration for systems class equipped
> with 200x32Gb switch.
> Patch#2 - Changes topology for the next generation systems.
> Patch#3 - Updates module license to SPDX.
> Patches#4-#5 - Add capability field for core platform data structure.
>
> Vadim Pasternak (5):
> platform/x86: mlx-platform: Remove PSU EEPROM configuration
> platform/x86: mlx-platform: Fix extended topology configuration for
> power supply units
> platform_data/mlxreg: Update module license
> platform_data/mlxreg: Extend core platform structure
> platform/x86: mlx-platform: Add capability field to platform FAN
> description
Thank you for your patch-series, I've applied the series to my
review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Note it will show up there once I've pushed my local branch there,
which might take a while.
Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.
Regards,
Hans
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2020-10-07 21:24 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-23 17:20 [PATCH platform-next 0/5] platform/x86: mlx-platform: Topology fixes and configuration updates Vadim Pasternak
2020-09-23 17:20 ` [PATCH platform-next 1/5] platform/x86: mlx-platform: Remove PSU EEPROM configuration Vadim Pasternak
2020-09-24 8:33 ` Hans de Goede
2020-09-23 17:20 ` [PATCH platform-next 2/5] platform/x86: mlx-platform: Fix extended topology configuration for power supply units Vadim Pasternak
2020-09-24 8:33 ` Hans de Goede
2020-09-23 17:20 ` [PATCH platform-next 3/5] platform_data/mlxreg: Update module license Vadim Pasternak
2020-09-24 8:33 ` Hans de Goede
2020-09-23 17:20 ` [PATCH platform-next 4/5] platform_data/mlxreg: Extend core platform structure Vadim Pasternak
2020-09-24 8:36 ` Hans de Goede
2020-09-23 17:20 ` [PATCH platform-next 5/5] platform/x86: mlx-platform: Add capability field to platform FAN description Vadim Pasternak
2020-09-24 8:36 ` Hans de Goede
2020-10-07 21:24 ` [PATCH platform-next 0/5] platform/x86: mlx-platform: Topology fixes and configuration updates Hans de Goede
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.