Commit c646d10d authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: enetc: don't overwrite the RSS indirection table when initializing 



After the blamed patch, all RX traffic gets hashed to CPU 0 because the
hashing indirection table set up in:

enetc_pf_probe
-> enetc_alloc_si_resources
   -> enetc_configure_si
      -> enetc_setup_default_rss_table

is overwritten later in:

enetc_pf_probe
-> enetc_init_port_rss_memory

which zero-initializes the entire port RSS table in order to avoid ECC errors.

The trouble really is that enetc_init_port_rss_memory really neads
enetc_alloc_si_resources to be called, because it depends upon
enetc_alloc_cbdr and enetc_setup_cbdr. But that whole enetc_configure_si
thing could have been better thought out, it has nothing to do in a
function called "alloc_si_resources", especially since its counterpart,
"free_si_resources", does nothing to unwind the configuration of the SI.

The point is, we need to pull out enetc_configure_si out of
enetc_alloc_resources, and move it after enetc_init_port_rss_memory.
This allows us to set up the default RSS indirection table after
initializing the memory.

Fixes: 07bf34a5 ("net: enetc: initialize the RFS and RSS memories")
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8bd2a055

drivers/net/ethernet/freescale/enetc/enetc.c

+3 −8
Original line number Diff line number Diff line
@@ -1058,13 +1058,12 @@ static int enetc_setup_default_rss_table(struct enetc_si *si, int num_groups) 
	return 0;

}



static int enetc_configure_si(struct enetc_ndev_priv *priv)

int enetc_configure_si(struct enetc_ndev_priv *priv)

{

	struct enetc_si *si = priv->si;

	struct enetc_hw *hw = &si->hw;

	int err;



	enetc_setup_cbdr(hw, &si->cbd_ring);

	/* set SI cache attributes */

	enetc_wr(hw, ENETC_SICAR0,

		 ENETC_SICAR_RD_COHERENT | ENETC_SICAR_WR_COHERENT);
@@ -1112,6 +1111,8 @@ int enetc_alloc_si_resources(struct enetc_ndev_priv *priv) 
	if (err)

		return err;



	enetc_setup_cbdr(&si->hw, &si->cbd_ring);



	priv->cls_rules = kcalloc(si->num_fs_entries, sizeof(*priv->cls_rules),

				  GFP_KERNEL);

	if (!priv->cls_rules) {
@@ -1119,14 +1120,8 @@ int enetc_alloc_si_resources(struct enetc_ndev_priv *priv) 
		goto err_alloc_cls;

	}



	err = enetc_configure_si(priv);

	if (err)

		goto err_config_si;



	return 0;



err_config_si:

	kfree(priv->cls_rules);

err_alloc_cls:

	enetc_clear_cbdr(&si->hw);

	enetc_free_cbdr(priv->dev, &si->cbd_ring);

drivers/net/ethernet/freescale/enetc/enetc.h

+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ void enetc_get_si_caps(struct enetc_si *si); 
void enetc_init_si_rings_params(struct enetc_ndev_priv *priv);

int enetc_alloc_si_resources(struct enetc_ndev_priv *priv);

void enetc_free_si_resources(struct enetc_ndev_priv *priv);

int enetc_configure_si(struct enetc_ndev_priv *priv);



int enetc_open(struct net_device *ndev);

int enetc_close(struct net_device *ndev);

drivers/net/ethernet/freescale/enetc/enetc_pf.c

+7 −0
Original line number Diff line number Diff line
@@ -1108,6 +1108,12 @@ static int enetc_pf_probe(struct pci_dev *pdev, 
		goto err_init_port_rss;

	}



	err = enetc_configure_si(priv);

	if (err) {

		dev_err(&pdev->dev, "Failed to configure SI\n");

		goto err_config_si;

	}



	err = enetc_alloc_msix(priv);

	if (err) {

		dev_err(&pdev->dev, "MSIX alloc failed\n");
@@ -1136,6 +1142,7 @@ static int enetc_pf_probe(struct pci_dev *pdev, 
	enetc_mdiobus_destroy(pf);

err_mdiobus_create:

	enetc_free_msix(priv);

err_config_si:

err_init_port_rss:

err_init_port_rfs:

err_alloc_msix:

drivers/net/ethernet/freescale/enetc/enetc_vf.c

+7 −0
Original line number Diff line number Diff line
@@ -171,6 +171,12 @@ static int enetc_vf_probe(struct pci_dev *pdev, 
		goto err_alloc_si_res;

	}



	err = enetc_configure_si(priv);

	if (err) {

		dev_err(&pdev->dev, "Failed to configure SI\n");

		goto err_config_si;

	}



	err = enetc_alloc_msix(priv);

	if (err) {

		dev_err(&pdev->dev, "MSIX alloc failed\n");
@@ -187,6 +193,7 @@ static int enetc_vf_probe(struct pci_dev *pdev, 


err_reg_netdev:

	enetc_free_msix(priv);

err_config_si:

err_alloc_msix:

	enetc_free_si_resources(priv);

err_alloc_si_res: