Commit 80cf0b45 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mvpp2-add-TX-interrupts-support' 



Thomas Petazzoni says:

====================
net: mvpp2: add TX interrupts support

So far, the mvpp2 driver was using an hrtimer to handle TX
completion. This patch series adds support for using TX interrupts
(for each CPU) on PPv2.2, the variant of the IP used on Marvell Armada
7K/8K.

Dave: this version can be applied right away, it no longer depends on
Antoine's patch series. Antoine series had some comments, so he will
have to respin later on. Therefore, let's merge this smaller patch
series first.

Changes since v1:

 - Rebased on top of net-next, instead of on top of Antoine's series.

 - Removed the Device Tree patch, as it shouldn't go through the net
   tree.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e11e8729 5d3ecb24

Documentation/devicetree/bindings/net/marvell-pp2.txt

+25 −3
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ Optional properties (port): 
- marvell,loopback: port is loopback mode

- phy: a phandle to a phy node defining the PHY address (as the reg

  property, a single integer).

- interrupt-names: if more than a single interrupt for rx is given, must

                   be the name associated to the interrupts listed. Valid

                   names are: "tx-cpu0", "tx-cpu1", "tx-cpu2", "tx-cpu3",

		   "rx-shared".



Example for marvell,armada-375-pp2:
@@ -80,19 +84,37 @@ cpm_ethernet: ethernet@0 { 
	clock-names = "pp_clk", "gop_clk", "gp_clk";



	eth0: eth0 {

		interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <ICU_GRP_NSR 39 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 43 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 47 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 51 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",

				  "tx-cpu3", "rx-shared";

		port-id = <0>;

		gop-port-id = <0>;

	};



	eth1: eth1 {

		interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <ICU_GRP_NSR 40 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 44 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 48 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 52 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",

				  "tx-cpu3", "rx-shared";

		port-id = <1>;

		gop-port-id = <2>;

	};



	eth2: eth2 {

		interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <ICU_GRP_NSR 41 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 45 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 49 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 53 IRQ_TYPE_LEVEL_HIGH>,

			     <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",

				  "tx-cpu3", "rx-shared";

		port-id = <2>;

		gop-port-id = <3>;

	};

drivers/net/ethernet/marvell/mvpp2.c

+463 −148

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE