Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1497638 authored by Netanel Belgazal's avatar Netanel Belgazal Committed by David S. Miller
Browse files

net: ena: change return value for unsupported features unsupported return value 



return -EOPNOTSUPP instead of -EPERM.

Signed-off-by: default avatarNetanel Belgazal <netanel@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 926f38e9

drivers/net/ethernet/amazon/ena/ena_com.c

+11 −11
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static int ena_com_comp_status_to_errno(u8 comp_status) 
	case ENA_ADMIN_RESOURCE_ALLOCATION_FAILURE:

		return -ENOMEM;

	case ENA_ADMIN_UNSUPPORTED_OPCODE:

		return -EPERM;

		return -EOPNOTSUPP;

	case ENA_ADMIN_BAD_OPCODE:

	case ENA_ADMIN_MALFORMED_REQUEST:

	case ENA_ADMIN_ILLEGAL_PARAMETER:
@@ -786,7 +786,7 @@ static int ena_com_get_feature_ex(struct ena_com_dev *ena_dev, 


	if (!ena_com_check_supported_feature_id(ena_dev, feature_id)) {

		pr_debug("Feature %d isn't supported\n", feature_id);

		return -EPERM;

		return -EOPNOTSUPP;

	}



	memset(&get_cmd, 0x0, sizeof(get_cmd));
@@ -1324,7 +1324,7 @@ int ena_com_set_aenq_config(struct ena_com_dev *ena_dev, u32 groups_flag) 
	if ((get_resp.u.aenq.supported_groups & groups_flag) != groups_flag) {

		pr_warn("Trying to set unsupported aenq events. supported flag: %x asked flag: %x\n",

			get_resp.u.aenq.supported_groups, groups_flag);

		return -EPERM;

		return -EOPNOTSUPP;

	}



	memset(&cmd, 0x0, sizeof(cmd));
@@ -1909,7 +1909,7 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, int mtu) 


	if (!ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_MTU)) {

		pr_debug("Feature %d isn't supported\n", ENA_ADMIN_MTU);

		return -EPERM;

		return -EOPNOTSUPP;

	}



	memset(&cmd, 0x0, sizeof(cmd));
@@ -1963,7 +1963,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev) 
						ENA_ADMIN_RSS_HASH_FUNCTION)) {

		pr_debug("Feature %d isn't supported\n",

			 ENA_ADMIN_RSS_HASH_FUNCTION);

		return -EPERM;

		return -EOPNOTSUPP;

	}



	/* Validate hash function is supported */
@@ -1975,7 +1975,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev) 
	if (get_resp.u.flow_hash_func.supported_func & (1 << rss->hash_func)) {

		pr_err("Func hash %d isn't supported by device, abort\n",

		       rss->hash_func);

		return -EPERM;

		return -EOPNOTSUPP;

	}



	memset(&cmd, 0x0, sizeof(cmd));
@@ -2034,7 +2034,7 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev, 


	if (!((1 << func) & get_resp.u.flow_hash_func.supported_func)) {

		pr_err("Flow hash function %d isn't supported\n", func);

		return -EPERM;

		return -EOPNOTSUPP;

	}



	switch (func) {
@@ -2127,7 +2127,7 @@ int ena_com_set_hash_ctrl(struct ena_com_dev *ena_dev) 
						ENA_ADMIN_RSS_HASH_INPUT)) {

		pr_debug("Feature %d isn't supported\n",

			 ENA_ADMIN_RSS_HASH_INPUT);

		return -EPERM;

		return -EOPNOTSUPP;

	}



	memset(&cmd, 0x0, sizeof(cmd));
@@ -2208,7 +2208,7 @@ int ena_com_set_default_hash_ctrl(struct ena_com_dev *ena_dev) 
			pr_err("hash control doesn't support all the desire configuration. proto %x supported %x selected %x\n",

			       i, hash_ctrl->supported_fields[i].fields,

			       hash_ctrl->selected_fields[i].fields);

			return -EPERM;

			return -EOPNOTSUPP;

		}

	}
@@ -2286,7 +2286,7 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena_dev) 
		    ena_dev, ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG)) {

		pr_debug("Feature %d isn't supported\n",

			 ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG);

		return -EPERM;

		return -EOPNOTSUPP;

	}



	ret = ena_com_ind_tbl_convert_to_device(ena_dev);
