Skip to content

Linux 5.10.103 update #277

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
saiarcot895 merged 6 commits into from
Apr 20, 2022
Merged

Linux 5.10.103 update #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d7d0eb
Update to Linux 5.10.103
saiarcot895 Feb 15, 2022
02bcdae
Update mellanox patches to kernel 5.10.103
alexrallen Mar 24, 2022
511d962
Update kernel config for mellanox patches
alexrallen Mar 24, 2022
8a85d27
Revert thermal commit temporarily while SONiC thermal infra is updated
alexrallen Mar 31, 2022
930bdbf
Merge pull request #3 from alexrallen/mlnx_103_update
saiarcot895 Apr 12, 2022
bf6c523
Fix compilation for armhf/arm64
saiarcot895 Apr 13, 2022
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
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ SHELL = /bin/bash
.SHELLFLAGS += -e

KERNEL_ABI_MINOR_VERSION = 2
KVERSION_SHORT ?= 5.10.0-8-$(KERNEL_ABI_MINOR_VERSION)
KVERSION_SHORT ?= 5.10.0-12-$(KERNEL_ABI_MINOR_VERSION)
KVERSION ?= $(KVERSION_SHORT)-amd64
KERNEL_VERSION ?= 5.10.46
KERNEL_SUBVERSION ?= 4
KERNEL_VERSION ?= 5.10.103
KERNEL_SUBVERSION ?= 1
kernel_procure_method ?= build
CONFIGURED_ARCH ?= amd64

