Commit 5ac712dc authored by Wong Vee Khee's avatar Wong Vee Khee Committed by David S. Miller
Browse files

net: stmmac: enable platform specific safety features 



On Intel platforms, not all safety features are enabled on the hardware.
The current implementation enable all safety features by default. This
will cause mass error and warning printouts after the module is loaded.

Introduce platform specific safety features flag to enable or disable
each safety features.

Signed-off-by: default avatarWong Vee Khee <vee.khee.wong@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e5432cc7

drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c

+26 −0
Original line number Diff line number Diff line
@@ -568,6 +568,16 @@ static int ehl_common_data(struct pci_dev *pdev, 
	plat->tx_queues_to_use = 8;

	plat->clk_ptp_rate = 200000000;



	plat->safety_feat_cfg->tsoee = 1;

	plat->safety_feat_cfg->mrxpee = 1;

	plat->safety_feat_cfg->mestee = 1;

	plat->safety_feat_cfg->mrxee = 1;

	plat->safety_feat_cfg->mtxee = 1;

	plat->safety_feat_cfg->epsi = 0;

	plat->safety_feat_cfg->edpp = 0;

	plat->safety_feat_cfg->prtyen = 0;

	plat->safety_feat_cfg->tmouten = 0;



	return intel_mgbe_common_data(pdev, plat);

}
@@ -683,6 +693,16 @@ static int tgl_common_data(struct pci_dev *pdev, 
	plat->tx_queues_to_use = 4;

	plat->clk_ptp_rate = 200000000;



	plat->safety_feat_cfg->tsoee = 1;

	plat->safety_feat_cfg->mrxpee = 0;

	plat->safety_feat_cfg->mestee = 1;

	plat->safety_feat_cfg->mrxee = 1;

	plat->safety_feat_cfg->mtxee = 1;

	plat->safety_feat_cfg->epsi = 0;

	plat->safety_feat_cfg->edpp = 0;

	plat->safety_feat_cfg->prtyen = 0;

	plat->safety_feat_cfg->tmouten = 0;



	return intel_mgbe_common_data(pdev, plat);

}
@@ -959,6 +979,12 @@ static int intel_eth_pci_probe(struct pci_dev *pdev, 
	if (!plat->dma_cfg)

		return -ENOMEM;



	plat->safety_feat_cfg = devm_kzalloc(&pdev->dev,

					     sizeof(*plat->safety_feat_cfg),

					     GFP_KERNEL);

	if (!plat->safety_feat_cfg)

		return -ENOMEM;



	/* Enable pci device */

	ret = pcim_enable_device(pdev);

	if (ret) {

drivers/net/ethernet/stmicro/stmmac/dwmac5.c

+20 −10
Original line number Diff line number Diff line
@@ -183,7 +183,8 @@ static void dwmac5_handle_dma_err(struct net_device *ndev, 
			STAT_OFF(dma_errors), stats);

}



int dwmac5_safety_feat_config(void __iomem *ioaddr, unsigned int asp)

int dwmac5_safety_feat_config(void __iomem *ioaddr, unsigned int asp,

			      struct stmmac_safety_feature_cfg *safety_feat_cfg)

{

	u32 value;
@@ -193,10 +194,15 @@ int dwmac5_safety_feat_config(void __iomem *ioaddr, unsigned int asp) 
	/* 1. Enable Safety Features */

	value = readl(ioaddr + MTL_ECC_CONTROL);

	value |= MEEAO; /* MTL ECC Error Addr Status Override */

	if (safety_feat_cfg->tsoee)

		value |= TSOEE; /* TSO ECC */

	if (safety_feat_cfg->mrxpee)

		value |= MRXPEE; /* MTL RX Parser ECC */

	if (safety_feat_cfg->mestee)

		value |= MESTEE; /* MTL EST ECC */

	if (safety_feat_cfg->mrxee)

		value |= MRXEE; /* MTL RX FIFO ECC */

	if (safety_feat_cfg->mtxee)

		value |= MTXEE; /* MTL TX FIFO ECC */

	writel(value, ioaddr + MTL_ECC_CONTROL);
@@ -219,12 +225,15 @@ int dwmac5_safety_feat_config(void __iomem *ioaddr, unsigned int asp) 


	/* 5. Enable Parity and Timeout for FSM */

	value = readl(ioaddr + MAC_FSM_CONTROL);

	if (safety_feat_cfg->prtyen)

		value |= PRTYEN; /* FSM Parity Feature */

	if (safety_feat_cfg->tmouten)

		value |= TMOUTEN; /* FSM Timeout Feature */

	writel(value, ioaddr + MAC_FSM_CONTROL);



	/* 4. Enable Data Parity Protection */

	value = readl(ioaddr + MTL_DPP_CONTROL);

	if (safety_feat_cfg->edpp)

		value |= EDPP;

	writel(value, ioaddr + MTL_DPP_CONTROL);
@@ -235,6 +244,7 @@ int dwmac5_safety_feat_config(void __iomem *ioaddr, unsigned int asp) 
	if (asp <= 0x2)

		return 0;



	if (safety_feat_cfg->epsi)

		value |= EPSI;

	writel(value, ioaddr + MTL_DPP_CONTROL);

	return 0;

drivers/net/ethernet/stmicro/stmmac/dwmac5.h

+2 −1
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ 


#define GMAC_INT_FPE_EN			BIT(17)



int dwmac5_safety_feat_config(void __iomem *ioaddr, unsigned int asp);

int dwmac5_safety_feat_config(void __iomem *ioaddr, unsigned int asp,

			      struct stmmac_safety_feature_cfg *safety_cfg);

int dwmac5_safety_feat_irq_status(struct net_device *ndev,

		void __iomem *ioaddr, unsigned int asp,

		struct stmmac_safety_stats *stats);

drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c

+3 −1
Original line number Diff line number Diff line
@@ -801,7 +801,9 @@ static void dwxgmac3_handle_dma_err(struct net_device *ndev, 
			   dwxgmac3_dma_errors, STAT_OFF(dma_errors), stats);

}



static int dwxgmac3_safety_feat_config(void __iomem *ioaddr, unsigned int asp)

static int

dwxgmac3_safety_feat_config(void __iomem *ioaddr, unsigned int asp,

			    struct stmmac_safety_feature_cfg *safety_cfg)

{

	u32 value;

drivers/net/ethernet/stmicro/stmmac/hwif.h

+2 −1
Original line number Diff line number Diff line
@@ -348,7 +348,8 @@ struct stmmac_ops { 
	void (*pcs_rane)(void __iomem *ioaddr, bool restart);

	void (*pcs_get_adv_lp)(void __iomem *ioaddr, struct rgmii_adv *adv);

	/* Safety Features */

	int (*safety_feat_config)(void __iomem *ioaddr, unsigned int asp);

	int (*safety_feat_config)(void __iomem *ioaddr, unsigned int asp,

				  struct stmmac_safety_feature_cfg *safety_cfg);

	int (*safety_feat_irq_status)(struct net_device *ndev,

			void __iomem *ioaddr, unsigned int asp,

			struct stmmac_safety_stats *stats);