[PATCH net] net: hinic: Don't fail probe when firmware lacks rx-vlan-filter

From: Jinjie Ruan

Date: Sun Nov 15 2026 - 21:21:05 EST


nic_dev_init() calls set_features() with force_change set, so it
unconditionally sends HINIC_PORT_CMD_SET_VLAN_FILTER once
NETIF_F_HW_VLAN_CTAG_FILTER is advertised. Firmware that predates
rx-vlan-filter support answers with HINIC_MGMT_CMD_UNSUPPORTED (0xff).

hinic_set_vlan_fliter() already distinguishes that status and returns it
without a message, but set_features() treats any non-zero return as
fatal: it folds it into err and returns -EIO, and nic_dev_init() then
bails out without printing a sub-error either. The only visible symptom
is

hinic 0000:29:00.0: Failed to initialize NIC device
hinic 0000:29:00.0: probe with driver hinic failed with error -5

and the device stays unusable although nothing is actually broken.

Treat HINIC_MGMT_CMD_UNSUPPORTED as "feature not available": keep probing
and drop the feature from the advertised set. Write netdev->features
back whenever failed_features is non-empty, not only on the fatal path,
so the cleared bit really takes effect.

Fixes: 2acf960e3be6 ("net: hinic: Add support for configuration of rx-vlan-filter by ethtool")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Jinjie Ruan <ruanjinjie@xxxxxxxxxx>
---
drivers/net/ethernet/huawei/hinic/hinic_main.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c
index 34ed5ea9e46e..e837140f7c17 100644
--- a/drivers/net/ethernet/huawei/hinic/hinic_main.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c
@@ -1098,16 +1098,26 @@ static int set_features(struct hinic_dev *nic_dev,
ret = hinic_set_vlan_fliter(nic_dev,
!!(features &
NETIF_F_HW_VLAN_CTAG_FILTER));
- if (ret) {
+ if (ret == HINIC_MGMT_CMD_UNSUPPORTED) {
+ dev_info(&nic_dev->hwdev->hwif->pdev->dev,
+ "Firmware does not support rx-vlan-filter, feature disabled\n");
+ failed_features |= NETIF_F_HW_VLAN_CTAG_FILTER;
+ } else if (ret) {
err = ret;
failed_features |= NETIF_F_HW_VLAN_CTAG_FILTER;
}
}

- if (err) {
+ /*
+ * A feature the firmware rejects is dropped from the advertised set,
+ * whether it was rejected fatally or not (e.g. rx-vlan-filter on
+ * firmware that predates it).
+ */
+ if (failed_features)
nic_dev->netdev->features = features ^ failed_features;
+
+ if (err)
return -EIO;
- }

return 0;
}
--
2.34.1