Skip to content

Commit 31ca08f

Browse files
felixradenskyacoifmannvidia
authored andcommitted
hw-mgmt: patches: Update DPU driver patch to avoid conflict with BF3 patches
Add DPU driver at the end of drivers/platform/mellanox/Makefile to avoid conflict with BF3 PTM driver in the same file. Since Sonic and CL do not apply BF3 patches, the application of DPU driver patch fails due to missing context. By moving DPU driver to the end of the Makefile we can avoid the conflict and remove special CL and Sonic versions of DPU driver patch. Bug: 4524005 Signed-off-by: Felix Radensky <[email protected]>
1 parent a7919b8 commit 31ca08f

File tree

4 files changed

+5
-1415
lines changed

4 files changed

+5
-1415
lines changed

recipes-kernel/linux/Patch_Status_Table.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ Kernel-6.1
702702
|0088-platform-mellanox-mlxreg-hotplug-Add-support-for-new.patch | | Downstream accepted | | |
703703
|0089-platform-mellanox-mlx-platform-Change-register-name.patch | | Downstream accepted | | |
704704
|0090-platform-mellanox-mlx-platform-Add-support-for-new-X.patch | | Downstream accepted | | |
705-
|0091-platform-mellanox-mlxreg-dpu-Add-initial-support-for.patch | | Downstream accepted;os[cumulus,sonic] | | |
705+
|0091-platform-mellanox-mlxreg-dpu-Add-initial-support-for.patch | | Downstream accepted | | |
706706
|0092-platform-mellanox-Introduce-support-of-Nvidia-smart-.patch | | Downstream accepted | | |
707707
|0093-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2855-c.patch | | Feature pending | | |
708708
|0094-i2c-asf-Introduce-MCTP-support-over-ASF-controller.patch | | Downstream accepted | | |

recipes-kernel/linux/linux-6.1/0091-platform-mellanox-mlxreg-dpu-Add-initial-support-for.patch

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,14 @@ index 018ce2833..14c14c9c2 100644
5555
tristate "Mellanox platform hotplug driver support"
5656
depends on HWMON
5757
diff --git a/drivers/platform/mellanox/Makefile b/drivers/platform/mellanox/Makefile
58-
index d7f4d940c..7d11503dd 100644
58+
index d7f4d940c..2b774cdf4 100644
5959
--- a/drivers/platform/mellanox/Makefile
6060
+++ b/drivers/platform/mellanox/Makefile
61-
@@ -8,6 +8,7 @@ obj-$(CONFIG_MLXBF_BOOTCTL) += mlxbf-bootctl.o
62-
obj-$(CONFIG_MLXBF_PMC) += mlxbf-pmc.o
63-
obj-$(CONFIG_MLXBF_TMFIFO) += mlxbf-tmfifo.o
64-
obj-$(CONFIG_MLXBF_PTM) += mlxbf-ptm.o
65-
+obj-$(CONFIG_MLXREG_DPU) += mlxreg-dpu.o
66-
obj-$(CONFIG_MLXREG_HOTPLUG) += mlxreg-hotplug.o
61+
@@ -11,3 +11,4 @@ obj-$(CONFIG_MLXREG_HOTPLUG) += mlxreg-hotplug.o
6762
obj-$(CONFIG_MLXREG_IO) += mlxreg-io.o
6863
obj-$(CONFIG_MLXREG_LC) += mlxreg-lc.o
64+
obj-$(CONFIG_NVSW_SN2201) += nvsw-sn2201.o
65+
+obj-$(CONFIG_MLXREG_DPU) += mlxreg-dpu.o
6966
diff --git a/drivers/platform/mellanox/mlxreg-dpu.c b/drivers/platform/mellanox/mlxreg-dpu.c
7067
new file mode 100644
7168
index 000000000..c6cfbee55

0 commit comments

Comments
 (0)