From bbf045a4728b147cea494ae1f345df5a0bad5990 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Mon, 21 Aug 2023 09:30:18 -0700 Subject: [PATCH] Update kernel to 6.1.38 Patches that either required no changes or minimal changes for compilation are enabled. Other patches that appeared to require more changes or changes involving domain knowledge have been disabled for now. Dependent patches/configs have been disabled as well. Signed-off-by: Saikrishna Arcot --- Makefile | 12 +- ...apsulate-packet-metadata-in-a-struct.patch | 145 ------- ...e-Add-additional-metadata-attributes.patch | 132 ------- patch/cisco-acpi-spi-nor.patch | 2 +- patch/cisco-npu-disable-other-bars.patch | 6 +- ...et-tg3-disallow-broadcom-default-mac.patch | 36 +- .../driver-arista-pci-reassign-pref-mem.patch | 10 +- patch/driver-hwmon-pmbus-dni_dps460.patch | 7 +- patch/driver-hwmon-pmbus-dps1900.patch | 4 +- ...river-sff-8436-use-nvmem_device_read.patch | 2 +- ...er-support-optoe-update-to-linux-6.1.patch | 30 ++ ...river-support-sff-8436-eeprom-update.patch | 9 +- patch/kconfig-inclusions | 8 +- ...le-building-linux-source-deb-package.patch | 14 +- .../preconfig/packaging-update-abiname.patch | 18 +- patch/series | 354 +++++++++--------- 16 files changed, 273 insertions(+), 516 deletions(-) delete mode 100644 patch/0001-psample-Encapsulate-packet-metadata-in-a-struct.patch delete mode 100644 patch/0002-psample-Add-additional-metadata-attributes.patch create mode 100644 patch/driver-support-optoe-update-to-linux-6.1.patch diff --git a/Makefile b/Makefile index 73890169c2a9..37e58023a427 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ SHELL = /bin/bash .SHELLFLAGS += -e KERNEL_ABI_MINOR_VERSION = 2 -KVERSION_SHORT ?= 5.10.0-23-$(KERNEL_ABI_MINOR_VERSION) +KVERSION_SHORT ?= 6.1.0-11-$(KERNEL_ABI_MINOR_VERSION) KVERSION ?= $(KVERSION_SHORT)-amd64 -KERNEL_VERSION ?= 5.10.179 -KERNEL_SUBVERSION ?= 3 +KERNEL_VERSION ?= 6.1.38 +KERNEL_SUBVERSION ?= 4 kernel_procure_method ?= build CONFIGURED_ARCH ?= amd64 CONFIGURED_PLATFORM ?= vs @@ -109,9 +109,9 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : debian/bin/gencontrol.py # generate linux build file for amd64_none_amd64 - fakeroot make -f debian/rules.gen DEB_HOST_ARCH=armhf setup_armhf_none_armmp - fakeroot make -f debian/rules.gen DEB_HOST_ARCH=arm64 setup_arm64_none_arm64 - fakeroot make -f debian/rules.gen DEB_HOST_ARCH=amd64 setup_amd64_none_amd64 + DEB_HOST_ARCH=armhf fakeroot make -f debian/rules.gen setup_armhf_none_armmp + DEB_HOST_ARCH=arm64 fakeroot make -f debian/rules.gen setup_arm64_none_arm64 + DEB_HOST_ARCH=amd64 fakeroot make -f debian/rules.gen setup_amd64_none_amd64 # Applying patches and configuration changes git add debian/build/build_armhf_none_armmp/.config -f diff --git a/patch/0001-psample-Encapsulate-packet-metadata-in-a-struct.patch b/patch/0001-psample-Encapsulate-packet-metadata-in-a-struct.patch deleted file mode 100644 index 6a1cc9fdcef0..000000000000 --- a/patch/0001-psample-Encapsulate-packet-metadata-in-a-struct.patch +++ /dev/null @@ -1,145 +0,0 @@ -From a03e99d39f1943ec88f6fd3b0b9f34c20663d401 Mon Sep 17 00:00:00 2001 -From: Ido Schimmel -Date: Sun, 14 Mar 2021 14:19:30 +0200 -Subject: [PATCH] psample: Encapsulate packet metadata in a struct - -Currently, callers of psample_sample_packet() pass three metadata -attributes: Ingress port, egress port and truncated size. Subsequent -patches are going to add more attributes (e.g., egress queue occupancy), -which also need an indication whether they are valid or not. - -Encapsulate packet metadata in a struct in order to keep the number of -arguments reasonable. - -Signed-off-by: Ido Schimmel -Reviewed-by: Jiri Pirko -Signed-off-by: David S. Miller ---- - drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 8 ++++---- - include/net/psample.h | 14 +++++++++----- - net/psample/psample.c | 6 ++++-- - net/sched/act_sample.c | 16 ++++++---------- - 4 files changed, 23 insertions(+), 21 deletions(-) - -diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c -index 93b15b8c007e6d..3b15f8d728a37e 100644 ---- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c -+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c -@@ -2217,7 +2217,7 @@ void mlxsw_sp_sample_receive(struct mlxsw_sp *mlxsw_sp, struct sk_buff *skb, - { - struct mlxsw_sp_port *mlxsw_sp_port = mlxsw_sp->ports[local_port]; - struct mlxsw_sp_port_sample *sample; -- u32 size; -+ struct psample_metadata md = {}; - - if (unlikely(!mlxsw_sp_port)) { - dev_warn_ratelimited(mlxsw_sp->bus_info->dev, "Port %d: sample skb received for non-existent port\n", -@@ -2229,9 +2229,9 @@ void mlxsw_sp_sample_receive(struct mlxsw_sp *mlxsw_sp, struct sk_buff *skb, - sample = rcu_dereference(mlxsw_sp_port->sample); - if (!sample) - goto out_unlock; -- size = sample->truncate ? sample->trunc_size : skb->len; -- psample_sample_packet(sample->psample_group, skb, size, -- mlxsw_sp_port->dev->ifindex, 0, sample->rate); -+ md.trunc_size = sample->truncate ? sample->trunc_size : skb->len; -+ md.in_ifindex = mlxsw_sp_port->dev->ifindex; -+ psample_sample_packet(sample->psample_group, skb, sample->rate, &md); - out_unlock: - rcu_read_unlock(); - out: -diff --git a/include/net/psample.h b/include/net/psample.h -index 68ae16bb0a4a85..ac6dbfb3870d94 100644 ---- a/include/net/psample.h -+++ b/include/net/psample.h -@@ -14,6 +14,12 @@ struct psample_group { - struct rcu_head rcu; - }; - -+struct psample_metadata { -+ u32 trunc_size; -+ int in_ifindex; -+ int out_ifindex; -+}; -+ - struct psample_group *psample_group_get(struct net *net, u32 group_num); - void psample_group_take(struct psample_group *group); - void psample_group_put(struct psample_group *group); -@@ -21,15 +27,13 @@ void psample_group_put(struct psample_group *group); - #if IS_ENABLED(CONFIG_PSAMPLE) - - void psample_sample_packet(struct psample_group *group, struct sk_buff *skb, -- u32 trunc_size, int in_ifindex, int out_ifindex, -- u32 sample_rate); -+ u32 sample_rate, const struct psample_metadata *md); - - #else - - static inline void psample_sample_packet(struct psample_group *group, -- struct sk_buff *skb, u32 trunc_size, -- int in_ifindex, int out_ifindex, -- u32 sample_rate) -+ struct sk_buff *skb, u32 sample_rate, -+ const struct psample_metadata *md) - { - } - -diff --git a/net/psample/psample.c b/net/psample/psample.c -index 482c07f2766b18..065bc887d23936 100644 ---- a/net/psample/psample.c -+++ b/net/psample/psample.c -@@ -356,9 +356,11 @@ static int psample_tunnel_meta_len(struct ip_tunnel_info *tun_info) - #endif - - void psample_sample_packet(struct psample_group *group, struct sk_buff *skb, -- u32 trunc_size, int in_ifindex, int out_ifindex, -- u32 sample_rate) -+ u32 sample_rate, const struct psample_metadata *md) - { -+ int out_ifindex = md->out_ifindex; -+ int in_ifindex = md->in_ifindex; -+ u32 trunc_size = md->trunc_size; - #ifdef CONFIG_INET - struct ip_tunnel_info *tun_info; - #endif -diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c -index db8ee9e5c8c229..6a0c16e4351d71 100644 ---- a/net/sched/act_sample.c -+++ b/net/sched/act_sample.c -@@ -158,10 +158,8 @@ static int tcf_sample_act(struct sk_buff *skb, const struct tc_action *a, - { - struct tcf_sample *s = to_sample(a); - struct psample_group *psample_group; -+ struct psample_metadata md = {}; - int retval; -- int size; -- int iif; -- int oif; - - tcf_lastuse_update(&s->tcf_tm); - bstats_cpu_update(this_cpu_ptr(s->common.cpu_bstats), skb); -@@ -172,20 +170,18 @@ static int tcf_sample_act(struct sk_buff *skb, const struct tc_action *a, - /* randomly sample packets according to rate */ - if (psample_group && (prandom_u32() % s->rate == 0)) { - if (!skb_at_tc_ingress(skb)) { -- iif = skb->skb_iif; -- oif = skb->dev->ifindex; -+ md.in_ifindex = skb->skb_iif; -+ md.out_ifindex = skb->dev->ifindex; - } else { -- iif = skb->dev->ifindex; -- oif = 0; -+ md.in_ifindex = skb->dev->ifindex; - } - - /* on ingress, the mac header gets popped, so push it back */ - if (skb_at_tc_ingress(skb) && tcf_sample_dev_ok_push(skb->dev)) - skb_push(skb, skb->mac_len); - -- size = s->truncate ? s->trunc_size : skb->len; -- psample_sample_packet(psample_group, skb, size, iif, oif, -- s->rate); -+ md.trunc_size = s->truncate ? s->trunc_size : skb->len; -+ psample_sample_packet(psample_group, skb, s->rate, &md); - - if (skb_at_tc_ingress(skb) && tcf_sample_dev_ok_push(skb->dev)) - skb_pull(skb, skb->mac_len); diff --git a/patch/0002-psample-Add-additional-metadata-attributes.patch b/patch/0002-psample-Add-additional-metadata-attributes.patch deleted file mode 100644 index 174ca67f28f6..000000000000 --- a/patch/0002-psample-Add-additional-metadata-attributes.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 07e1a5809b595df6e125504dff6245cb2c8ed3de Mon Sep 17 00:00:00 2001 -From: Ido Schimmel -Date: Sun, 14 Mar 2021 14:19:31 +0200 -Subject: [PATCH] psample: Add additional metadata attributes - -Extend psample to report the following attributes when available: - -* Output traffic class as a 16-bit value -* Output traffic class occupancy in bytes as a 64-bit value -* End-to-end latency of the packet in nanoseconds resolution -* Software timestamp in nanoseconds resolution (always available) -* Packet's protocol. Needed for packet dissection in user space (always - available) - -Signed-off-by: Ido Schimmel -Reviewed-by: Jiri Pirko -Signed-off-by: David S. Miller ---- - include/net/psample.h | 7 +++++++ - include/uapi/linux/psample.h | 7 +++++++ - net/psample/psample.c | 39 +++++++++++++++++++++++++++++++++++- - 3 files changed, 52 insertions(+), 1 deletion(-) - -diff --git a/include/net/psample.h b/include/net/psample.h -index ac6dbfb3870d94..e328c512775717 100644 ---- a/include/net/psample.h -+++ b/include/net/psample.h -@@ -18,6 +18,13 @@ struct psample_metadata { - u32 trunc_size; - int in_ifindex; - int out_ifindex; -+ u16 out_tc; -+ u64 out_tc_occ; /* bytes */ -+ u64 latency; /* nanoseconds */ -+ u8 out_tc_valid:1, -+ out_tc_occ_valid:1, -+ latency_valid:1, -+ unused:5; - }; - - struct psample_group *psample_group_get(struct net *net, u32 group_num); -diff --git a/include/uapi/linux/psample.h b/include/uapi/linux/psample.h -index aea26ab1431c14..c6329f71b939fb 100644 ---- a/include/uapi/linux/psample.h -+++ b/include/uapi/linux/psample.h -@@ -12,6 +12,12 @@ enum { - PSAMPLE_ATTR_DATA, - PSAMPLE_ATTR_GROUP_REFCOUNT, - PSAMPLE_ATTR_TUNNEL, -+ PSAMPLE_ATTR_PAD, -+ PSAMPLE_ATTR_OUT_TC, /* u16 */ -+ PSAMPLE_ATTR_OUT_TC_OCC, /* u64, bytes */ -+ PSAMPLE_ATTR_LATENCY, /* u64, nanoseconds */ -+ PSAMPLE_ATTR_TIMESTAMP, /* u64, nanoseconds */ -+ PSAMPLE_ATTR_PROTO, /* u16 */ - - __PSAMPLE_ATTR_MAX - }; -diff --git a/net/psample/psample.c b/net/psample/psample.c -index 065bc887d23936..118d5d2a81a023 100644 ---- a/net/psample/psample.c -+++ b/net/psample/psample.c -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -358,6 +359,7 @@ static int psample_tunnel_meta_len(struct ip_tunnel_info *tun_info) - void psample_sample_packet(struct psample_group *group, struct sk_buff *skb, - u32 sample_rate, const struct psample_metadata *md) - { -+ ktime_t tstamp = ktime_get_real(); - int out_ifindex = md->out_ifindex; - int in_ifindex = md->in_ifindex; - u32 trunc_size = md->trunc_size; -@@ -372,10 +374,15 @@ void psample_sample_packet(struct psample_group *group, struct sk_buff *skb, - - meta_len = (in_ifindex ? nla_total_size(sizeof(u16)) : 0) + - (out_ifindex ? nla_total_size(sizeof(u16)) : 0) + -+ (md->out_tc_valid ? nla_total_size(sizeof(u16)) : 0) + -+ (md->out_tc_occ_valid ? nla_total_size_64bit(sizeof(u64)) : 0) + -+ (md->latency_valid ? nla_total_size_64bit(sizeof(u64)) : 0) + - nla_total_size(sizeof(u32)) + /* sample_rate */ - nla_total_size(sizeof(u32)) + /* orig_size */ - nla_total_size(sizeof(u32)) + /* group_num */ -- nla_total_size(sizeof(u32)); /* seq */ -+ nla_total_size(sizeof(u32)) + /* seq */ -+ nla_total_size_64bit(sizeof(u64)) + /* timestamp */ -+ nla_total_size(sizeof(u16)); /* protocol */ - - #ifdef CONFIG_INET - tun_info = skb_tunnel_info(skb); -@@ -425,6 +432,36 @@ void psample_sample_packet(struct psample_group *group, struct sk_buff *skb, - if (unlikely(ret < 0)) - goto error; - -+ if (md->out_tc_valid) { -+ ret = nla_put_u16(nl_skb, PSAMPLE_ATTR_OUT_TC, md->out_tc); -+ if (unlikely(ret < 0)) -+ goto error; -+ } -+ -+ if (md->out_tc_occ_valid) { -+ ret = nla_put_u64_64bit(nl_skb, PSAMPLE_ATTR_OUT_TC_OCC, -+ md->out_tc_occ, PSAMPLE_ATTR_PAD); -+ if (unlikely(ret < 0)) -+ goto error; -+ } -+ -+ if (md->latency_valid) { -+ ret = nla_put_u64_64bit(nl_skb, PSAMPLE_ATTR_LATENCY, -+ md->latency, PSAMPLE_ATTR_PAD); -+ if (unlikely(ret < 0)) -+ goto error; -+ } -+ -+ ret = nla_put_u64_64bit(nl_skb, PSAMPLE_ATTR_TIMESTAMP, -+ ktime_to_ns(tstamp), PSAMPLE_ATTR_PAD); -+ if (unlikely(ret < 0)) -+ goto error; -+ -+ ret = nla_put_u16(nl_skb, PSAMPLE_ATTR_PROTO, -+ be16_to_cpu(skb->protocol)); -+ if (unlikely(ret < 0)) -+ goto error; -+ - if (data_len) { - int nla_len = nla_total_size(data_len); - struct nlattr *nla; diff --git a/patch/cisco-acpi-spi-nor.patch b/patch/cisco-acpi-spi-nor.patch index 4651144a4a31..8ece7f41f0ce 100644 --- a/patch/cisco-acpi-spi-nor.patch +++ b/patch/cisco-acpi-spi-nor.patch @@ -44,9 +44,9 @@ index 2b26a875a..82bbd84a2 100644 * REVISIT: many of these chips have deep power-down modes, which * should clearly be entered on suspend() to minimize power use. @@ -3490,6 +3500,7 @@ static struct spi_mem_driver spi_nor_driver = { - .driver = { .name = "spi-nor", .of_match_table = spi_nor_of_table, + .dev_groups = spi_nor_sysfs_groups, + .acpi_match_table = ACPI_PTR(spi_nor_acpi_table), }, .id_table = spi_nor_dev_ids, diff --git a/patch/cisco-npu-disable-other-bars.patch b/patch/cisco-npu-disable-other-bars.patch index 1557446f4aa3..d8f748b8e8b3 100644 --- a/patch/cisco-npu-disable-other-bars.patch +++ b/patch/cisco-npu-disable-other-bars.patch @@ -24,9 +24,9 @@ index 16fb3d771..0efe3f62a 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5762,3 +5762,48 @@ static void apex_pci_fixup_class(struct pci_dev *pdev) - pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING; - } - DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup); + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2f, dpc_log_size); + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a31, dpc_log_size); + #endif + +#define PCI_DEVICE_ID_LEABA_PACIFIC 0xabcd +#define PCI_DEVICE_ID_LEABA_GIBRALTAR 0xa001 diff --git a/patch/driver-arista-net-tg3-disallow-broadcom-default-mac.patch b/patch/driver-arista-net-tg3-disallow-broadcom-default-mac.patch index 51793bc1d563..7ceaefc7b2a6 100644 --- a/patch/driver-arista-net-tg3-disallow-broadcom-default-mac.patch +++ b/patch/driver-arista-net-tg3-disallow-broadcom-default-mac.patch @@ -29,19 +29,19 @@ index 72198ef56..997de31f9 100644 { struct tg3 *tp = netdev_priv(dev); @@ -17040,28 +17049,18 @@ static int tg3_get_device_address(struct tg3 *tp) - dev->dev_addr[5] = (lo >> 0) & 0xff; + addr[5] = (lo >> 0) & 0xff; /* Some old bootcode may report a 0 MAC address in SRAM */ -- addr_ok = is_valid_ether_addr(&dev->dev_addr[0]); -+ addr_ok = is_valid_bcm_ether_addr(&dev->dev_addr[0]); +- addr_ok = is_valid_ether_addr(addr); ++ addr_ok = is_valid_bcm_ether_addr(addr); } if (!addr_ok) { - /* Next, try NVRAM. */ - if (!tg3_flag(tp, NO_NVRAM) && - !tg3_nvram_read_be32(tp, mac_offset + 0, &hi) && - !tg3_nvram_read_be32(tp, mac_offset + 4, &lo)) { -- memcpy(&dev->dev_addr[0], ((char *)&hi) + 2, 2); -- memcpy(&dev->dev_addr[2], (char *)&lo, sizeof(lo)); +- memcpy(&addr[0], ((char *)&hi) + 2, 2); +- memcpy(&addr[2], (char *)&lo, sizeof(lo)); - } - /* Finally just fetch it out of the MAC control regs. */ - else { @@ -50,19 +50,19 @@ index 72198ef56..997de31f9 100644 + hi = tr32(MAC_ADDR_0_HIGH); + lo = tr32(MAC_ADDR_0_LOW); -- dev->dev_addr[5] = lo & 0xff; -- dev->dev_addr[4] = (lo >> 8) & 0xff; -- dev->dev_addr[3] = (lo >> 16) & 0xff; -- dev->dev_addr[2] = (lo >> 24) & 0xff; -- dev->dev_addr[1] = hi & 0xff; -- dev->dev_addr[0] = (hi >> 8) & 0xff; +- addr[5] = lo & 0xff; +- addr[4] = (lo >> 8) & 0xff; +- addr[3] = (lo >> 16) & 0xff; +- addr[2] = (lo >> 24) & 0xff; +- addr[1] = hi & 0xff; +- addr[0] = (hi >> 8) & 0xff; - } -+ dev->dev_addr[5] = lo & 0xff; -+ dev->dev_addr[4] = (lo >> 8) & 0xff; -+ dev->dev_addr[3] = (lo >> 16) & 0xff; -+ dev->dev_addr[2] = (lo >> 24) & 0xff; -+ dev->dev_addr[1] = hi & 0xff; -+ dev->dev_addr[0] = (hi >> 8) & 0xff; ++ addr[5] = lo & 0xff; ++ addr[4] = (lo >> 8) & 0xff; ++ addr[3] = (lo >> 16) & 0xff; ++ addr[2] = (lo >> 24) & 0xff; ++ addr[1] = hi & 0xff; ++ addr[0] = (hi >> 8) & 0xff; } - if (!is_valid_ether_addr(&dev->dev_addr[0])) + if (!is_valid_ether_addr(addr)) diff --git a/patch/driver-arista-pci-reassign-pref-mem.patch b/patch/driver-arista-pci-reassign-pref-mem.patch index 5c765fd84b57..b93c28483457 100644 --- a/patch/driver-arista-pci-reassign-pref-mem.patch +++ b/patch/driver-arista-pci-reassign-pref-mem.patch @@ -38,8 +38,8 @@ index 0c473d75e..3c157b30d 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -252,6 +252,12 @@ config PCIE_BUS_PEER2PEER - - endchoice + Reserves space in the kernel to maintain resource locking for + multiple GPUS. The overhead for each GPU is very small. +config PCI_REASSIGN_PREF_MEM + bool "PCI reassign prefetchable memory" @@ -55,8 +55,8 @@ index 522d2b974..f866adb07 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -31,6 +31,8 @@ obj-$(CONFIG_PCI_ECAM) += ecam.o - obj-$(CONFIG_PCI_P2PDMA) += p2pdma.o - obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o + obj-$(CONFIG_VGA_ARB) += vgaarb.o + obj-$(CONFIG_PCI_DOE) += doe.o +obj-$(CONFIG_PCI_REASSIGN_PREF_MEM) += setup-prefmem.o + @@ -78,8 +78,8 @@ index d17f3bf36..7b87b7d9b 100644 + pci_assign_unassigned_bridge_resources(bridge); + } pcie_bus_configure_settings(parent); - pci_bus_add_devices(parent); + /* diff --git a/drivers/pci/setup-prefmem.c b/drivers/pci/setup-prefmem.c new file mode 100644 index 000000000..57cd08b35 diff --git a/patch/driver-hwmon-pmbus-dni_dps460.patch b/patch/driver-hwmon-pmbus-dni_dps460.patch index a236a23ae1b7..022ca7bd7c1c 100644 --- a/patch/driver-hwmon-pmbus-dni_dps460.patch +++ b/patch/driver-hwmon-pmbus-dni_dps460.patch @@ -41,14 +41,14 @@ index 4c97ad0bd..6cf17031a 100644 obj-$(CONFIG_SENSORS_MAX34440) += max34440.o +obj-$(CONFIG_SENSORS_DNI_DPS460) += dni_dps460.o obj-$(CONFIG_SENSORS_MAX8688) += max8688.o + obj-$(CONFIG_SENSORS_MP2888) += mp2888.o obj-$(CONFIG_SENSORS_MP2975) += mp2975.o - obj-$(CONFIG_SENSORS_PXE1610) += pxe1610.o diff --git a/drivers/hwmon/pmbus/dni_dps460.c b/drivers/hwmon/pmbus/dni_dps460.c new file mode 100644 index 000000000..ddd4aae54 --- /dev/null +++ b/drivers/hwmon/pmbus/dni_dps460.c -@@ -0,0 +1,253 @@ +@@ -0,0 +1,252 @@ +/* + * Hardware monitoring driver for Delta DPS460 + * @@ -271,7 +271,7 @@ index 000000000..ddd4aae54 + return ret; +} + -+static int dni_dps460_remove(struct i2c_client *client) ++static void dni_dps460_remove(struct i2c_client *client) +{ + struct pmbus_data *data = i2c_get_clientdata(client); + @@ -279,7 +279,6 @@ index 000000000..ddd4aae54 + if (data->info) + kfree(data->info); + pmbus_do_remove(client); -+ return 0; +} + +static const struct i2c_device_id dni_dps460_id[] = { diff --git a/patch/driver-hwmon-pmbus-dps1900.patch b/patch/driver-hwmon-pmbus-dps1900.patch index 37d05b7ab657..42bef090a805 100644 --- a/patch/driver-hwmon-pmbus-dps1900.patch +++ b/patch/driver-hwmon-pmbus-dps1900.patch @@ -34,9 +34,9 @@ index 6cf17031a..925f4901b 100644 --- a/drivers/hwmon/pmbus/Makefile +++ b/drivers/hwmon/pmbus/Makefile @@ -33,3 +33,4 @@ obj-$(CONFIG_SENSORS_UCD9000) += ucd9000.o - obj-$(CONFIG_SENSORS_UCD9200) += ucd9200.o - obj-$(CONFIG_SENSORS_XDPE122) += xdpe12284.o + obj-$(CONFIG_SENSORS_XDPE152) += xdpe152c4.o obj-$(CONFIG_SENSORS_ZL6100) += zl6100.o + obj-$(CONFIG_SENSORS_PIM4328) += pim4328.o +obj-$(CONFIG_SENSORS_DPS1900) += dps1900.o diff --git a/drivers/hwmon/pmbus/dps1900.c b/drivers/hwmon/pmbus/dps1900.c new file mode 100644 diff --git a/patch/driver-sff-8436-use-nvmem_device_read.patch b/patch/driver-sff-8436-use-nvmem_device_read.patch index fefe9e052c58..8e11ff6c87bd 100644 --- a/patch/driver-sff-8436-use-nvmem_device_read.patch +++ b/patch/driver-sff-8436-use-nvmem_device_read.patch @@ -49,7 +49,7 @@ index 9e6a7bf43..4688597eb 100644 - -/*-------------------------------------------------------------------------*/ - - static int sff_8436_remove(struct i2c_client *client) + static void sff_8436_remove(struct i2c_client *client) { struct sff_8436_data *sff_8436; @@ -861,8 +836,6 @@ static int sff_8436_eeprom_probe(struct i2c_client *client, diff --git a/patch/driver-support-optoe-update-to-linux-6.1.patch b/patch/driver-support-optoe-update-to-linux-6.1.patch new file mode 100644 index 000000000000..582172ea3869 --- /dev/null +++ b/patch/driver-support-optoe-update-to-linux-6.1.patch @@ -0,0 +1,30 @@ +Update optoe support for Linux 6.1 + +From: Saikrishna Arcot + + +--- + drivers/misc/eeprom/optoe.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/misc/eeprom/optoe.c b/drivers/misc/eeprom/optoe.c +index f34bfe88b..394c19944 100644 +--- a/drivers/misc/eeprom/optoe.c ++++ b/drivers/misc/eeprom/optoe.c +@@ -802,7 +802,7 @@ static ssize_t optoe_bin_write(struct file *filp, struct kobject *kobj, + return optoe_read_write(optoe, buf, off, count, OPTOE_WRITE_OP); + } + +-static int optoe_remove(struct i2c_client *client) ++static void optoe_remove(struct i2c_client *client) + { + struct optoe_data *optoe; + int i; +@@ -820,7 +820,6 @@ static int optoe_remove(struct i2c_client *client) + + kfree(optoe->writebuf); + kfree(optoe); +- return 0; + } + + static ssize_t show_dev_write_max_size(struct device *dev, diff --git a/patch/driver-support-sff-8436-eeprom-update.patch b/patch/driver-support-sff-8436-eeprom-update.patch index d2d7f6e49e04..a17c7a8dd312 100644 --- a/patch/driver-support-sff-8436-eeprom-update.patch +++ b/patch/driver-support-sff-8436-eeprom-update.patch @@ -71,12 +71,12 @@ index 0b6bf312e..f5627bf85 100644 (page ? "Upper" : "Lower"), (page ? (page-1) : page), page_offset, page_len, ret); } } -@@ -780,15 +777,13 @@ static ssize_t sff_8436_macc_write(struct memory_accessor *macc, const char *buf +@@ -780,18 +777,15 @@ static ssize_t sff_8436_macc_write(struct memory_accessor *macc, const char *buf /*-------------------------------------------------------------------------*/ -static int __devexit sff_8436_remove(struct i2c_client *client) -+static int sff_8436_remove(struct i2c_client *client) ++static void sff_8436_remove(struct i2c_client *client) { struct sff_8436_data *sff_8436; @@ -87,7 +87,10 @@ index 0b6bf312e..f5627bf85 100644 - kfree(sff_8436->writebuf); kfree(sff_8436); - return 0; +- return 0; + } + static int sff_8436_eeprom_probe(struct i2c_client *client, + const struct i2c_device_id *id) @@ -821,7 +816,6 @@ static int sff_8436_eeprom_probe(struct i2c_client *client, chip.setup = NULL; diff --git a/patch/kconfig-inclusions b/patch/kconfig-inclusions index 5add1f87816d..edabda20ace8 100644 --- a/patch/kconfig-inclusions +++ b/patch/kconfig-inclusions @@ -7,7 +7,7 @@ CONFIG_LOG_BUF_SHIFT=20 # For Arista CONFIG_I2C_MUX_PCA9541=m CONFIG_SENSORS_MAX6697=m -CONFIG_SENSORS_DPS1900=m +#CONFIG_SENSORS_DPS1900=m # TODO: enable once the DPS1900 patch is re-enabled CONFIG_PCI_REASSIGN_PREF_MEM=y # For cig-cs6436 CONFIG_SERIAL_8250_LPSS=m @@ -17,7 +17,7 @@ CONFIG_EEPROM_SFF_8436=m CONFIG_SENSORS_MAX6620=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m -CONFIG_SENSORS_DNI_DPS460=m +#CONFIG_SENSORS_DNI_DPS460=m # TODO: enable once the DPS460 patch is re-enabled CONFIG_I2C_MUX_GPIO=m CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SCH=m @@ -150,8 +150,8 @@ CONFIG_TI_TLC4541=m CONFIG_SENSORS_LTC2978=m CONFIG_SENSORS_LTC2945=m CONFIG_SENSORS_TPS40422=m -CONFIG_SPI_INTEL_SPI_PLATFORM=m -CONFIG_SPI_INTEL_SPI=m +CONFIG_SPI_INTEL_PLATFORM=m +CONFIG_SPI_INTEL=m # For pensando CONFIG_IONIC=m diff --git a/patch/preconfig/disable-building-linux-source-deb-package.patch b/patch/preconfig/disable-building-linux-source-deb-package.patch index d15d098d3d0b..0772e63f5034 100644 --- a/patch/preconfig/disable-building-linux-source-deb-package.patch +++ b/patch/preconfig/disable-building-linux-source-deb-package.patch @@ -16,11 +16,11 @@ index 7d4eabf04..30b3c66a3 100644 --- a/debian/control.md5sum +++ b/debian/control.md5sum @@ -38,7 +38,7 @@ afb508873a44a1f196c2a525fec4b415 debian/templates/image.prerm.in - 381bc892fd36ef7ea5327f649b99cb98 debian/templates/sourcebin.meta.maintscript.in - 814dda166c7e3ef02e6e259e805ac66a debian/templates/tests-control.image.in - 33d71bfd398d2f9b3bc5c0193b67d17e debian/templates/tests-control.main.in --4f47bd3f3f88986bd6cb2bd9c006d6aa debian/config/defines -+c133f81fd44189940d8a695508ae2221 debian/config/defines + a20d83421667bad21739041d4e743ed1 debian/templates/sourcebin.meta.maintscript.in + cbc5b0a81441c4c98b329ebe10827812 debian/templates/tools-unversioned.control.in + 568f629072d584e9a0eb1dc9d3a94749 debian/templates/tools-versioned.control.in +-2805c12fb7881444231472fec6a3e6ff debian/config/defines ++afa615d81b7e9d81aa865ec2b0647c44 debian/config/defines 59a811890d2e7129bec940075850f11f debian/config/alpha/defines - 026ce5cdad7814c28f4fd87589786719 debian/config/amd64/defines - 44bff3917069a99eeb20ceff24609dda debian/config/arm64/defines + 60569b1b4c618e2fe7b135f687d0f0d2 debian/config/amd64/defines + bc35d767074baf305423437d049be85d debian/config/arm64/defines diff --git a/patch/preconfig/packaging-update-abiname.patch b/patch/preconfig/packaging-update-abiname.patch index 7c91da06bbe3..54a4d58051df 100644 --- a/patch/preconfig/packaging-update-abiname.patch +++ b/patch/preconfig/packaging-update-abiname.patch @@ -14,8 +14,8 @@ index 983625720..55d7e51a7 100644 +++ b/debian/config/defines @@ -1,5 +1,5 @@ [abi] --abiname: 23 -+abiname: 23-2 +-abiname: 11 ++abiname: 11-2 ignore-changes: __cpuhp_* __udp_gso_segment @@ -24,11 +24,11 @@ index b3ce4f58d..7d4eabf04 100644 --- a/debian/control.md5sum +++ b/debian/control.md5sum @@ -38,7 +38,7 @@ afb508873a44a1f196c2a525fec4b415 debian/templates/image.prerm.in - 381bc892fd36ef7ea5327f649b99cb98 debian/templates/sourcebin.meta.maintscript.in - 814dda166c7e3ef02e6e259e805ac66a debian/templates/tests-control.image.in - 33d71bfd398d2f9b3bc5c0193b67d17e debian/templates/tests-control.main.in --a488ddf3e8386253351268ac9218622f debian/config/defines -+4f47bd3f3f88986bd6cb2bd9c006d6aa debian/config/defines + a20d83421667bad21739041d4e743ed1 debian/templates/sourcebin.meta.maintscript.in + cbc5b0a81441c4c98b329ebe10827812 debian/templates/tools-unversioned.control.in + 568f629072d584e9a0eb1dc9d3a94749 debian/templates/tools-versioned.control.in +-953315cabce454d3125f17d04805d3ca debian/config/defines ++2805c12fb7881444231472fec6a3e6ff debian/config/defines 59a811890d2e7129bec940075850f11f debian/config/alpha/defines - 026ce5cdad7814c28f4fd87589786719 debian/config/amd64/defines - 44bff3917069a99eeb20ceff24609dda debian/config/arm64/defines + 60569b1b4c618e2fe7b135f687d0f0d2 debian/config/amd64/defines + bc35d767074baf305423437d049be85d debian/config/arm64/defines diff --git a/patch/series b/patch/series index 2713fdddce80..0bfbab744e43 100755 --- a/patch/series +++ b/patch/series @@ -16,14 +16,14 @@ driver-sff-8436-use-nvmem-framework.patch driver-sff-8436-use-nvmem_device_read.patch driver-support-sff-8436-read-write-fix.patch driver-i2c-bus-intel-ismt-add-delay-param.patch -kernel-add-kexec-reboot-string.patch -hwmon-Add-Maxim-MAX6620-hardware-monitoring-driver.patch +#kernel-add-kexec-reboot-string.patch # Upstreamed +#hwmon-Add-Maxim-MAX6620-hardware-monitoring-driver.patch # Upstreamed #driver-hwmon-max6658-fix-write-convrate.patch # TODO: update for current version -driver-hwmon-pmbus-dni_dps460.patch -driver-hwmon-pmbus-dni_dps460-update-pmbus-core.patch -driver-hwmon-pmbus-dni_dps460-add-status-attributes.patch -driver-hwmon-pmbus-dps1900.patch -driver-hwmon-pmbus-dps200.patch +#driver-hwmon-pmbus-dni_dps460.patch # TODO: build failure +#driver-hwmon-pmbus-dni_dps460-update-pmbus-core.patch # TODO: disabling for dependency +#driver-hwmon-pmbus-dni_dps460-add-status-attributes.patch # TODO: disabling for depedency +#driver-hwmon-pmbus-dps1900.patch # TODO: build failure +#driver-hwmon-pmbus-dps200.patch # TODO: disabling for dependency driver-support-optoe.patch driver-support-optoe-EOF_fix.patch driver-support-optoe-chunk-offset-fix.patch @@ -31,27 +31,28 @@ driver-support-optoe-QSFP_DD.patch driver-support-optoe-write-max.patch driver-support-optoe-twoaddr-a2h-access.patch driver-support-optoe-oneaddr-pageable.patch +driver-support-optoe-update-to-linux-6.1.patch driver-net-tg3-add-param-short-preamble-and-reset.patch 0004-dt-bindings-hwmon-Add-missing-documentation-for-lm75.patch 0005-dt-bindings-hwmon-Add-tmp75b-to-lm75.txt.patch 0006-device-tree-bindinds-add-NXP-PCT2075-as-compatible-d.patch -Support-for-fullcone-nat.patch -driver-ixgbe-external-phy.patch -kernel-compat-always-include-linux-compat.h-from-net-compat.patch +#Support-for-fullcone-nat.patch # TODO: update for current version +#driver-ixgbe-external-phy.patch # Upstreamed +#kernel-compat-always-include-linux-compat.h-from-net-compat.patch # Upstreamed #net-sch_generic-fix-the-missing-new-qdisc-assignment.patch # Functionality is present # Backport from 5.15 -0001-x86-platform-Increase-maximum-GPIO-number-for-X86_64.patch +#0001-x86-platform-Increase-maximum-GPIO-number-for-X86_64.patch # Backport from 5.16 -0001-net-arp-introduce-arp_evict_nocarrier-sysctl-paramet.patch +#0001-net-arp-introduce-arp_evict_nocarrier-sysctl-paramet.patch # Backport from 5.19 -0001-net-ipv6-Introduce-accept_unsolicited_na-knob-to-imp.patch -0002-net-ipv6-Expand-and-rename-accept_unsolicited_na-to-.patch +#0001-net-ipv6-Introduce-accept_unsolicited_na-knob-to-imp.patch +#0002-net-ipv6-Expand-and-rename-accept_unsolicited_na-to-.patch # Backport from 5.12 -0001-net-allow-user-to-set-metric-on-default-route-learne.patch +#0001-net-allow-user-to-set-metric-on-default-route-learne.patch # # This series applies on GIT commit 1451b36b2b0d62178e42f648d8a18131af18f7d8 @@ -67,121 +68,120 @@ kernel-compat-always-include-linux-compat.h-from-net-compat.patch # Mellanox patches for 5.10 ###-> mellanox_sdk-start -0001-psample-Encapsulate-packet-metadata-in-a-struct.patch -0002-psample-Add-additional-metadata-attributes.patch -0003-psample-define-the-macro-PSAMPLE_MD_EXTENDED_ATTR.patch -0004-drop_monitor-Extend-WJH-buffer-linux-channel.patch +# 0003-psample-define-the-macro-PSAMPLE_MD_EXTENDED_ATTR.patch +# 0004-drop_monitor-Extend-WJH-buffer-linux-channel.patch ###-> mellanox_sdk-end +#TODO ###-> mellanox_hw_mgmt-start -0001-i2c-mlxcpld-Update-module-license.patch -0002-i2c-mlxcpld-Decrease-polling-time-for-performance-im.patch -0003-i2c-mlxcpld-Add-support-for-I2C-bus-frequency-settin.patch -0004-i2c-mux-mlxcpld-Update-module-license.patch -0005-i2c-mux-mlxcpld-Move-header-file-out-of-x86-realm.patch -0006-i2c-mux-mlxcpld-Convert-driver-to-platform-driver.patch -0007-i2c-mux-mlxcpld-Prepare-mux-selection-infrastructure.patch -0008-i2c-mux-mlxcpld-Get-rid-of-adapter-numbers-enforceme.patch -0009-i2c-mux-mlxcpld-Extend-driver-to-support-word-addres.patch -0010-i2c-mux-mlxcpld-Extend-supported-mux-number.patch -0011-i2c-mux-mlxcpld-Add-callback-to-notify-mux-creation-.patch -0012-hwmon-mlxreg-fan-Add-support-for-fan-drawers-capabil.patch -0013-hwmon-pmbus-shrink-code-and-remove-pmbus_do_remove.patch -0015-mlxsw-core-Remove-critical-trip-points-from-thermal-.patch -0016-net-don-t-include-ethtool.h-from-netdevice.h.patch -0017-mlxsw-reg-Extend-MTMP-register-with-new-threshold-fi.patch -0018-mlxsw-thermal-Add-function-for-reading-module-temper.patch -0019-mlxsw-thermal-Read-module-temperature-thresholds-usi.patch -0020-mlxsw-thermal-Fix-null-dereference-of-NULL-temperatu.patch -0021-mlxsw-reg-Add-bank-number-to-MCIA-register.patch -0022-mlxsw-reg-Document-possible-MCIA-status-values.patch -0023-ethtool-Allow-network-drivers-to-dump-arbitrary-EEPR.patch -0024-net-ethtool-Export-helpers-for-getting-EEPROM-info.patch -0025-ethtool-Add-fallback-to-get_module_eeprom-from-netli.patch -0026-mlxsw-core-Add-support-for-module-EEPROM-read-by-pag.patch -0027-ethtool-Decrease-size-of-module-EEPROM-get-policy-ar.patch -0028-ethtool-Use-kernel-data-types-for-internal-EEPROM-st.patch -0029-ethtool-Validate-module-EEPROM-length-as-part-of-pol.patch -0030-ethtool-Validate-module-EEPROM-offset-as-part-of-pol.patch -0031-mlxsw-core_env-Read-module-temperature-thresholds-us.patch -0032-mlxsw-core_env-Avoid-unnecessary-memcpy-s.patch -0035-hwmon-pmbus-Increase-maximum-number-of-phases-per-pa.patch -0036-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2888-c.patch -0037-dt-bindings-Add-MP2888-voltage-regulator-device.patch -0038-ethtool-wire-in-generic-SFP-module-access.patch -0039-ethtool-Fix-NULL-pointer-dereference-during-module-E.patch -0040-phy-sfp-add-netlink-SFP-support-to-generic-SFP-code.patch -0042-ethtool-support-FEC-settings-over-netlink.patch -0045-i2c-mlxcpld-Fix-criteria-for-frequency-setting.patch -0046-i2c-mlxcpld-Reduce-polling-time-for-performance-impr.patch -0047-i2c-mlxcpld-Allow-flexible-polling-time-setting-for-.patch -0053-mlxsw-core-Avoid-creation-virtual-hwmon-objects-by-t.patch -0054-mlxsw-minimal-Simplify-method-of-modules-number-dete.patch -0055-platform_data-mlxreg-Add-new-type-to-support-modular.patch -0056-platform-x86-mlx-platform-Add-initial-support-for-ne.patch -0057-platform-mellanox-mlxreg-hotplug-Extend-logic-for-ho.patch -0058-platform-x86-mlx-platform-Configure-notifier-callbac.patch -0059-platform-mellanox-mlxreg-io-Extend-number-of-hwmon-a.patch -0060-platform_data-mlxreg-Add-new-field-for-secured-acces.patch -0061-platform-mellanox-mlxreg-lc-Add-initial-support-for-.patch -0062-Documentation-ABI-Add-new-attributes-for-mlxreg-io-s.patch -0063-Documentation-ABI-Add-new-line-card-attributes-for-m.patch -0064-hwmon-mlxreg-fan-Extend-the-maximum-number-of-tachom.patch -0065-platform-x86-mlx-platform-Extend-FAN-and-LED-config-.patch -0066-platform-x86-mlx-platform-Add-new-attributes-for-Cof.patch -0067-platform-mellanox-Add-dedicated-match-for-system-typ.patch -0068-mlxsw-core-Initialize-switch-driver-last.patch -0069-mlxsw-core-Remove-mlxsw_core_is_initialized.patch -0070-mlxsw-core_env-Defer-handling-of-module-temperature-.patch -0071-mlxsw-core_env-Convert-module_info_lock-to-a-mutex.patch -0072-mlxsw-Track-per-module-port-status.patch -0073-mlxsw-reg-Add-fields-to-PMAOS-register.patch -0074-mlxsw-Make-PMAOS-pack-function-more-generic.patch -0075-mlxsw-Add-support-for-transceiver-modules-reset.patch -0076-ethtool-Add-ability-to-control-transceiver-modules-p.patch -0077-mlxsw-reg-Add-Port-Module-Memory-Map-Properties-regi.patch -0078-mlxsw-reg-Add-Management-Cable-IO-and-Notifications-.patch -0079-mlxsw-Add-ability-to-control-transceiver-modules-pow.patch -0080-ethtool-Add-transceiver-module-extended-states.patch -0081-platform-x86-mlx-platform-Add-support-for-multiply-c.patch -0082-mlxsw-core-Extend-external-cooling-device-whitelist-.patch -0083-platform_data-mlxreg-Add-field-for-notification-call.patch -0084-i2c-mlxcpld-Add-callback-to-notify-probing-completio.patch -0085-hwmon-powr1220-Upgrade-driver-to-support-hwmon-info-.patch -0086-hwmon-powr1220-Add-support-for-Lattice-s-POWR1014-po.patch -0087-hwmon-Add-support-for-EMC2305-RPM-based-PWM-Fan-Spee.patch -0089-platform-mellanox-Add-support-for-new-SN2201-system.patch -0090-Documentation-ABI-Add-new-attributes-for-mlxreg-io-s.patch -0091-platform-x86-mlx-platform-Add-support-for-new-system.patch -0092-platform-mellanox-mlxreg-lc-fix-error-code-in-mlxreg.patch -0093-hwmon-mlxreg-fan-Extend-driver-to-support-multiply-P.patch -0094-hwmon-mlxreg-fan-Extend-driver-to-support-multiply-c.patch -0095-hwmon-mlxreg-fan-Fix-out-of-bounds-read-on-array-fan.patch -0096-hwmon-mlxreg-fan-Modify-PWM-connectivity-validation.patch -0097-hwmon-mlxreg-fan-Support-distinctive-names-per-diffe.patch -0097-1-mlxsw-Use-u16-for-local_port-field.patch -0097-2-mlxsw-i2c-Fix-chunk-size-setting.patch -0097-3-mlxsw-core_hwmon-Adjust-module-label-names.patch -0152-mlxsw-i2c-Prevent-transaction-execution-for-spec.patch -0157-platform-x86-mlx-platform-Make-activation-of-some-dr.patch -0158-platform-x86-mlx-platform-Add-cosmetic-changes-for-a.patch -0159-mlx-platform-Add-support-for-systems-equipped-with-t.patch -0160-platform-mellanox-Introduce-support-for-COMe-managem.patch -0161-platform-x86-mlx-platform-Add-support-for-new-system.patch -0162-platform-mellanox-Add-COME-board-revision-register.patch -0163-platform-mellanox-Introduce-support-for-rack-manager.patch -0164-hwmon-jc42-Add-support-for-Seiko-Instruments-S-34TS0.patch -0165-platform-mellanox-mlxreg-io-Add-locking-for-io-opera.patch -0166-DS-leds-leds-mlxreg-Send-udev-event-from-leds-mlxreg.patch -0170-i2c-mlxcpld-Fix-register-setting-for-400KHz-frequenc.patch -0173-mlxsw-core-Add-support-for-OSFP-transceiver-modules.patch -0175-hwmon-pmbus-Add-support-for-Infineon-Digital-Multi-p.patch -0176-platform-mellanox-fix-reset_pwr_converter_fail-attri.patch -0177-Documentation-ABI-fix-description-of-fix-reset_pwr_c.patch -0178-platform-mellanox-Introduce-support-for-next-generat.patch -0180-hwmon-pmbus-Fix-sensors-readouts-for-MPS-Multi-phase.patch -0186-platform-mellanox-mlxreg-hotplug-Allow-more-flexible.patch -0285-platform-mellanox-nvsw-sn2201-change-fans-i2c-busses.patch +#0001-i2c-mlxcpld-Update-module-license.patch +#0002-i2c-mlxcpld-Decrease-polling-time-for-performance-im.patch +#0003-i2c-mlxcpld-Add-support-for-I2C-bus-frequency-settin.patch +#0004-i2c-mux-mlxcpld-Update-module-license.patch +#0005-i2c-mux-mlxcpld-Move-header-file-out-of-x86-realm.patch +#0006-i2c-mux-mlxcpld-Convert-driver-to-platform-driver.patch +#0007-i2c-mux-mlxcpld-Prepare-mux-selection-infrastructure.patch +#0008-i2c-mux-mlxcpld-Get-rid-of-adapter-numbers-enforceme.patch +#0009-i2c-mux-mlxcpld-Extend-driver-to-support-word-addres.patch +#0010-i2c-mux-mlxcpld-Extend-supported-mux-number.patch +#0011-i2c-mux-mlxcpld-Add-callback-to-notify-mux-creation-.patch +#0012-hwmon-mlxreg-fan-Add-support-for-fan-drawers-capabil.patch +#0013-hwmon-pmbus-shrink-code-and-remove-pmbus_do_remove.patch +#0015-mlxsw-core-Remove-critical-trip-points-from-thermal-.patch +#0016-net-don-t-include-ethtool.h-from-netdevice.h.patch +#0017-mlxsw-reg-Extend-MTMP-register-with-new-threshold-fi.patch +#0018-mlxsw-thermal-Add-function-for-reading-module-temper.patch +#0019-mlxsw-thermal-Read-module-temperature-thresholds-usi.patch +#0020-mlxsw-thermal-Fix-null-dereference-of-NULL-temperatu.patch +#0021-mlxsw-reg-Add-bank-number-to-MCIA-register.patch +#0022-mlxsw-reg-Document-possible-MCIA-status-values.patch +#0023-ethtool-Allow-network-drivers-to-dump-arbitrary-EEPR.patch +#0024-net-ethtool-Export-helpers-for-getting-EEPROM-info.patch +#0025-ethtool-Add-fallback-to-get_module_eeprom-from-netli.patch +#0026-mlxsw-core-Add-support-for-module-EEPROM-read-by-pag.patch +#0027-ethtool-Decrease-size-of-module-EEPROM-get-policy-ar.patch +#0028-ethtool-Use-kernel-data-types-for-internal-EEPROM-st.patch +#0029-ethtool-Validate-module-EEPROM-length-as-part-of-pol.patch +#0030-ethtool-Validate-module-EEPROM-offset-as-part-of-pol.patch +#0031-mlxsw-core_env-Read-module-temperature-thresholds-us.patch +#0032-mlxsw-core_env-Avoid-unnecessary-memcpy-s.patch +#0035-hwmon-pmbus-Increase-maximum-number-of-phases-per-pa.patch +#0036-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2888-c.patch +#0037-dt-bindings-Add-MP2888-voltage-regulator-device.patch +#0038-ethtool-wire-in-generic-SFP-module-access.patch +#0039-ethtool-Fix-NULL-pointer-dereference-during-module-E.patch +#0040-phy-sfp-add-netlink-SFP-support-to-generic-SFP-code.patch +#0042-ethtool-support-FEC-settings-over-netlink.patch +#0045-i2c-mlxcpld-Fix-criteria-for-frequency-setting.patch +#0046-i2c-mlxcpld-Reduce-polling-time-for-performance-impr.patch +#0047-i2c-mlxcpld-Allow-flexible-polling-time-setting-for-.patch +#0053-mlxsw-core-Avoid-creation-virtual-hwmon-objects-by-t.patch +#0054-mlxsw-minimal-Simplify-method-of-modules-number-dete.patch +#0055-platform_data-mlxreg-Add-new-type-to-support-modular.patch +#0056-platform-x86-mlx-platform-Add-initial-support-for-ne.patch +#0057-platform-mellanox-mlxreg-hotplug-Extend-logic-for-ho.patch +#0058-platform-x86-mlx-platform-Configure-notifier-callbac.patch +#0059-platform-mellanox-mlxreg-io-Extend-number-of-hwmon-a.patch +#0060-platform_data-mlxreg-Add-new-field-for-secured-acces.patch +#0061-platform-mellanox-mlxreg-lc-Add-initial-support-for-.patch +#0062-Documentation-ABI-Add-new-attributes-for-mlxreg-io-s.patch +#0063-Documentation-ABI-Add-new-line-card-attributes-for-m.patch +#0064-hwmon-mlxreg-fan-Extend-the-maximum-number-of-tachom.patch +#0065-platform-x86-mlx-platform-Extend-FAN-and-LED-config-.patch +#0066-platform-x86-mlx-platform-Add-new-attributes-for-Cof.patch +#0067-platform-mellanox-Add-dedicated-match-for-system-typ.patch +#0068-mlxsw-core-Initialize-switch-driver-last.patch +#0069-mlxsw-core-Remove-mlxsw_core_is_initialized.patch +#0070-mlxsw-core_env-Defer-handling-of-module-temperature-.patch +#0071-mlxsw-core_env-Convert-module_info_lock-to-a-mutex.patch +#0072-mlxsw-Track-per-module-port-status.patch +#0073-mlxsw-reg-Add-fields-to-PMAOS-register.patch +#0074-mlxsw-Make-PMAOS-pack-function-more-generic.patch +#0075-mlxsw-Add-support-for-transceiver-modules-reset.patch +#0076-ethtool-Add-ability-to-control-transceiver-modules-p.patch +#0077-mlxsw-reg-Add-Port-Module-Memory-Map-Properties-regi.patch +#0078-mlxsw-reg-Add-Management-Cable-IO-and-Notifications-.patch +#0079-mlxsw-Add-ability-to-control-transceiver-modules-pow.patch +#0080-ethtool-Add-transceiver-module-extended-states.patch +#0081-platform-x86-mlx-platform-Add-support-for-multiply-c.patch +#0082-mlxsw-core-Extend-external-cooling-device-whitelist-.patch +#0083-platform_data-mlxreg-Add-field-for-notification-call.patch +#0084-i2c-mlxcpld-Add-callback-to-notify-probing-completio.patch +#0085-hwmon-powr1220-Upgrade-driver-to-support-hwmon-info-.patch +#0086-hwmon-powr1220-Add-support-for-Lattice-s-POWR1014-po.patch +#0087-hwmon-Add-support-for-EMC2305-RPM-based-PWM-Fan-Spee.patch +#0089-platform-mellanox-Add-support-for-new-SN2201-system.patch +#0090-Documentation-ABI-Add-new-attributes-for-mlxreg-io-s.patch +#0091-platform-x86-mlx-platform-Add-support-for-new-system.patch +#0092-platform-mellanox-mlxreg-lc-fix-error-code-in-mlxreg.patch +#0093-hwmon-mlxreg-fan-Extend-driver-to-support-multiply-P.patch +#0094-hwmon-mlxreg-fan-Extend-driver-to-support-multiply-c.patch +#0095-hwmon-mlxreg-fan-Fix-out-of-bounds-read-on-array-fan.patch +#0096-hwmon-mlxreg-fan-Modify-PWM-connectivity-validation.patch +#0097-hwmon-mlxreg-fan-Support-distinctive-names-per-diffe.patch +#0097-1-mlxsw-Use-u16-for-local_port-field.patch +#0097-2-mlxsw-i2c-Fix-chunk-size-setting.patch +#0097-3-mlxsw-core_hwmon-Adjust-module-label-names.patch +#0152-mlxsw-i2c-Prevent-transaction-execution-for-spec.patch +#0157-platform-x86-mlx-platform-Make-activation-of-some-dr.patch +#0158-platform-x86-mlx-platform-Add-cosmetic-changes-for-a.patch +#0159-mlx-platform-Add-support-for-systems-equipped-with-t.patch +#0160-platform-mellanox-Introduce-support-for-COMe-managem.patch +#0161-platform-x86-mlx-platform-Add-support-for-new-system.patch +#0162-platform-mellanox-Add-COME-board-revision-register.patch +#0163-platform-mellanox-Introduce-support-for-rack-manager.patch +#0164-hwmon-jc42-Add-support-for-Seiko-Instruments-S-34TS0.patch +#0165-platform-mellanox-mlxreg-io-Add-locking-for-io-opera.patch +#0166-DS-leds-leds-mlxreg-Send-udev-event-from-leds-mlxreg.patch +#0170-i2c-mlxcpld-Fix-register-setting-for-400KHz-frequenc.patch +#0173-mlxsw-core-Add-support-for-OSFP-transceiver-modules.patch +#0175-hwmon-pmbus-Add-support-for-Infineon-Digital-Multi-p.patch +#0176-platform-mellanox-fix-reset_pwr_converter_fail-attri.patch +#0177-Documentation-ABI-fix-description-of-fix-reset_pwr_c.patch +#0178-platform-mellanox-Introduce-support-for-next-generat.patch +#0180-hwmon-pmbus-Fix-sensors-readouts-for-MPS-Multi-phase.patch +#0186-platform-mellanox-mlxreg-hotplug-Allow-more-flexible.patch +#0285-platform-mellanox-nvsw-sn2201-change-fans-i2c-busses.patch ###-> mellanox_hw_mgmt-end # Cisco patches for 5.10 kernel @@ -191,70 +191,72 @@ cisco-x86-gpio-config.patch cisco-acpi-spi-nor.patch cisco-Enable-static-memory-reservation-for-OIRable-PCIe-de.patch cisco-npu-disable-other-bars.patch -cisco-hwmon-pmbus_core-pec-support-check.patch +#cisco-hwmon-pmbus_core-pec-support-check.patch # Upstreamed # Nokia patches for 5.10 kernel -0001-hwmon-emc2305-Fix-unable-to-probe-emc2301-2-3.patch +#0001-hwmon-emc2305-Fix-unable-to-probe-emc2301-2-3.patch # Upstreamed # # Marvell platform patches for 5.10 armhf_secondary_boot_online.patch -0001-dt-bindings-marvell-Document-the-AC5-AC5X-compatible.patch -0002-dt-bindings-net-mvneta-Add-marvell-armada-ac5-neta.patch -0003-arm64-dts-marvell-Add-Armada-98DX2530-SoC-and-RD-AC5.patch -0004-arm64-dts-marvell-Add-UART1-3-for-AC5-AC5X.patch -0005-arm64-dts-marvell-98dx25xx-Fix-i2c-gpios-property.patch +#0001-dt-bindings-marvell-Document-the-AC5-AC5X-compatible.patch # Upstreamed +#0002-dt-bindings-net-mvneta-Add-marvell-armada-ac5-neta.patch # Upstreamed +#0003-arm64-dts-marvell-Add-Armada-98DX2530-SoC-and-RD-AC5.patch # Upstreamed +#0004-arm64-dts-marvell-Add-UART1-3-for-AC5-AC5X.patch # Upstreamed +#0005-arm64-dts-marvell-98dx25xx-Fix-i2c-gpios-property.patch # Upstreamed 0006-arm64-dts-Update-cache-properties-for-marvell.patch -0007-arm64-dts-marvell-AC5-AC5X-Fix-address-for-UART1.patch -0008-mtd-rawnand-marvell-Add-missing-layouts.patch -0009-pinctrl-mvebu-Add-driver-for-98DX2530-SoC.patch -0010-arm64-marvell-Enable-the-98DX2530-pinctrl-driver.patch -0011-net-mvneta-Add-support-for-98DX2530-Ethernet-port.patch -0012-spi-a3700-Support-big-endianness-for-AC5-SPI-driver.patch -0013-dt-bindings-ac5-Add-mmc-and-usb-properties.patch +#0007-arm64-dts-marvell-AC5-AC5X-Fix-address-for-UART1.patch # Upstreamed +#0008-mtd-rawnand-marvell-Add-missing-layouts.patch # Upstreamed +#0009-pinctrl-mvebu-Add-driver-for-98DX2530-SoC.patch # Upstreamed +#0010-arm64-marvell-Enable-the-98DX2530-pinctrl-driver.patch # Upstreamed +#0011-net-mvneta-Add-support-for-98DX2530-Ethernet-port.patch # Upstreamed +#0012-spi-a3700-Support-big-endianness-for-AC5-SPI-driver.patch # Upstreamed +#0013-dt-bindings-ac5-Add-mmc-and-usb-properties.patch # TODO 0014-dts-ac5-marvell-Add-switching-mmc-watchdog-node.patch 0015-ac5-marvell-Add-watchdog-support.patch -0016-ac5-marvell-Add-support-for-emmc.patch +#0016-ac5-marvell-Add-support-for-emmc.patch # TODO 0017-usb-ehci-Add-support-for-ac5.patch -0018-mv6xxx-Fix-i2c-lock-due-to-arb-loss.patch +#0018-mv6xxx-Fix-i2c-lock-due-to-arb-loss.patch # TODO 0019-dt-bindings-marvell-Add-ARMADA-7K-properties.patch -0020-dts-marvell-Add-support-for-7020-comexpress.patch -0021-arm64-dts-marvell-Add-Nokia-7215-IXS-A1-board.patch +#0020-dts-marvell-Add-support-for-7020-comexpress.patch # TODO +#0021-arm64-dts-marvell-Add-Nokia-7215-IXS-A1-board.patch # TODO # amd-pensando elba support -0001-hwmon-ltc2978-Add-support-for-LTC3888.patch -0002-i2c-designware-Recover-from-a-stuck-SDA-line.patch -0003-mmc-sdhci-cadence-Add-AMD-Pensando-Elba-SoC-support.patch -0004-spi-dw-Add-support-for-AMD-Pensando-Elba-SoC.patch -0005-spi-spidev-Add-pensando-cpld-compat-entry.patch -0006-arch-arm64-Initial-support-for-the-Elba-SoC.patch -0007-arm64-dts-pensando-Elba-flash-partitions.patch -0008-soc-pensando-Add-capmem-driver.patch -0009-irqchip-pensando-Interrupt-domain-controllers.patch -0010-i2c-rd1173-Add-RD1173-I2C-controller-driver.patch -0011-uio-pensando-UIO-drivers-for-Elba.patch -0012-soc-pensando-Add-Boot-State-Machine.patch -0013-soc-pensando-Add-crash-dump-driver.patch -0014-soc-pensando-Add-Reset-Cause-driver.patch -0015-soc-pensando-Add-pcie-driver.patch -0016-arm64-dts-pensando-add-mnet-mcrypt-devices.patch -0017-soc-pensando-refactor-pciep_regrd32-for-kpcimgr.patch -0018-soc-pensando-Add-kpcimgr-driver.patch -0019-mmc-sdhci-cadence-Support-mmc-hardware-reset.patch -0020-reset-elba-Add-mmc-hw-reset-driver.patch -0021-soc-pensando-Add-sbus-driver.patch -0022-soc-pensando-Add-boot_count-to-sysfs.patch -0023-i2c-rd1173-Reset-RD1173-master-when-i2c_busy-set.patch -0024-soc-pensando-Add-penfw-driver.patch -0025-arm64-dts-pensando-psci-support.patch -0026-i2c-rd1173-Fix-Lattice-RD1173-interrupt-handling.patch -0027-hwmon-pmbus-tps53679-Add-support-for-TI-TPS53659.patch -0028-EDAC-elba-Add-Elba-EDAC-support.patch -0029-arm64-traps-Handle-SError-interrupt.patch -0030-quirks-for-the-Pensando-qspi-controller.patch +# TODO +#0001-hwmon-ltc2978-Add-support-for-LTC3888.patch +#0002-i2c-designware-Recover-from-a-stuck-SDA-line.patch +#0003-mmc-sdhci-cadence-Add-AMD-Pensando-Elba-SoC-support.patch +#0004-spi-dw-Add-support-for-AMD-Pensando-Elba-SoC.patch +#0005-spi-spidev-Add-pensando-cpld-compat-entry.patch +#0006-arch-arm64-Initial-support-for-the-Elba-SoC.patch +#0007-arm64-dts-pensando-Elba-flash-partitions.patch +#0008-soc-pensando-Add-capmem-driver.patch +#0009-irqchip-pensando-Interrupt-domain-controllers.patch +#0010-i2c-rd1173-Add-RD1173-I2C-controller-driver.patch +#0011-uio-pensando-UIO-drivers-for-Elba.patch +#0012-soc-pensando-Add-Boot-State-Machine.patch +#0013-soc-pensando-Add-crash-dump-driver.patch +#0014-soc-pensando-Add-Reset-Cause-driver.patch +#0015-soc-pensando-Add-pcie-driver.patch +#0016-arm64-dts-pensando-add-mnet-mcrypt-devices.patch +#0017-soc-pensando-refactor-pciep_regrd32-for-kpcimgr.patch +#0018-soc-pensando-Add-kpcimgr-driver.patch +#0019-mmc-sdhci-cadence-Support-mmc-hardware-reset.patch +#0020-reset-elba-Add-mmc-hw-reset-driver.patch +#0021-soc-pensando-Add-sbus-driver.patch +#0022-soc-pensando-Add-boot_count-to-sysfs.patch +#0023-i2c-rd1173-Reset-RD1173-master-when-i2c_busy-set.patch +#0024-soc-pensando-Add-penfw-driver.patch +#0025-arm64-dts-pensando-psci-support.patch +#0026-i2c-rd1173-Fix-Lattice-RD1173-interrupt-handling.patch +#0027-hwmon-pmbus-tps53679-Add-support-for-TI-TPS53659.patch +#0028-EDAC-elba-Add-Elba-EDAC-support.patch +#0029-arm64-traps-Handle-SError-interrupt.patch +#0030-quirks-for-the-Pensando-qspi-controller.patch # Security patch -0001-Change-the-system.map-file-permission-only-readable-.patch +# TODO: update for bookworm +#0001-Change-the-system.map-file-permission-only-readable-.patch # #