From 506db30ddd8ad0f785540504535a025d6b42145b Mon Sep 17 00:00:00 2001 From: Ohad Oz Date: Wed, 9 Jan 2019 18:29:48 +0000 Subject: [PATCH] Adding "0016-qsfp_sysfs-Fix-dmidecode-call.patch" patch and pushing the rest on patch down --- .../0016-qsfp_sysfs-Fix-dmidecode-call.patch | 33 +++++++++++++++++++ ...Support-extended-port-numbers-for-S.patch} | 0 ...mlxsw-thermal-monitoring-amendments.patch} | 0 ...introduce-watchdog-driver-for-Mella.patch} | 0 ...Support-port-numbers-initialization.patch} | 0 .../base/any/kernels/4.9-lts/patches/series | 9 ++--- 6 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 packages/base/any/kernels/4.9-lts/patches/0016-qsfp_sysfs-Fix-dmidecode-call.patch rename packages/base/any/kernels/4.9-lts/patches/{0016-mlxsw-qsfp_sysfs-Support-extended-port-numbers-for-S.patch => 0017-mlxsw-qsfp_sysfs-Support-extended-port-numbers-for-S.patch} (100%) rename packages/base/any/kernels/4.9-lts/patches/{0017-mlxsw-thermal-monitoring-amendments.patch => 0018-mlxsw-thermal-monitoring-amendments.patch} (100%) rename packages/base/any/kernels/4.9-lts/patches/{0018-watchdog-mlx-wdt-introduce-watchdog-driver-for-Mella.patch => 0019-watchdog-mlx-wdt-introduce-watchdog-driver-for-Mella.patch} (100%) rename packages/base/any/kernels/4.9-lts/patches/{0019-mlxsw-qsfp_sysfs-Support-port-numbers-initialization.patch => 0020-mlxsw-qsfp_sysfs-Support-port-numbers-initialization.patch} (100%) diff --git a/packages/base/any/kernels/4.9-lts/patches/0016-qsfp_sysfs-Fix-dmidecode-call.patch b/packages/base/any/kernels/4.9-lts/patches/0016-qsfp_sysfs-Fix-dmidecode-call.patch new file mode 100644 index 00000000..3a65e134 --- /dev/null +++ b/packages/base/any/kernels/4.9-lts/patches/0016-qsfp_sysfs-Fix-dmidecode-call.patch @@ -0,0 +1,33 @@ +From ed87f7294ec22fe2e9780fec900f25954a720c8f Mon Sep 17 00:00:00 2001 +From: Vadim Pasternak +Date: Thu, 3 Jan 2019 18:02:06 +0000 +Subject: [PATCH 2/4] qsfp_sysfs: Fix dmidecode call + +--- + drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c b/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c +index 07cc7ea..c072b91 100644 +--- a/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c ++++ b/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c +@@ -231,14 +231,14 @@ mlxsw_qsfp_cpld_show(struct device *dev, struct device_attribute *attr, + return sprintf(buf, "%u\n", version); + } + +-static int __init mlxsw_qsfp_dmi_set_cpld_num(const struct dmi_system_id *dmi) ++static int mlxsw_qsfp_dmi_set_cpld_num(const struct dmi_system_id *dmi) + { + mlxsw_qsfp_cpld_num = MLXSW_QSFP_MAX_CPLD_NUM; + + return 1; + }; + +-static struct dmi_system_id mlxsw_qsfp_dmi_table[] __initdata = { ++static const struct dmi_system_id mlxsw_qsfp_dmi_table[] = { + { + .callback = mlxsw_qsfp_dmi_set_cpld_num, + .matches = { +-- +2.1.4 + diff --git a/packages/base/any/kernels/4.9-lts/patches/0016-mlxsw-qsfp_sysfs-Support-extended-port-numbers-for-S.patch b/packages/base/any/kernels/4.9-lts/patches/0017-mlxsw-qsfp_sysfs-Support-extended-port-numbers-for-S.patch similarity index 100% rename from packages/base/any/kernels/4.9-lts/patches/0016-mlxsw-qsfp_sysfs-Support-extended-port-numbers-for-S.patch rename to packages/base/any/kernels/4.9-lts/patches/0017-mlxsw-qsfp_sysfs-Support-extended-port-numbers-for-S.patch diff --git a/packages/base/any/kernels/4.9-lts/patches/0017-mlxsw-thermal-monitoring-amendments.patch b/packages/base/any/kernels/4.9-lts/patches/0018-mlxsw-thermal-monitoring-amendments.patch similarity index 100% rename from packages/base/any/kernels/4.9-lts/patches/0017-mlxsw-thermal-monitoring-amendments.patch rename to packages/base/any/kernels/4.9-lts/patches/0018-mlxsw-thermal-monitoring-amendments.patch diff --git a/packages/base/any/kernels/4.9-lts/patches/0018-watchdog-mlx-wdt-introduce-watchdog-driver-for-Mella.patch b/packages/base/any/kernels/4.9-lts/patches/0019-watchdog-mlx-wdt-introduce-watchdog-driver-for-Mella.patch similarity index 100% rename from packages/base/any/kernels/4.9-lts/patches/0018-watchdog-mlx-wdt-introduce-watchdog-driver-for-Mella.patch rename to packages/base/any/kernels/4.9-lts/patches/0019-watchdog-mlx-wdt-introduce-watchdog-driver-for-Mella.patch diff --git a/packages/base/any/kernels/4.9-lts/patches/0019-mlxsw-qsfp_sysfs-Support-port-numbers-initialization.patch b/packages/base/any/kernels/4.9-lts/patches/0020-mlxsw-qsfp_sysfs-Support-port-numbers-initialization.patch similarity index 100% rename from packages/base/any/kernels/4.9-lts/patches/0019-mlxsw-qsfp_sysfs-Support-port-numbers-initialization.patch rename to packages/base/any/kernels/4.9-lts/patches/0020-mlxsw-qsfp_sysfs-Support-port-numbers-initialization.patch diff --git a/packages/base/any/kernels/4.9-lts/patches/series b/packages/base/any/kernels/4.9-lts/patches/series index 61c7f43a..42b03cad 100644 --- a/packages/base/any/kernels/4.9-lts/patches/series +++ b/packages/base/any/kernels/4.9-lts/patches/series @@ -16,8 +16,9 @@ driver-add-the-support-max6620.patch 0013-Mellanox-backport-patchwork-from-kernels-4.17-4.19.patch 0014-platform-x86-mlx-platform-backport-from-4.19.patch 0015-platform-x86-mlx-platform-Add-support-for-register-a.patch -0016-mlxsw-qsfp_sysfs-Support-extended-port-numbers-for-S.patch -0017-mlxsw-thermal-monitoring-amendments.patch -0018-watchdog-mlx-wdt-introduce-watchdog-driver-for-Mella.patch -0019-mlxsw-qsfp_sysfs-Support-port-numbers-initialization.patch +0016-qsfp_sysfs-Fix-dmidecode-call.patch +0017-mlxsw-qsfp_sysfs-Support-extended-port-numbers-for-S.patch +0018-mlxsw-thermal-monitoring-amendments.patch +0019-watchdog-mlx-wdt-introduce-watchdog-driver-for-Mella.patch +0020-mlxsw-qsfp_sysfs-Support-port-numbers-initialization.patch