sonic-net · lguohan · Oct 24, 2021 · Oct 8, 2021 · Oct 8, 2021 · Oct 8, 2021
diff --git a/patch/0034-i2c-mlxcpld-Update-module-license.patch b/patch/0034-i2c-mlxcpld-Update-module-license.patch
@@ -0,0 +1,58 @@
+From cce75cca3f71d891f01f3e0bf8a09e357c8cce6d Mon Sep 17 00:00:00 2001
+From: Vadim Pasternak <vadimp@nvidia.com>
+Date: Thu, 10 Dec 2020 18:51:11 +0200
+Subject: [PATCH 34/60] i2c: mlxcpld: Update module license
+
+Update license to SPDX-License.
+
+Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
+Signed-off-by: Wolfram Sang <wsa@kernel.org>
+---
+ drivers/i2c/busses/i2c-mlxcpld.c | 32 +++-----------------------------
+ 1 file changed, 3 insertions(+), 29 deletions(-)
+
+diff --git a/drivers/i2c/busses/i2c-mlxcpld.c b/drivers/i2c/busses/i2c-mlxcpld.c
+index fdbffd2f455d..9e45214d1eb6 100644
+--- a/drivers/i2c/busses/i2c-mlxcpld.c
++++ b/drivers/i2c/busses/i2c-mlxcpld.c
+@@ -1,34 +1,8 @@
++// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0
+ /*
+- * Copyright (c) 2016 Mellanox Technologies. All rights reserved.
+- * Copyright (c) 2016 Michael Shych <michaels@mellanox.com>
++ * Mellanox i2c driver
+  *
+- * 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) 2016-2020 Mellanox Technologies
+  */
+
+ #include <linux/delay.h>
+-- 
+2.17.1
+
diff --git a/patch/0035-i2c-mlxcpld-Add-support-for-I2C-bus-frequency-settin.patch b/patch/0035-i2c-mlxcpld-Add-support-for-I2C-bus-frequency-settin.patch
@@ -0,0 +1,127 @@
+From b2fb45817c813351bc729fa18160b7b991ea2d0b Mon Sep 17 00:00:00 2001
+From: Vadim Pasternak <vadimp@nvidia.com>
+Date: Wed, 6 Jan 2021 01:33:47 +0200
+Subject: [PATCH 35/60] i2c: mlxcpld: Add support for I2C bus frequency setting
+
+Add support for I2C bus frequency setting according to the specific
+system capability. This capability is obtained from CPLD frequency
+setting register, which could be provided through the platform data.
+If such register is provided, it specifies minimal I2C bus frequency
+to be used for the devices attached to the I2C bus. Supported
+freqeuncies are 100KHz, 400KHz, 1MHz, while 100KHz is the default.
+
+Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
+Signed-off-by: Wolfram Sang <wsa@kernel.org>
+---
+ drivers/i2c/busses/i2c-mlxcpld.c | 63 +++++++++++++++++++++++++++++++-
+ 1 file changed, 62 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/i2c/busses/i2c-mlxcpld.c b/drivers/i2c/busses/i2c-mlxcpld.c
+index 9e45214d1eb6..4e0b7c2882ce 100644
+--- a/drivers/i2c/busses/i2c-mlxcpld.c
++++ b/drivers/i2c/busses/i2c-mlxcpld.c
+@@ -11,7 +11,9 @@
+ #include <linux/io.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
++#include <linux/platform_data/mlxreg.h>
+ #include <linux/platform_device.h>
++#include <linux/regmap.h>
+
+ /* General defines */
+ #define MLXPLAT_CPLD_LPC_I2C_BASE_ADDR	0x2000
+@@ -46,6 +48,16 @@
+ #define MLXCPLD_LPCI2C_ACK_IND		1
+ #define MLXCPLD_LPCI2C_NACK_IND		2
+
++#define MLXCPLD_I2C_FREQ_1000KHZ_SET	0x04
++#define MLXCPLD_I2C_FREQ_400KHZ_SET	0x0f
++#define MLXCPLD_I2C_FREQ_100KHZ_SET	0x42
++
++enum mlxcpld_i2c_frequency {
++	MLXCPLD_I2C_FREQ_1000KHZ = 1,
++	MLXCPLD_I2C_FREQ_400KHZ = 2,
++	MLXCPLD_I2C_FREQ_100KHZ = 3,
++};
++
+ struct  mlxcpld_i2c_curr_xfer {
+ 	u8 cmd;
+ 	u8 addr_width;
+@@ -463,8 +475,45 @@ static struct i2c_adapter mlxcpld_i2c_adapter = {
+ 	.nr		= MLXCPLD_I2C_BUS_NUM,
+ };
+
++static int
++mlxcpld_i2c_set_frequency(struct mlxcpld_i2c_priv *priv,
++			  struct mlxreg_core_hotplug_platform_data *pdata)
++{
++	struct mlxreg_core_item *item = pdata->items;
++	struct mlxreg_core_data *data;
++	u32 regval;
++	u8 freq;
++	int err;
++
++	if (!item)
++		return 0;
++
++	/* Read frequency setting. */
++	data = item->data;
++	err = regmap_read(pdata->regmap, data->reg, &regval);
++	if (err)
++		return err;
++
++	/* Set frequency only if it is not 100KHz, which is default. */
++	switch ((data->reg & data->mask) >> data->bit) {
++	case MLXCPLD_I2C_FREQ_1000KHZ:
++		freq = MLXCPLD_I2C_FREQ_1000KHZ_SET;
++		break;
++	case MLXCPLD_I2C_FREQ_400KHZ:
++		freq = MLXCPLD_I2C_FREQ_400KHZ_SET;
++		break;
++	default:
++		return 0;
++	}
++
++	mlxcpld_i2c_write_comm(priv, MLXCPLD_LPCI2C_HALF_CYC_REG, &freq, 1);
++
++	return 0;
++}
++
+ static int mlxcpld_i2c_probe(struct platform_device *pdev)
+ {
++	struct mlxreg_core_hotplug_platform_data *pdata;
+ 	struct mlxcpld_i2c_priv *priv;
+ 	int err;
+ 	u8 val;
+@@ -479,6 +528,14 @@ static int mlxcpld_i2c_probe(struct platform_device *pdev)
+ 	priv->dev = &pdev->dev;
+ 	priv->base_addr = MLXPLAT_CPLD_LPC_I2C_BASE_ADDR;
+
++	/* Set I2C bus frequency if platform data provides this info. */
++	pdata = dev_get_platdata(&pdev->dev);
++	if (pdata) {
++		err = mlxcpld_i2c_set_frequency(priv, pdata);
++		if (err)
++			goto mlxcpld_i2_probe_failed;
++	}
++
+ 	/* Register with i2c layer */
+ 	mlxcpld_i2c_adapter.timeout = usecs_to_jiffies(MLXCPLD_I2C_XFER_TO);
+ 	/* Read capability register */
+@@ -497,8 +554,12 @@ static int mlxcpld_i2c_probe(struct platform_device *pdev)
+
+ 	err = i2c_add_numbered_adapter(&priv->adap);
+ 	if (err)
+-		mutex_destroy(&priv->lock);
++		goto mlxcpld_i2_probe_failed;
+
++	return 0;
++
++mlxcpld_i2_probe_failed:
++	mutex_destroy(&priv->lock);
+ 	return err;
+ }
+
+-- 
+2.17.1
+
diff --git a/patch/0036-i2c-mux-mlxcpld-Update-module-license.patch b/patch/0036-i2c-mux-mlxcpld-Update-module-license.patch
@@ -0,0 +1,60 @@
+From 01b9025ed8416addf6bf3e70e67542f809b0904e Mon Sep 17 00:00:00 2001
+From: Vadim Pasternak <vadimp@nvidia.com>
+Date: Fri, 22 Jan 2021 21:24:56 +0200
+Subject: [PATCH 36/60] i2c: mux: mlxcpld: Update module license
+
+Update license to SPDX-License.
+
+Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
+Acked-by: Peter Rosin <peda@axentia.se>
+Signed-off-by: Wolfram Sang <wsa@kernel.org>
+---
+ drivers/i2c/muxes/i2c-mux-mlxcpld.c | 33 +++--------------------------
+ 1 file changed, 3 insertions(+), 30 deletions(-)
+
+diff --git a/drivers/i2c/muxes/i2c-mux-mlxcpld.c b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
+index f2bf3e57ed67..c9a94abcb6be 100644
+--- a/drivers/i2c/muxes/i2c-mux-mlxcpld.c
++++ b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
+@@ -1,35 +1,8 @@
++// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0
+ /*
+- * drivers/i2c/muxes/i2c-mux-mlxcpld.c
+- * Copyright (c) 2016 Mellanox Technologies. All rights reserved.
+- * Copyright (c) 2016 Michael Shych <michaels@mellanox.com>
++ * Mellanox i2c mux driver
+  *
+- * 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) 2016-2020 Mellanox Technologies
+  */
+
+ #include <linux/device.h>
+-- 
+2.17.1
+
diff --git a/patch/0037-i2c-mux-mlxcpld-Move-header-file-out-of-x86-realm.patch b/patch/0037-i2c-mux-mlxcpld-Move-header-file-out-of-x86-realm.patch
@@ -0,0 +1,39 @@
+From 15d88491548062c35ca8969597074a2ab66ac149 Mon Sep 17 00:00:00 2001
+From: Vadim Pasternak <vadimp@nvidia.com>
+Date: Fri, 22 Jan 2021 21:24:58 +0200
+Subject: [PATCH 37/60] i2c: mux: mlxcpld: Move header file out of x86 realm
+
+Move out header file from include/linux/platform_data/x86/ to
+include/linux/platform_data/, since it does not depend on x86
+architecture.
+
+Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
+Reviewed-by: Michael Shych <michaelsh@nvidia.com>
+Acked-by: Peter Rosin <peda@axentia.se>
+Signed-off-by: Wolfram Sang <wsa@kernel.org>
+---
+ drivers/i2c/muxes/i2c-mux-mlxcpld.c             | 2 +-
+ include/linux/platform_data/{x86 => }/mlxcpld.h | 0
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename include/linux/platform_data/{x86 => }/mlxcpld.h (100%)
+
+diff --git a/drivers/i2c/muxes/i2c-mux-mlxcpld.c b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
+index c9a94abcb6be..be2d0fa24096 100644
+--- a/drivers/i2c/muxes/i2c-mux-mlxcpld.c
++++ b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
+@@ -11,7 +11,7 @@
+ #include <linux/io.h>
+ #include <linux/init.h>
+ #include <linux/module.h>
+-#include <linux/platform_data/x86/mlxcpld.h>
++#include <linux/platform_data/mlxcpld.h>
+ #include <linux/platform_device.h>
+ #include <linux/slab.h>
+
+diff --git a/include/linux/platform_data/x86/mlxcpld.h b/include/linux/platform_data/mlxcpld.h
+similarity index 100%
+rename from include/linux/platform_data/x86/mlxcpld.h
+rename to include/linux/platform_data/mlxcpld.h
+-- 
+2.17.1
+
diff --git a/patch/0038-platform-x86-mlxcpld-Update-module-license.patch b/patch/0038-platform-x86-mlxcpld-Update-module-license.patch
@@ -0,0 +1,59 @@
+From 9abbafd082e1545740b08a8028d80bad1a10bb30 Mon Sep 17 00:00:00 2001
+From: Vadim Pasternak <vadimp@nvidia.com>
+Date: Sun, 7 Feb 2021 20:51:32 +0200
+Subject: [PATCH 38/60] platform/x86: mlxcpld: Update module license
+
+Update license to SPDX-License.
+
+Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
+---
+ include/linux/platform_data/mlxcpld.h | 34 +++------------------------
+ 1 file changed, 3 insertions(+), 31 deletions(-)
+
+diff --git a/include/linux/platform_data/mlxcpld.h b/include/linux/platform_data/mlxcpld.h
+index b08dcb183fca..e6c18bf017dd 100644
+--- a/include/linux/platform_data/mlxcpld.h
++++ b/include/linux/platform_data/mlxcpld.h
+@@ -1,36 +1,8 @@
++/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */
+ /*
+- * mlxcpld.h - Mellanox I2C multiplexer support in CPLD
++ * Mellanox I2C multiplexer support in CPLD
+  *
+- * Copyright (c) 2016 Mellanox Technologies. All rights reserved.
+- * Copyright (c) 2016 Michael Shych <michaels@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) 2016-2020 Mellanox Technologies
+  */
+
+ #ifndef _LINUX_I2C_MLXCPLD_H
+-- 
+2.17.1
+