drivers: net: cpsw: cleanup: remove unused function

[ Upstream commit ef492001214ba250b3bd18a7a346a047fe079449 ]

removing unused function as part of driver cleanup.`

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers: net: cpsw: add support to dump ALE table via ethtool register dump

[ Upstream commit 52c4f0ec662bbf02f1b0bcb311a48af2c8e5ee89 ]

Add support to view addresses added by the driver and learnt by the
hardware from ALE table via ethtool register dump interface.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers: net: cpsw: disable coalesce when rx_coalesce_usecs is zero

[ Upstream commit a84bc2a9013fb123deeca7283480955d021503fb ]

instead of return error on zero rx_coalesce_usecs, disable coalesce

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net: ethtool: Add Multicast and broadcast rate limit coalescing feature

Add ability to limit the broadcast or multicast packets to prevent
the loading of the CPU by a hacker with a broadcast or multicast
packet flood.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
drivers: net: cpsw: Add support for multicast/broadcast rate limit

Add support for multicast/broadcast rate limit feature via ethtool coalesce.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
net: ioctl: Adding switch configuration via ioctl

A switch can be configured in various combination of switch entry for
controling packet flow between the ports

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
drivers: net: cpsw: add support for switch ioctl

Add support for add/delete multicast and vlan using switch ioctl

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
ARM: DRA7: add pdata-quirks to do reset of PCIe

Added reset data in dra7xx hwmod data. This can be used by PCIe driver to
perform reset of the IP.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
pci: dra7xx: use pdata callbacks to perform reset

Now that we have populated the assert and deassert callbacks using pdata-quirks,
use these pdata callbacks to perform reset of PCIe.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Merge remote-tracking branch 'mugunthan/connectivity-ti-linux-3.14.y-cpsw' into connectivity-ti-linux-3.14.y
Merge remote-tracking branch 'rnayak/platform-ti-linux-3.14.y' into pm-ti-linux-3.14.y-next
ARM: dts: am57xx-beagle-x15: Map regulators to voltage domains

Map the appropriate SMPS to the correct voltage domains.

Signed-off-by: Nishanth Menon <nm@ti.com>
Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree into ti-linux-3.14.y

TI-Feature: power_management_base
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-ti-linux-3.14.y

* 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree:
  ARM: dts: am57xx-beagle-x15: Map regulators to voltage domains

Signed-off-by: Dan Murphy <DMurphy@ti.com>
Merge branch 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel into ti-linux-3.14.y

TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.14.y

* 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
  pci: dra7xx: use pdata callbacks to perform reset
  ARM: DRA7: add pdata-quirks to do reset of PCIe
  drivers: net: cpsw: add support for switch ioctl
  net: ioctl: Adding switch configuration via ioctl
  drivers: net: cpsw: Add support for multicast/broadcast rate limit
  net: ethtool: Add Multicast and broadcast rate limit coalescing feature
  drivers: net: cpsw: disable coalesce when rx_coalesce_usecs is zero
  drivers: net: cpsw: add support to dump ALE table via ethtool register dump
  drivers: net: cpsw: cleanup: remove unused function

Conflicts:
	arch/arm/mach-omap2/pdata-quirks.c

Signed-off-by: Dan Murphy <DMurphy@ti.com>
ARM: dts: am57xx-beagle-x15: Add dual ethernet

Make CPSW work - BeagleBoard-X15 has two network ports

MUX_MODE15 means "driver off". Pins are turned off
conserving more power.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
ARM: dts: am57xx-beagle-x15: Add Palmas power button

Enable Palmas power button support to enable system power.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
serial: omap-serial : Fix pinctrl sleep conflict with wakeup

When wakeup is enabled, i/o daisy chain based wakeup is used by
reconfiguring the padconfig register. However, this gets overriden by
sleep/wakeup configuration. So change the sequencing to allow pinctrl to
play with the wakeup bits as needed beyond the sleep configuration.

Fixes: e3a9488960b5 ("serial: omap-serial : Enhance pinctrl support")
Signed-off-by: Nishanth Menon <nm@ti.com>
Acked-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Merge branch 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel into ti-linux-3.14.y

TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.14.y

* 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
  serial: omap-serial : Fix pinctrl sleep conflict with wakeup
  ARM: dts: am57xx-beagle-x15: Add Palmas power button
  ARM: dts: am57xx-beagle-x15: Add dual ethernet

Signed-off-by: Dan Murphy <DMurphy@ti.com>
xfrm: Fix installation of AH IPsec SAs

[ Upstream commit a0e5ef53aac8e5049f9344857d8ec5237d31e58b ]

The SPI check introduced in ea9884b3acf3311c8a11db67bfab21773f6f82ba
was intended for IPComp SAs but actually prevented AH SAs from getting
installed (depending on the SPI).

Fixes: ea9884b3acf3 ("xfrm: check user specified spi for IPComp")
Cc: Fan Du <fan.du@windriver.com>
Signed-off-by: Tobias Brunner <tobias@strongswan.org>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
bnx2x: fix crash during TSO tunneling

[ Upstream commit fe26566d8a05151ba1dce75081f6270f73ec4ae1 ]

When TSO packet is transmitted additional BD w/o mapping is used
to describe the packed. The BD needs special handling in tx
completion.

kernel: Call Trace:
kernel: <IRQ>  [<ffffffff815e19ba>] dump_stack+0x19/0x1b
kernel: [<ffffffff8105dee1>] warn_slowpath_common+0x61/0x80
kernel: [<ffffffff8105df5c>] warn_slowpath_fmt+0x5c/0x80
kernel: [<ffffffff814a8c0d>] ? find_iova+0x4d/0x90
kernel: [<ffffffff814ab0e2>] intel_unmap_page.part.36+0x142/0x160
kernel: [<ffffffff814ad0e6>] intel_unmap_page+0x26/0x30
kernel: [<ffffffffa01f55d7>] bnx2x_free_tx_pkt+0x157/0x2b0 [bnx2x]
kernel: [<ffffffffa01f8dac>] bnx2x_tx_int+0xac/0x220 [bnx2x]
kernel: [<ffffffff8101a0d9>] ? read_tsc+0x9/0x20
kernel: [<ffffffffa01f8fdb>] bnx2x_poll+0xbb/0x3c0 [bnx2x]
kernel: [<ffffffff814d041a>] net_rx_action+0x15a/0x250
kernel: [<ffffffff81067047>] __do_softirq+0xf7/0x290
kernel: [<ffffffff815f3a5c>] call_softirq+0x1c/0x30
kernel: [<ffffffff81014d25>] do_softirq+0x55/0x90
kernel: [<ffffffff810673e5>] irq_exit+0x115/0x120
kernel: [<ffffffff815f4358>] do_IRQ+0x58/0xf0
kernel: [<ffffffff815e94ad>] common_interrupt+0x6d/0x6d
kernel: <EOI>  [<ffffffff810bbff7>] ? clockevents_notify+0x127/0x140
kernel: [<ffffffff814834df>] ? cpuidle_enter_state+0x4f/0xc0
kernel: [<ffffffff81483615>] cpuidle_idle_call+0xc5/0x200
kernel: [<ffffffff8101bc7e>] arch_cpu_idle+0xe/0x30
kernel: [<ffffffff810b4725>] cpu_startup_entry+0xf5/0x290
kernel: [<ffffffff815cfee1>] start_secondary+0x265/0x27b
kernel: ---[ end trace 11aa7726f18d7e80 ]---

Fixes: a848ade408b ("bnx2x: add CSUM and TSO support for encapsulation protocols")
Reported-by: Yulong Pei <ypei@redhat.com>
Cc: Michal Schmidt <mschmidt@redhat.com>
Signed-off-by: Dmitry Kravkov <Dmitry.Kravkov@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>