From: David S. Miller Date: Fri, 29 Nov 2024 12:52:04 +0000 (+0000) Subject: Merge branch 'enetc-mqprio-fixes' X-Git-Tag: v6.13-rc2~24^2~36 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f1cd565ce57760923d5e0fbd9e9914b415c0620a;p=linux-2.6-block.git Merge branch 'enetc-mqprio-fixes' Wei Fang sayus: ==================== fix crash issue when setting MQPRIO for VFs There is a crash issue when setting MQPRIO for ENETC VFs, the root casue is that ENETC VFs don't like ENETC PFs, they don't have port registers, so hw->port of VFs is NULL. However, this NULL pointer will be accessed without any checks in enetc_mm_commit_preemptible_tcs() when configuring MQPRIO for VFs. Therefore, two patches are added to fix this issue. The first patch sets ENETC_SI_F_QBU flag only for SIs that support 802.1Qbu. The second patch adds a check in enetc_change_preemptible_tcs() to ensure that SIs that do not support 802.1Qbu do not configure preemptible TCs. --- v1 Link: https://lore.kernel.org/imx/20241030082117.1172634-1-wei.fang@nxp.com/ v2 Link: https://lore.kernel.org/imx/20241104054309.1388433-1-wei.fang@nxp.com/ --- ==================== Signed-off-by: David S. Miller --- f1cd565ce57760923d5e0fbd9e9914b415c0620a