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

Commit 58569aee authored by Arnaud Patard's avatar Arnaud Patard Committed by Jason Cooper
Browse files

ARM: Orion: Set eth packet size csum offload limit 

The mv643xx ethernet controller limits the packet size for the TX
checksum offloading. This patch sets this limits for Kirkwood and
Dove which have smaller limits that the default.

As a side note, this patch is an updated version of a patch sent some years
ago: http://lists.infradead.org/pipermail/linux-arm-kernel/2010-June/017320.html


which seems to have been lost.

Signed-off-by: default avatarArnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
Cc: <stable@vger.kernel.org>
parent 0d7614f0

arch/arm/mach-dove/common.c

+2 −1
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ void __init dove_ehci1_init(void) 
void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data)

{

	orion_ge00_init(eth_data, DOVE_GE00_PHYS_BASE,

			IRQ_DOVE_GE00_SUM, IRQ_DOVE_GE00_ERR);

			IRQ_DOVE_GE00_SUM, IRQ_DOVE_GE00_ERR,

			1600);

}



/*****************************************************************************

arch/arm/mach-kirkwood/common.c

+2 −2
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data) 
{

	orion_ge00_init(eth_data,

			GE00_PHYS_BASE, IRQ_KIRKWOOD_GE00_SUM,

			IRQ_KIRKWOOD_GE00_ERR);

			IRQ_KIRKWOOD_GE00_ERR, 1600);

	/* The interface forgets the MAC address assigned by u-boot if

	the clock is turned off, so claim the clk now. */

	clk_prepare_enable(ge0);
@@ -315,7 +315,7 @@ void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data) 
{

	orion_ge01_init(eth_data,

			GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM,

			IRQ_KIRKWOOD_GE01_ERR);

			IRQ_KIRKWOOD_GE01_ERR, 1600);

	clk_prepare_enable(ge1);

}

arch/arm/mach-mv78xx0/common.c

+4 −2
Original line number Diff line number Diff line
@@ -213,7 +213,8 @@ void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data) 
{

	orion_ge00_init(eth_data,

			GE00_PHYS_BASE, IRQ_MV78XX0_GE00_SUM,

			IRQ_MV78XX0_GE_ERR);

			IRQ_MV78XX0_GE_ERR,

			MV643XX_TX_CSUM_DEFAULT_LIMIT);

}
@@ -224,7 +225,8 @@ void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data) 
{

	orion_ge01_init(eth_data,

			GE01_PHYS_BASE, IRQ_MV78XX0_GE01_SUM,

			NO_IRQ);

			NO_IRQ,

			MV643XX_TX_CSUM_DEFAULT_LIMIT);

}

arch/arm/mach-orion5x/common.c

+2 −1
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data) 
{

	orion_ge00_init(eth_data,

			ORION5X_ETH_PHYS_BASE, IRQ_ORION5X_ETH_SUM,

			IRQ_ORION5X_ETH_ERR);

			IRQ_ORION5X_ETH_ERR,

			MV643XX_TX_CSUM_DEFAULT_LIMIT);

}

arch/arm/plat-orion/common.c

+6 −2
Original line number Diff line number Diff line
@@ -291,10 +291,12 @@ static struct platform_device orion_ge00 = { 
void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,

			    unsigned long mapbase,

			    unsigned long irq,

			    unsigned long irq_err)

			    unsigned long irq_err,

			    unsigned int tx_csum_limit)

{

	fill_resources(&orion_ge00_shared, orion_ge00_shared_resources,

		       mapbase + 0x2000, SZ_16K - 1, irq_err);

	orion_ge00_shared_data.tx_csum_limit = tx_csum_limit;

	ge_complete(&orion_ge00_shared_data,

		    orion_ge00_resources, irq, &orion_ge00_shared,

		    eth_data, &orion_ge00);
@@ -343,10 +345,12 @@ static struct platform_device orion_ge01 = { 
void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,

			    unsigned long mapbase,

			    unsigned long irq,

			    unsigned long irq_err)

			    unsigned long irq_err,

			    unsigned int tx_csum_limit)

{

	fill_resources(&orion_ge01_shared, orion_ge01_shared_resources,

		       mapbase + 0x2000, SZ_16K - 1, irq_err);

	orion_ge01_shared_data.tx_csum_limit = tx_csum_limit;

	ge_complete(&orion_ge01_shared_data,

		    orion_ge01_resources, irq, &orion_ge01_shared,

		    eth_data, &orion_ge01);