Commit 03f568a1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'eth-common-fault-irq-support' 



Suraj Jaiswal says:

====================
Ethernet common fault IRQ support

Changes since v13:
- Update correct sender email

Changes since v12:
- Update correct sender email

Changes since v11:
- Update debug message print

Changes since v10:
- Update commit message

Changes since v9:
- prevent race condition of safety IRQ handling

Changes since v8:
- Use shared IRQ for sfty
- update error message

Changes since v7:
- Add support of common sfty irq on stmmac_request_irq_multi_msi.
- Remove uncecessary blank line.

Changes since v6:
- use name sfty_irq instead of safety_common_irq.

Changes since v5:
- Add description of ECC, DPP, FSM

Changes since v4:
- Fix DT_CHECKER warning
- use name safety for the IRQ.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0972d1d9 5c221516

Documentation/devicetree/bindings/net/qcom,ethqos.yaml

+6 −3
Original line number Diff line number Diff line
@@ -37,12 +37,14 @@ properties: 
    items:

      - description: Combined signal for various interrupt events

      - description: The interrupt that occurs when Rx exits the LPI state

      - description: The interrupt that occurs when HW safety error triggered



  interrupt-names:

    minItems: 1

    items:

      - const: macirq

      - const: eth_lpi

      - enum: [eth_lpi, sfty]

      - const: sfty



  clocks:

    maxItems: 4
@@ -89,8 +91,9 @@ examples: 
               <&gcc GCC_ETH_PTP_CLK>,

               <&gcc GCC_ETH_RGMII_CLK>;

      interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,

                   <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;

      interrupt-names = "macirq", "eth_lpi";

                   <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,

                   <GIC_SPI 782 IRQ_TYPE_LEVEL_HIGH>;

      interrupt-names = "macirq", "eth_lpi", "sfty";



      rx-fifo-depth = <4096>;

      tx-fifo-depth = <4096>;

Documentation/devicetree/bindings/net/snps,dwmac.yaml

+4 −2
Original line number Diff line number Diff line
@@ -108,13 +108,15 @@ properties: 
      - description: Combined signal for various interrupt events

      - description: The interrupt to manage the remote wake-up packet detection

      - description: The interrupt that occurs when Rx exits the LPI state

      - description: The interrupt that occurs when HW safety error triggered



  interrupt-names:

    minItems: 1

    items:

      - const: macirq

      - enum: [eth_wake_irq, eth_lpi]

      - const: eth_lpi

      - enum: [eth_wake_irq, eth_lpi, sfty]

      - enum: [eth_wake_irq, eth_lpi, sfty]

      - enum: [eth_wake_irq, eth_lpi, sfty]



  clocks:

    minItems: 1

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

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ enum request_irq_err { 
	REQ_IRQ_ERR_ALL,

	REQ_IRQ_ERR_TX,

	REQ_IRQ_ERR_RX,

	REQ_IRQ_ERR_SFTY,

	REQ_IRQ_ERR_SFTY_UE,

	REQ_IRQ_ERR_SFTY_CE,

	REQ_IRQ_ERR_LPI,

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

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ struct stmmac_resources { 
	int wol_irq;

	int lpi_irq;

	int irq;

	int sfty_irq;

	int sfty_ce_irq;

	int sfty_ue_irq;

	int rx_irq[MTL_MAX_RX_QUEUES];
@@ -298,6 +299,7 @@ struct stmmac_priv { 
	void __iomem *ptpaddr;

	void __iomem *estaddr;

	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];

	int sfty_irq;

	int sfty_ce_irq;

	int sfty_ue_irq;

	int rx_irq[MTL_MAX_RX_QUEUES];
@@ -306,6 +308,7 @@ struct stmmac_priv { 
	char int_name_mac[IFNAMSIZ + 9];

	char int_name_wol[IFNAMSIZ + 9];

	char int_name_lpi[IFNAMSIZ + 9];

	char int_name_sfty[IFNAMSIZ + 10];

	char int_name_sfty_ce[IFNAMSIZ + 10];

	char int_name_sfty_ue[IFNAMSIZ + 10];

	char int_name_rx_irq[MTL_MAX_TX_QUEUES][IFNAMSIZ + 14];

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

+39 −2
Original line number Diff line number Diff line
@@ -3597,6 +3597,10 @@ static void stmmac_free_irq(struct net_device *dev, 
		if (priv->wol_irq > 0 && priv->wol_irq != dev->irq)

			free_irq(priv->wol_irq, dev);

		fallthrough;

	case REQ_IRQ_ERR_SFTY:

		if (priv->sfty_irq > 0 && priv->sfty_irq != dev->irq)

			free_irq(priv->sfty_irq, dev);

		fallthrough;

	case REQ_IRQ_ERR_WOL:

		free_irq(dev->irq, dev);

		fallthrough;
@@ -3667,6 +3671,23 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 
		}

	}



	/* Request the common Safety Feature Correctible/Uncorrectible

	 * Error line in case of another line is used

	 */

	if (priv->sfty_irq > 0 && priv->sfty_irq != dev->irq) {

		int_name = priv->int_name_sfty;

		sprintf(int_name, "%s:%s", dev->name, "safety");

		ret = request_irq(priv->sfty_irq, stmmac_safety_interrupt,

				  0, int_name, dev);

		if (unlikely(ret < 0)) {

			netdev_err(priv->dev,

				   "%s: alloc sfty MSI %d (error: %d)\n",

				   __func__, priv->sfty_irq, ret);

			irq_err = REQ_IRQ_ERR_SFTY;

			goto irq_error;

		}

	}



	/* Request the Safety Feature Correctible Error line in

	 * case of another line is used

	 */
@@ -3804,6 +3825,21 @@ static int stmmac_request_irq_single(struct net_device *dev) 
		}

	}



	/* Request the common Safety Feature Correctible/Uncorrectible

	 * Error line in case of another line is used

	 */

	if (priv->sfty_irq > 0 && priv->sfty_irq != dev->irq) {

		ret = request_irq(priv->sfty_irq, stmmac_safety_interrupt,

				  IRQF_SHARED, dev->name, dev);

		if (unlikely(ret < 0)) {

			netdev_err(priv->dev,

				   "%s: ERROR: allocating the sfty IRQ %d (%d)\n",

				   __func__, priv->sfty_irq, ret);

			irq_err = REQ_IRQ_ERR_SFTY;

			goto irq_error;

		}

	}



	return 0;



irq_error:
@@ -6063,8 +6099,8 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id) 
	if (test_bit(STMMAC_DOWN, &priv->state))

		return IRQ_HANDLED;



	/* Check if a fatal error happened */

	if (stmmac_safety_feat_interrupt(priv))

	/* Check ASP error if it isn't delivered via an individual IRQ */

	if (priv->sfty_irq <= 0 && stmmac_safety_feat_interrupt(priv))

		return IRQ_HANDLED;



	/* To handle Common interrupts */
@@ -7513,6 +7549,7 @@ int stmmac_dvr_probe(struct device *device, 
	priv->dev->irq = res->irq;

	priv->wol_irq = res->wol_irq;

	priv->lpi_irq = res->lpi_irq;

	priv->sfty_irq = res->sfty_irq;

	priv->sfty_ce_irq = res->sfty_ce_irq;

	priv->sfty_ue_irq = res->sfty_ue_irq;

	for (i = 0; i < MTL_MAX_RX_QUEUES; i++)