@@ -2553,7 +2553,7 @@ int ena_com_init_interrupt_moderation(struct ena_com_dev *ena_dev) 
				 ENA_ADMIN_INTERRUPT_MODERATION);



	if (rc) {

		if (rc == -EPERM) {

		if (rc == -EOPNOTSUPP) {

			pr_debug("Feature %d isn't supported\n",

				 ENA_ADMIN_INTERRUPT_MODERATION);

			rc = 0;

drivers/net/ethernet/amazon/ena/ena_ethtool.c

+3 −7
Original line number Diff line number Diff line
@@ -539,12 +539,8 @@ static int ena_get_rss_hash(struct ena_com_dev *ena_dev, 
	}



	rc = ena_com_get_hash_ctrl(ena_dev, proto, &hash_fields);

	if (rc) {

		/* If device don't have permission, return unsupported */

		if (rc == -EPERM)

			rc = -EOPNOTSUPP;

	if (rc)

		return rc;

	}



	cmd->data = ena_flow_hash_to_flow_type(hash_fields);
@@ -612,7 +608,7 @@ static int ena_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info) 
		rc = -EOPNOTSUPP;

	}



	return (rc == -EPERM) ? -EOPNOTSUPP : rc;

	return rc;

}



static int ena_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info,
@@ -638,7 +634,7 @@ static int ena_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info, 
		rc = -EOPNOTSUPP;

	}



	return (rc == -EPERM) ? -EOPNOTSUPP : rc;

	return rc;

}



static u32 ena_get_rxfh_indir_size(struct net_device *netdev)

drivers/net/ethernet/amazon/ena/ena_netdev.c

+10 −10
Original line number Diff line number Diff line
@@ -1446,7 +1446,7 @@ static int ena_rss_configure(struct ena_adapter *adapter) 
	/* In case the RSS table wasn't initialized by probe */

	if (!ena_dev->rss.tbl_log_size) {

		rc = ena_rss_init_default(adapter);

		if (rc && (rc != -EPERM)) {

		if (rc && (rc != -EOPNOTSUPP)) {

			netif_err(adapter, ifup, adapter->netdev,

				  "Failed to init RSS rc: %d\n", rc);

			return rc;
@@ -1455,17 +1455,17 @@ static int ena_rss_configure(struct ena_adapter *adapter) 


	/* Set indirect table */

	rc = ena_com_indirect_table_set(ena_dev);

	if (unlikely(rc && rc != -EPERM))

	if (unlikely(rc && rc != -EOPNOTSUPP))

		return rc;



	/* Configure hash function (if supported) */

	rc = ena_com_set_hash_function(ena_dev);

	if (unlikely(rc && (rc != -EPERM)))

	if (unlikely(rc && (rc != -EOPNOTSUPP)))

		return rc;



	/* Configure hash inputs (if supported) */

	rc = ena_com_set_hash_ctrl(ena_dev);

	if (unlikely(rc && (rc != -EPERM)))

	if (unlikely(rc && (rc != -EOPNOTSUPP)))

		return rc;



	return 0;
@@ -2144,7 +2144,7 @@ static void ena_config_host_info(struct ena_com_dev *ena_dev) 


	rc = ena_com_set_host_attributes(ena_dev);

	if (rc) {

		if (rc == -EPERM)

		if (rc == -EOPNOTSUPP)

			pr_warn("Cannot set host attributes\n");

		else

			pr_err("Cannot set host attributes\n");
@@ -2181,7 +2181,7 @@ static void ena_config_debug_area(struct ena_adapter *adapter) 


	rc = ena_com_set_host_attributes(adapter->ena_dev);

	if (rc) {

		if (rc == -EPERM)

		if (rc == -EOPNOTSUPP)

			netif_warn(adapter, drv, adapter->netdev,

				   "Cannot set host attributes\n");

		else
@@ -2886,7 +2886,7 @@ static int ena_rss_init_default(struct ena_adapter *adapter) 
		val = ethtool_rxfh_indir_default(i, adapter->num_queues);

		rc = ena_com_indirect_table_fill_entry(ena_dev, i,

						       ENA_IO_RXQ_IDX(val));

		if (unlikely(rc && (rc != -EPERM))) {

		if (unlikely(rc && (rc != -EOPNOTSUPP))) {

			dev_err(dev, "Cannot fill indirect table\n");

			goto err_fill_indir;

		}
@@ -2894,13 +2894,13 @@ static int ena_rss_init_default(struct ena_adapter *adapter) 


	rc = ena_com_fill_hash_function(ena_dev, ENA_ADMIN_CRC32, NULL,

					ENA_HASH_KEY_SIZE, 0xFFFFFFFF);

	if (unlikely(rc && (rc != -EPERM))) {

	if (unlikely(rc && (rc != -EOPNOTSUPP))) {

		dev_err(dev, "Cannot fill hash function\n");

		goto err_fill_indir;

	}



	rc = ena_com_set_default_hash_ctrl(ena_dev);

	if (unlikely(rc && (rc != -EPERM))) {

	if (unlikely(rc && (rc != -EOPNOTSUPP))) {

		dev_err(dev, "Cannot fill hash control\n");

		goto err_fill_indir;

	}
@@ -3114,7 +3114,7 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_worker_destroy;

	}

	rc = ena_rss_init_default(adapter);

	if (rc && (rc != -EPERM)) {

	if (rc && (rc != -EOPNOTSUPP)) {

		dev_err(&pdev->dev, "Cannot init RSS rc: %d\n", rc);

		goto err_free_msix;

	}