Expand Down
88 changes: 0 additions & 88 deletions patch/0001-net-prefer-socket-bound-to-interface-when-not-in-VRF.patch
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions patch/0012-hwmon-mlxreg-fan-Add-support-for-fan-drawers-ca.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Signed-off-by: Guenter Roeck <[email protected]>
1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/drivers/hwmon/mlxreg-fan.c b/drivers/hwmon/mlxreg-fan.c
index ed8d59d4eecb..116681fde33d 100644
index bd8f5a3aaad9..89fe7b9fe26b 100644
--- a/drivers/hwmon/mlxreg-fan.c
+++ b/drivers/hwmon/mlxreg-fan.c
@@ -67,11 +67,13 @@
Expand Down Expand Up @@ -79,7 +79,7 @@ index ed8d59d4eecb..116681fde33d 100644
err = regmap_read(fan->regmap, tacho->reg, &regval);
if (err)
return err;
@@ -389,8 +413,8 @@ static int mlxreg_fan_config(struct mlxreg_fan *fan,
@@ -395,8 +419,8 @@ static int mlxreg_fan_config(struct mlxreg_fan *fan,
struct mlxreg_core_platform_data *pdata)
{
struct mlxreg_core_data *data = pdata->data;
Expand All @@ -89,7 +89,7 @@ index ed8d59d4eecb..116681fde33d 100644
int err;

fan->samples = MLXREG_FAN_TACHO_SAMPLES_PER_PULSE_DEF;
@@ -415,7 +439,9 @@ static int mlxreg_fan_config(struct mlxreg_fan *fan,
@@ -421,7 +445,9 @@ static int mlxreg_fan_config(struct mlxreg_fan *fan,

fan->tacho[tacho_num].reg = data->reg;
fan->tacho[tacho_num].mask = data->mask;
Expand All @@ -99,7 +99,7 @@ index ed8d59d4eecb..116681fde33d 100644
} else if (strnstr(data->label, "pwm", sizeof(data->label))) {
if (fan->pwm.connected) {
dev_err(fan->dev, "duplicate pwm entry: %s\n",
@@ -453,6 +479,29 @@ static int mlxreg_fan_config(struct mlxreg_fan *fan,
@@ -459,6 +485,29 @@ static int mlxreg_fan_config(struct mlxreg_fan *fan,
}
}

Expand Down
10 changes: 5 additions & 5 deletions patch/0013-hwmon-pmbus-shrink-code-and-remove-pmbus_do_rem.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ index decbd07c6d6e..c7400d4f1bfa 100644
};

diff --git a/drivers/hwmon/pmbus/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c
index 2fb7540ee952..d6bbbb223871 100644
index da261d32450d..830003fe7024 100644
--- a/drivers/hwmon/pmbus/ibm-cffps.c
+++ b/drivers/hwmon/pmbus/ibm-cffps.c
@@ -617,7 +617,6 @@ static struct i2c_driver ibm_cffps_driver = {
@@ -623,7 +623,6 @@ static struct i2c_driver ibm_cffps_driver = {
.of_match_table = ibm_cffps_of_match,
},
.probe_new = ibm_cffps_probe,
Expand Down Expand Up @@ -222,10 +222,10 @@ index 3f1b826dac8a..789242ed72e5 100644
};

diff --git a/drivers/hwmon/pmbus/lm25066.c b/drivers/hwmon/pmbus/lm25066.c
index 429172a42902..c75a6bf39641 100644
index 17199a1104c7..9041a1c0f175 100644
--- a/drivers/hwmon/pmbus/lm25066.c
+++ b/drivers/hwmon/pmbus/lm25066.c
@@ -508,7 +508,6 @@ static struct i2c_driver lm25066_driver = {
@@ -531,7 +531,6 @@ static struct i2c_driver lm25066_driver = {
.name = "lm25066",
},
.probe_new = lm25066_probe,
Expand Down Expand Up @@ -342,7 +342,7 @@ index 4b2239a6afd3..329dc851fc59 100644
};

diff --git a/drivers/hwmon/pmbus/mp2975.c b/drivers/hwmon/pmbus/mp2975.c
index 1c3e2a9453b1..60fbdb371332 100644
index a41fe06e0ad4..74060bc477cf 100644
--- a/drivers/hwmon/pmbus/mp2975.c
+++ b/drivers/hwmon/pmbus/mp2975.c
@@ -758,7 +758,6 @@ static struct i2c_driver mp2975_driver = {
Expand Down
18 changes: 9 additions & 9 deletions patch/0014-thermal-drivers-core-Use-a-char-pointer-for-the.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ Link: https://lore.kernel.org/r/[email protected]
3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
index 42e4437ac3c1..3032075e6cca 100644
index 7ec1d0ee9bee..ecd1856bef5e 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
@@ -141,7 +141,7 @@ static int mlxsw_get_cooling_device_idx(struct mlxsw_thermal *thermal,
@@ -133,7 +133,7 @@ static int mlxsw_get_cooling_device_idx(struct mlxsw_thermal *thermal,
/* Allow mlxsw thermal zone binding to an external cooling device */
for (i = 0; i < ARRAY_SIZE(mlxsw_thermal_external_allowed_cdev); i++) {
if (strnstr(cdev->type, mlxsw_thermal_external_allowed_cdev[i],
Expand All @@ -42,10 +42,10 @@ index 42e4437ac3c1..3032075e6cca 100644
}

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index c6d74bc1c90b..12c89a362a17 100644
index d9e34ac37662..1abef64ccb5f 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1091,10 +1091,7 @@ __thermal_cooling_device_register(struct device_node *np,
@@ -1092,10 +1092,7 @@ __thermal_cooling_device_register(struct device_node *np,
{
struct thermal_cooling_device *cdev;
struct thermal_zone_device *pos = NULL;
Expand All @@ -57,7 +57,7 @@ index c6d74bc1c90b..12c89a362a17 100644

if (!ops || !ops->get_max_state || !ops->get_cur_state ||
!ops->set_cur_state)
@@ -1104,14 +1101,17 @@ __thermal_cooling_device_register(struct device_node *np,
@@ -1105,14 +1102,17 @@ __thermal_cooling_device_register(struct device_node *np,
if (!cdev)
return ERR_PTR(-ENOMEM);

Expand All @@ -81,7 +81,7 @@ index c6d74bc1c90b..12c89a362a17 100644
mutex_init(&cdev->lock);
INIT_LIST_HEAD(&cdev->thermal_instances);
cdev->np = np;
@@ -1121,12 +1121,9 @@ __thermal_cooling_device_register(struct device_node *np,
@@ -1122,12 +1122,9 @@ __thermal_cooling_device_register(struct device_node *np,
cdev->devdata = devdata;
thermal_cooling_device_setup_sysfs(cdev);
dev_set_name(&cdev->device, "cooling_device%d", cdev->id);
Expand All @@ -97,7 +97,7 @@ index c6d74bc1c90b..12c89a362a17 100644

/* Add 'this' new cdev to the global cdev list */
mutex_lock(&thermal_list_lock);
@@ -1144,6 +1141,14 @@ __thermal_cooling_device_register(struct device_node *np,
@@ -1145,6 +1142,14 @@ __thermal_cooling_device_register(struct device_node *np,
mutex_unlock(&thermal_list_lock);

return cdev;
Expand All @@ -112,7 +112,7 @@ index c6d74bc1c90b..12c89a362a17 100644
}

/**
@@ -1302,6 +1307,7 @@ void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev)
@@ -1303,6 +1308,7 @@ void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev)
ida_simple_remove(&thermal_cdev_ida, cdev->id);
device_del(&cdev->device);
thermal_cooling_device_destroy_sysfs(cdev);
Expand All @@ -121,7 +121,7 @@ index c6d74bc1c90b..12c89a362a17 100644
}
EXPORT_SYMBOL_GPL(thermal_cooling_device_unregister);
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index d07ea27e72a9..02eb71295753 100644
index 176d9454e8f3..7097d4dcfdd0 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -92,7 +92,7 @@ struct thermal_cooling_device_ops {
Expand Down
18 changes: 9 additions & 9 deletions patch/0015-mlxsw-core-Remove-critical-trip-points-from-the.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <[email protected]>
1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
index 3032075e6cca..85f0ce285146 100644
index ecd1856bef5e..5b37449d4b66 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
@@ -19,7 +19,6 @@
Expand All @@ -32,15 +32,15 @@ index 3032075e6cca..85f0ce285146 100644
#define MLXSW_THERMAL_HYSTERESIS_TEMP 5000 /* 5C */
#define MLXSW_THERMAL_MODULE_TEMP_SHIFT (MLXSW_THERMAL_HYSTERESIS_TEMP * 2)
#define MLXSW_THERMAL_ZONE_MAX_NAME 16
@@ -45,7 +44,6 @@ enum mlxsw_thermal_trips {
@@ -37,7 +36,6 @@ enum mlxsw_thermal_trips {
MLXSW_THERMAL_TEMP_TRIP_NORM,
MLXSW_THERMAL_TEMP_TRIP_HIGH,
MLXSW_THERMAL_TEMP_TRIP_HOT,
- MLXSW_THERMAL_TEMP_TRIP_CRIT,
};

struct mlxsw_thermal_trip {
@@ -75,16 +73,9 @@ static const struct mlxsw_thermal_trip default_thermal_trips[] = {
@@ -67,16 +65,9 @@ static const struct mlxsw_thermal_trip default_thermal_trips[] = {
{ /* Warning */
.type = THERMAL_TRIP_HOT,
.temp = MLXSW_THERMAL_ASIC_TEMP_HOT,
Expand All @@ -57,15 +57,15 @@ index 3032075e6cca..85f0ce285146 100644
};

#define MLXSW_THERMAL_NUM_TRIPS ARRAY_SIZE(default_thermal_trips)
@@ -154,7 +145,6 @@ mlxsw_thermal_module_trips_reset(struct mlxsw_thermal_module *tz)
@@ -146,7 +137,6 @@ mlxsw_thermal_module_trips_reset(struct mlxsw_thermal_module *tz)
tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM].temp = 0;
tz->trips[MLXSW_THERMAL_TEMP_TRIP_HIGH].temp = 0;
tz->trips[MLXSW_THERMAL_TEMP_TRIP_HOT].temp = 0;
- tz->trips[MLXSW_THERMAL_TEMP_TRIP_CRIT].temp = 0;
}

static int
@@ -183,11 +173,10 @@ mlxsw_thermal_module_trips_update(struct device *dev, struct mlxsw_core *core,
@@ -175,11 +165,10 @@ mlxsw_thermal_module_trips_update(struct device *dev, struct mlxsw_core *core,
}

/* According to the system thermal requirements, the thermal zones are
Expand All @@ -80,7 +80,7 @@ index 3032075e6cca..85f0ce285146 100644
*/
if (crit_temp >= MLXSW_THERMAL_MODULE_TEMP_SHIFT)
tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM].temp = crit_temp -
@@ -196,8 +185,6 @@ mlxsw_thermal_module_trips_update(struct device *dev, struct mlxsw_core *core,
@@ -188,8 +177,6 @@ mlxsw_thermal_module_trips_update(struct device *dev, struct mlxsw_core *core,
tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM].temp = crit_temp;
tz->trips[MLXSW_THERMAL_TEMP_TRIP_HIGH].temp = crit_temp;
tz->trips[MLXSW_THERMAL_TEMP_TRIP_HOT].temp = emerg_temp;
Expand All @@ -89,7 +89,7 @@ index 3032075e6cca..85f0ce285146 100644

return 0;
}
@@ -210,7 +197,7 @@ static void mlxsw_thermal_tz_score_update(struct mlxsw_thermal *thermal,
@@ -202,7 +189,7 @@ static void mlxsw_thermal_tz_score_update(struct mlxsw_thermal *thermal,
struct mlxsw_thermal_trip *trip = trips;
unsigned int score, delta, i, shift = 1;

Expand All @@ -98,7 +98,7 @@ index 3032075e6cca..85f0ce285146 100644
* threshold score is set to MLXSW_THERMAL_TEMP_SCORE_MAX.
*/
score = MLXSW_THERMAL_TEMP_SCORE_MAX;
@@ -333,8 +320,7 @@ static int mlxsw_thermal_set_trip_temp(struct thermal_zone_device *tzdev,
@@ -325,8 +312,7 @@ static int mlxsw_thermal_set_trip_temp(struct thermal_zone_device *tzdev,
{
struct mlxsw_thermal *thermal = tzdev->devdata;

Expand All @@ -108,7 +108,7 @@ index 3032075e6cca..85f0ce285146 100644
return -EINVAL;

thermal->trips[trip].temp = temp;
@@ -502,8 +488,7 @@ mlxsw_thermal_module_trip_temp_set(struct thermal_zone_device *tzdev,
@@ -494,8 +480,7 @@ mlxsw_thermal_module_trip_temp_set(struct thermal_zone_device *tzdev,
{
struct mlxsw_thermal_module *tz = tzdev->devdata;

Expand Down
Loading