keystone-linux/linux.git
6 years agoMerge branch '24-drivers-net' master
WingMan Kwok [Tue, 10 Mar 2015 14:21:27 +0000 (10:21 -0400)]
Merge branch '24-drivers-net'

6 years agonet: keystone: add missing statistics for k2l and k2e
WingMan Kwok [Wed, 25 Feb 2015 21:12:06 +0000 (16:12 -0500)]
net: keystone: add missing statistics for k2l and k2e

This patch adds the missing statistics for k2l and k2e.
It also removes the ones that are not defined for these
platforms.

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
6 years agonet: keystone: add support of setting hw address live
WingMan Kwok [Fri, 27 Feb 2015 21:53:19 +0000 (16:53 -0500)]
net: keystone: add support of setting hw address live

This patch adds support of setting hw address live.
When doing so, the netcp needs to update the lower
modules cpsw and pa to update their database accordingly,
i.e. setting up their receive filters.

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
6 years agonet: keystone: add support of additional 1G sgmii mode configurations
WingMan Kwok [Fri, 27 Feb 2015 21:18:33 +0000 (16:18 -0500)]
net: keystone: add support of additional 1G sgmii mode configurations

This patch adds support of 3 1G sgmii mode configurations
1. MAC-to-PHY master (SGMII_LINK_MAC_PHY_MASTER)
2. MAC-to-PHY master NO MDIO (SGMII_LINK_MAC_PHY_MASTER_NO_MDIO)
        - SGMII is in master mode and auto-nego enabled
        - use this mode to work around link down/up
          issue observed on K2E/L.
        - these 2 modes supports only gigabit fullduplex connections.

3. MAC-to-MAC Auto-negotiation Slave (SGMII_LINK_MAC_MAC_AN_SLAVE)
        - When connected 2 EVMs back-to-back and one
          side is configured as MAC-to-MAC Auto-negotiation master
          the other side needs to be configured as auto-nego slave.

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
6 years agonet: keystone: clean up slave port configurations
WingMan Kwok [Mon, 9 Mar 2015 17:12:20 +0000 (13:12 -0400)]
net: keystone: clean up slave port configurations

In multi-if mode:

When MDIO/PHY is enabled, carrier on/off is reported
to upper layer by the phy state machine, hence cpsw
driver needs to report carrier on/off when the link
interface type is other than MAC-to-PHY.

Also, in the MAC-to-PHY case, in addition to checking
the sgmii link status register, cpsw driver needs to
check the bit that corresponds to the phy connected to
the slave port in the phy link state variable in netcp
in order to conclude the sgmii link status.  Only when
both of these two statuses show an up state can the cpsw
driver conclude the link is up.  Before this
patch, it checks the aggregated value of the phy link
state variable.

In the case of MAC-to-MAC, the cpsw driver is responsible
to report the carrier on/off status to upper layers.

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
6 years agoMerge branch 'v3.10.61/rebuild/24-drivers-net' into v3.10.61/master
Murali Karicheri [Mon, 9 Mar 2015 21:43:03 +0000 (17:43 -0400)]
Merge branch 'v3.10.61/rebuild/24-drivers-net' into v3.10.61/master

6 years agonet: keystone: store network statistics in 64 bits
Michael Scherban [Fri, 27 Feb 2015 22:32:00 +0000 (17:32 -0500)]
net: keystone: store network statistics in 64 bits

Previously the network statistics were stored in 32 bit u_ints
which can cause some stats to roll over after several minutes of
high traffic. This implements 64 bit storage so larger numbers
can be stored.

Signed-off-by: Michael Scherban <m-scherban@ti.com>
6 years agoMerge branch 'master/rebuild/24-drivers-net' into master/master
Reece R. Pollack [Fri, 27 Feb 2015 20:45:03 +0000 (15:45 -0500)]
Merge branch 'master/rebuild/24-drivers-net' into master/master

6 years agonet: keystone: Add TX queue depth resizing to NetCP QoS
Reece R. Pollack [Fri, 20 Feb 2015 23:36:40 +0000 (18:36 -0500)]
net: keystone: Add TX queue depth resizing to NetCP QoS

This patch makes the TX queue depths (really the number of DMA
descriptors available) visible and modifiable in sysfs. This
also exposes queue name and device multi-interface mode.

This patch provides these features in the NetCP QoS module ONLY,
and does not apply to other NetCP modules (PA, SA, etc).

Signed-off-by: Reece R. Pollack <x0183204@ti.com>
6 years agoMerge branch 'master/rebuild/24-drivers-net' into master/master v3.10.61/master K2_LINUX_03.10.61_15.02
Reece R. Pollack [Tue, 24 Feb 2015 18:52:51 +0000 (13:52 -0500)]
Merge branch 'master/rebuild/24-drivers-net' into master/master

6 years agoRevert "net: keystone: Add TX queue depth resizing to NetCP QoS"
Reece R. Pollack [Tue, 24 Feb 2015 18:50:38 +0000 (13:50 -0500)]
Revert "net: keystone: Add TX queue depth resizing to NetCP QoS"

This feature was not intended for the current release, and thus is
being reverted. It will appear in the next release.

This reverts commit 7710b4b7519ec0162d18fce7d85f6b22dd07fc7f.

6 years agoMerge branch 'master/rebuild/24-drivers-net' into master/master
Reece R. Pollack [Tue, 24 Feb 2015 18:08:52 +0000 (13:08 -0500)]
Merge branch 'master/rebuild/24-drivers-net' into master/master

6 years agoMerge branch 'master/rebuild/20-firmware' into master/master
Reece R. Pollack [Tue, 24 Feb 2015 18:08:48 +0000 (13:08 -0500)]
Merge branch 'master/rebuild/20-firmware' into master/master

6 years agonet: keystone: Add TX queue depth resizing to NetCP QoS
Reece R. Pollack [Fri, 20 Feb 2015 23:36:40 +0000 (18:36 -0500)]
net: keystone: Add TX queue depth resizing to NetCP QoS

This patch makes the TX queue depths (really the number of DMA
descriptors available) visible and modifiable in sysfs. Also
exposed queue name and device multi-interface mode.

This change affects ONLY the NetCP QoS module, and does not
apply to other NetCP modules (PA, SA, etc).

Signed-off-by: Reece R. Pollack <x0183204@ti.com>
6 years agofirmware: keystone: Update NetCP PA PDSP firmware to 3.0.1.4
Reece R. Pollack [Tue, 24 Feb 2015 01:32:15 +0000 (20:32 -0500)]
firmware: keystone: Update NetCP PA PDSP firmware to 3.0.1.4

This patch updates the NetCP PA PDSP firmware to rev 3.0.1.4.

Signed-off-by: Reece R. Pollack <x0183204@ti.com>
6 years agoMerge branch 'master/rebuild/24-drivers-net' into master/master
Reece R. Pollack [Mon, 16 Feb 2015 22:32:48 +0000 (17:32 -0500)]
Merge branch 'master/rebuild/24-drivers-net' into master/master

6 years agoMerge branch 'master/rebuild/23-drivers-dmaengine' into master/master
Reece R. Pollack [Mon, 16 Feb 2015 22:32:46 +0000 (17:32 -0500)]
Merge branch 'master/rebuild/23-drivers-dmaengine' into master/master

6 years agoMerge branch 'master/rebuild/22-drivers-hwqueue' into master/master
Reece R. Pollack [Mon, 16 Feb 2015 22:32:42 +0000 (17:32 -0500)]
Merge branch 'master/rebuild/22-drivers-hwqueue' into master/master

6 years agonet: keystone: Remove NetCP CPSW ALE VLAN configuration
Reece R. Pollack [Mon, 16 Feb 2015 19:44:19 +0000 (14:44 -0500)]
net: keystone: Remove NetCP CPSW ALE VLAN configuration

An early implementation of the NetCP CPSW module configured the
Address Lookup Engine (ALE) to be VLAN-aware. This was later
determined to be undesirable, and the VLAN-aware bit in the ALE
Control register was changed to 0. However, the code to configure
VLAN-specific entries remained. This patch removes this unneeded
code, and addresses a NULL pointer dereference in the process.

Signed-off-by: Reece R. Pollack <x0183204@ti.com>
6 years agonet: keystone: Fix memory leak in CPSW ALE configuration
Reece R. Pollack [Mon, 16 Feb 2015 19:35:36 +0000 (14:35 -0500)]
net: keystone: Fix memory leak in CPSW ALE configuration

Prior to this patch, the CPSW ALE context was created when the first
interface on a device was opened, but it was not destroyed when the
last interface was closed (it was stopped instead). This resulted in
a memory leak. This patch corrects this.

Also, the ALE Slaves were being shut down after the ALE context was
being destroyed. This could result in a NULL pointer reference. This
patch fixes this too.

Finally, the ALE reference count in keystone_xgess.c was a non-atomic
integer, while the other modules used an atomic. This patch fixes this
and includes some minor restructuring so the code looks more like the
other two modules.

Signed-off-by: Reece R. Pollack <x0183204@ti.com>
6 years agonet: keystone: Remove erroneous dmaengine_pause calls in PA shutdown
Reece R. Pollack [Mon, 9 Feb 2015 22:21:08 +0000 (17:21 -0500)]
net: keystone: Remove erroneous dmaengine_pause calls in PA shutdown

This patch removes erroneous calls to dmaengine_pause() in the NetCP
PA shutdown sequence. This function should be called to stop DMA
completion notifications that would trigger later dma_poll() calls
from a softIRQ or tasklet. If the interrupt is to be serviced from
the notifier routine, then we should not be pausing the channel
even if we're shutting it down.

Signed-off-by: Reece R. Pollack <x0183204@ti.com>
6 years agonet: keystone: k2e k2l changes paired with k2hk
WingMan Kwok [Thu, 5 Feb 2015 21:37:56 +0000 (16:37 -0500)]
net: keystone: k2e k2l changes paired with k2hk

This patch pairs some changes made for k2hk in two commits
before but not on k2e and k2l.

Original k2hk commit logs:

net: keystone: Don't re-initialize CPSW host port and ALE

    Prior to this patch, every time an interface was brought up
    the CPSW host port and a number of ALE configurations were re-
    initialized. This is unnecessary and interferes with some uses
    of the CPSW by DSPs. This patch causes the CPSW host port and
    ALE to be configured only when the first interface on the CPSW
    is brought up.

    Note that if all of the interfaces on the CPSW are brought down,
    the clocks driving the CPSW (and other parts of the NetCP) are
    shut off for power consumption, which is assumed to cause a loss
    of configuration. Thus the CPSW must be re-initialized when the
    first interface is brought back up.

net: keystone: Clean up network interface shutdown

    This patch also asserts SGMII RTRESET during shutdown to avoid
    having the hardware wedge when shutting down with high incoming
    traffic rates. This is cleared when the interface is brought
    back up.

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
6 years agodma: keystone: Fix memory leak freeing DMA descriptors
Reece R. Pollack [Fri, 13 Feb 2015 17:03:53 +0000 (12:03 -0500)]
dma: keystone: Fix memory leak freeing DMA descriptors

This patch corrects a memory leak when freeing software DMA
descriptors. The loop containing the error was intended to
identify any hardware DMA descriptors which did not get freed
by the previous loop, but do to missing braces ({..}) it always
set "leaked" to "true" which prevented the software descriptor
array from being freed.

Signed-off-by: Reece R. Pollack <x0183204@ti.com>
6 years agohwqueue: Fix race in disabling interrupt notifications
Reece R. Pollack [Mon, 2 Feb 2015 17:38:59 +0000 (12:38 -0500)]
hwqueue: Fix race in disabling interrupt notifications

Prior to this patch, there existed a race condition between
disabling of notifications in hwqueue_disable_notifier() and
hwqueue_notify(). In this race, the delivery of an interrupt
after the notifier was marked disabled but before disabling
the interrupt would result in the interrupt service routine
not calling the notifier function. Thus the interrupt persists
which prevents or severely delays the disabling of the interrupt.

This patch synchronizes the entire notifier disable sequence
against the delivery of an interrupt notification by the use
of a spinlock. Synchronization is also provided against the
enable sequence. Note that the use of atomic operations does
not suffice in this situation.

Signed-off-by: Reece R. Pollack <x0183204@ti.com>
6 years agoMerge branch 'master/rebuild/01-upstream' into master/master
Reece R. Pollack [Wed, 4 Feb 2015 23:37:20 +0000 (18:37 -0500)]
Merge branch 'master/rebuild/01-upstream' into master/master

6 years agonet: Fix skb->protocol setting for mixed IPsec tunnels
Reece R. Pollack [Wed, 4 Feb 2015 22:40:56 +0000 (17:40 -0500)]
net: Fix skb->protocol setting for mixed IPsec tunnels

When processing fragmented packets in a mixed-protocol tunnel
(i.e. IPv6 inner and IPv4 outer, or IPv4 inner and IPv6 outer),
the skb->protocol field is being set to the wrong value. This
patch sets the skb->protocol value according to the IP header
version of the packet it's carrying.

Signed-off-by: Reece R. Pollack <x0183204@ti.com>
6 years agonet: Add IPv4 ICMP support to GSO
Reece R. Pollack [Mon, 2 Feb 2015 21:06:03 +0000 (16:06 -0500)]
net: Add IPv4 ICMP support to GSO

This patch adds support for IPv4 ICMP to Generic Segementation
Offload. This permits inner fragmentation of ICMP packets sent
over certain IPsec tunnels, rather than requiring fragmentation
of the over-sized IPsec packets.

Signed-off-by: Reece R. Pollack <x0183204@ti.com>
6 years agoMerge branch 'master/rebuild/20-firmware' into master/master
Reece R. Pollack [Tue, 3 Feb 2015 18:39:25 +0000 (13:39 -0500)]
Merge branch 'master/rebuild/20-firmware' into master/master

6 years agofirmware: keystone: Update NetCP PA 3.0.1.3 firmware (several bugfixes)
Reece R. Pollack [Tue, 3 Feb 2015 18:28:04 +0000 (13:28 -0500)]
firmware: keystone: Update NetCP PA 3.0.1.3 firmware (several bugfixes)

This patch updates the NetCP PA firmware rev 3.0.1.3 to help address
several bugs reported in the LLD (DSP) software.

Signed-off-by: Reece R. Pollack <x0183204@ti.com>
6 years agoMerge branch 'v3.10.61/rebuild/24-drivers-net' into v3.10.61/master
Murali Karicheri [Fri, 30 Jan 2015 23:00:36 +0000 (18:00 -0500)]
Merge branch 'v3.10.61/rebuild/24-drivers-net' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/12-keystone-machine' into v3.10.61/master
Murali Karicheri [Fri, 30 Jan 2015 23:00:27 +0000 (18:00 -0500)]
Merge branch 'v3.10.61/rebuild/12-keystone-machine' into v3.10.61/master

6 years agonet: keystone: disable slave port state on ifdown
Murali Karicheri [Fri, 30 Jan 2015 21:29:40 +0000 (16:29 -0500)]
net: keystone: disable slave port state on ifdown

Currently the slave port state is not updated when interface is
brought down. This patch fixes this.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
6 years agoARM: keystone: add a work around to handle external abort
Murali Karicheri [Mon, 26 Jan 2015 21:28:41 +0000 (16:28 -0500)]
ARM: keystone: add a work around to handle external abort

Currently on some devices, an async external abort happens first time
exception handlers are enabled in kernel before switching to user space.
This patch add a workaround to handle this once and allow any subsequent
faults to be caught by the handler.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
6 years agoMerge branch 'v3.10.61/rebuild/24-drivers-net' into v3.10.61/master
Murali Karicheri [Thu, 22 Jan 2015 15:51:35 +0000 (10:51 -0500)]
Merge branch 'v3.10.61/rebuild/24-drivers-net' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/20-firmware' into v3.10.61/master
Murali Karicheri [Thu, 22 Jan 2015 15:51:27 +0000 (10:51 -0500)]
Merge branch 'v3.10.61/rebuild/20-firmware' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/12-keystone-machine' into v3.10.61/master
Murali Karicheri [Thu, 22 Jan 2015 15:51:09 +0000 (10:51 -0500)]
Merge branch 'v3.10.61/rebuild/12-keystone-machine' into v3.10.61/master

6 years agonet: keystone: ale: fix sysfs attribute issue when debug options are enabled
Murali Karicheri [Tue, 20 Jan 2015 17:42:57 +0000 (12:42 -0500)]
net: keystone: ale: fix sysfs attribute issue when debug options are enabled

Currently when CONFIG_DEBUG_LOCKDEP is enabled, following errors are
thrown by the kernel.

"BUG: key ebc25d10 not in .data!"

This patch fixes this issue by using sysfs_attr_init() to initialize the
dynamically allocated attributes. Kernel otherwise expects this to be
declared statically and passed to device_create_file().

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
6 years agoARM: keystone: allow FORCE_MAX_ZONEORDER to be configurable on Keystone
Murali Karicheri [Wed, 21 Jan 2015 19:54:02 +0000 (14:54 -0500)]
ARM: keystone: allow FORCE_MAX_ZONEORDER to be configurable on Keystone

Currently adding CONFIG_FORCE_MAX_ZONEORDER option in defconfig
doesn't change the MAX_ZONEORDER used in defconfig. User require
tuning of this on a target board. So fix this.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
6 years agonet: keystone: Update NetCP PA2 PDSP constant for 3.0.1.3 firmware
Murali Karicheri [Fri, 16 Jan 2015 15:27:18 +0000 (10:27 -0500)]
net: keystone: Update NetCP PA2 PDSP constant for 3.0.1.3 firmware

This update the constant to match with 3.0.1.3

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
6 years agofirmware: keystone: Update NetCP PDSP firmware to 3.0.1.3
Murali Karicheri [Fri, 16 Jan 2015 15:46:05 +0000 (10:46 -0500)]
firmware: keystone: Update NetCP PDSP firmware to 3.0.1.3

This patch updates the NetCP PDSP firmware to rev 3.0.1.3. It
requires a companion patch to update the PA2 PDSP constants.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
6 years agoarm: keystone2: add default config and DTS for recovery kernel
Vitaly Andrianov [Wed, 30 Jul 2014 17:44:10 +0000 (13:44 -0400)]
arm: keystone2: add default config and DTS for recovery kernel

Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
6 years agoarm: keystone2: kexec: change load address for recovery kernel
Vitaly Andrianov [Wed, 30 Jul 2014 18:31:14 +0000 (14:31 -0400)]
arm: keystone2: kexec: change load address for recovery kernel

The recovery kernel has to be loaded in to the different address.

Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
6 years agoarm: keystone2: defconfig: enable KEXEC and CRASH_DUMP
Vitaly Andrianov [Wed, 21 Jan 2015 14:32:49 +0000 (09:32 -0500)]
arm: keystone2: defconfig: enable KEXEC and CRASH_DUMP

Add the KEXEC and CRASH_DUMP by default

Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
6 years agoarm: keystone2: use ks2 aliased physical address for cpu_reset
Vitaly Andrianov [Mon, 4 Aug 2014 12:12:20 +0000 (08:12 -0400)]
arm: keystone2: use ks2 aliased physical address for cpu_reset

KS2 system uses physical addresses outside of first 4GB memory range.
Once the cpu_reset() disables MMU that memory cannot be used.
To let the cpu_reset() successfully restart CPU we need to run it from
KS2 aliased memory address space.

Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
6 years agoarm: keystone2: kexec: convert physical to aliased addresses and back
Vitaly Andrianov [Fri, 1 Aug 2014 14:09:14 +0000 (10:09 -0400)]
arm: keystone2: kexec: convert physical to aliased addresses and back

This patch converts physical addresses and pages that are used for kexec
functionality to the corresponding aliased addresses and pages.
It is required because:

- Keystone2 SoC DDR3 addresses are outside the first 4GB of address range.
In order to access the first 4GB of the memory on boot time before
enabling MMU HW provide memory range aliasing (See KS2 TRM for details).
Before rebooting the kernel we need to convert all physical addresses,
which are used by recovery kernel to the corresponding aliased values.

- Before enabling MMU ARM uses 32 bit addresses. Even if we need a real
physical address instead of aliased one, we still convert it to aliased
address in the working kernel and restore back to physical in the recovery
kernel.

- kexec user utility uses 32 bit variables to pass addresses to the
kernel. So, we have to use aliased addresses as well and convert them to
physical in kernel

Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
6 years agoMerge branch '15-dts' into master2
Vitaly Andrianov [Tue, 20 Jan 2015 19:13:06 +0000 (14:13 -0500)]
Merge branch '15-dts' into master2

6 years agokeystone: dts: add psci command definition
Vitaly Andrianov [Wed, 14 Jan 2015 14:44:57 +0000 (09:44 -0500)]
keystone: dts: add psci command definition

This commit adds definition for cpu_on, cpu_off and cpu_suspend commands.
These definitions must match the corresponding PSCI definitions in
boot monitor.

Having those command and corresponding PSCI support in boot monitor allows
run time CPU hot plugin.

Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
6 years agoMerge branch '13-defconfig' into master2
Vitaly Andrianov [Tue, 20 Jan 2015 19:09:25 +0000 (14:09 -0500)]
Merge branch '13-defconfig' into master2

6 years agoMerge branch '12-mach' into master2
Vitaly Andrianov [Tue, 20 Jan 2015 19:09:17 +0000 (14:09 -0500)]
Merge branch '12-mach' into master2

6 years agoARM: keystone: defconfig: add ARM_PSCI and HOTPLUG_CPU support
Vitaly Andrianov [Tue, 20 Jan 2015 19:06:05 +0000 (14:06 -0500)]
ARM: keystone: defconfig: add ARM_PSCI and HOTPLUG_CPU support

Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
6 years agokeystone: psci: adds cpu_die implementation
Vitaly Andrianov [Wed, 14 Jan 2015 14:37:30 +0000 (09:37 -0500)]
keystone: psci: adds cpu_die implementation

This commit add cpu_die implementation using psci api

Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
6 years agoMerge branch 'master/rebuild/15-keystone-devicetree' into master/master
Hao Zhang [Fri, 16 Jan 2015 20:28:27 +0000 (15:28 -0500)]
Merge branch 'master/rebuild/15-keystone-devicetree' into master/master

6 years agok2e: dts: add srss uio support
Hao Zhang [Thu, 15 Jan 2015 21:22:49 +0000 (16:22 -0500)]
k2e: dts: add srss uio support

Adds device tree bindings to enable Smart Reflex Sub-System register
access and temperature threshold point interrupt via UIO for K2E device.

Signed-off-by: Hao Zhang <hzhang@ti.com>
6 years agoMerge branch 'v3.10.61/rebuild/13-keystone-defconfig' into v3.10.61/master
Murali Karicheri [Thu, 15 Jan 2015 15:30:45 +0000 (10:30 -0500)]
Merge branch 'v3.10.61/rebuild/13-keystone-defconfig' into v3.10.61/master

6 years agoARM: keystone: defconfig: enable AES GCM option
Murali Karicheri [Thu, 15 Jan 2015 15:26:26 +0000 (10:26 -0500)]
ARM: keystone: defconfig: enable AES GCM option

In the defconfig enable AES GCM by default.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
6 years agoMerge branch 'v3.10.61/rebuild/15-keystone-devicetree' into v3.10.61/master
Murali Karicheri [Wed, 14 Jan 2015 20:29:21 +0000 (15:29 -0500)]
Merge branch 'v3.10.61/rebuild/15-keystone-devicetree' into v3.10.61/master

6 years agokeystone: dts: disable PCIe by default for K2L EVM
Murali Karicheri [Thu, 8 Jan 2015 18:04:00 +0000 (13:04 -0500)]
keystone: dts: disable PCIe by default for K2L EVM

K2L EVM has by default SGMII configured to use the two serdes lanes and
the same is not available for PCIe. Currently both SGMII driver and
PCI driver is configured to use the SerDes. This patch disables PCIe-0
by default in keystone.dtsi and enable it only for K2HK and K2E. For K2L
it will remain disabled to match with hardware configuration. To enable
PCI-0, status needs to be set to "ok" on K2L based boards that has mux in
configured for PCIe to use SerDes lanes. For PCI-1, we don't have the
support enabled in DTS. So no issue.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
6 years agoMerge branch 'v3.10.61/rebuild/34-drivers-crypto' into v3.10.61/master
Murali Karicheri [Mon, 12 Jan 2015 16:44:31 +0000 (11:44 -0500)]
Merge branch 'v3.10.61/rebuild/34-drivers-crypto' into v3.10.61/master

6 years agocrypto: keystone: Add support for authenc - hmac(sha1),ecb(cipher_null) algorithms
Tinku Mannan [Fri, 5 Dec 2014 16:02:00 +0000 (11:02 -0500)]
crypto: keystone: Add support for authenc - hmac(sha1),ecb(cipher_null) algorithms

This patch adds support for following algorithm implmentations in the
kernel crypto framework:
 -  authenc(hmac(sha1),ecb(cipher_null))

Signed-off-by: Tinku Mannan <tmannan@ti.com>
6 years agoMerge branch 'rebuild/29-drivers-rproc' into v3.10/master
Murali Karicheri [Wed, 24 Dec 2014 16:23:52 +0000 (11:23 -0500)]
Merge branch 'rebuild/29-drivers-rproc' into v3.10/master

6 years agoremoteproc: patch for aligning uio address and size
Ivan Pang [Thu, 14 Aug 2014 11:38:41 +0000 (07:38 -0400)]
remoteproc: patch for aligning uio address and size

- Uio driver now restricts the mmap to aligned addresses
- This patch is to pass aligned addresses to uio driver.

Signed-off-by: Ivan Pang <i-pang@ti.com>
Signed-off-by: Sam Nelson <sam.nelson@ti.com>
6 years agoMerge branch 'master/rebuild/24-drivers-net' into master/master
Reece R. Pollack [Mon, 22 Dec 2014 23:33:46 +0000 (18:33 -0500)]
Merge branch 'master/rebuild/24-drivers-net' into master/master

6 years agoMerge branch 'master/rebuild/20-firmware' into master/master
Reece R. Pollack [Mon, 22 Dec 2014 23:33:43 +0000 (18:33 -0500)]
Merge branch 'master/rebuild/20-firmware' into master/master

6 years agonet: keystone: Update NetCP PA2 PDSP constants for 3.0.1.2 firmware
Reece R. Pollack [Mon, 22 Dec 2014 23:27:15 +0000 (18:27 -0500)]
net: keystone: Update NetCP PA2 PDSP constants for 3.0.1.2 firmware

This patch updates NetCP v2 PA PDSP constants used by the 3.0.1.2 firmware
committed in a separate patch.

Signed-off-by: Reece R. Pollack <x0183204@ti.com>
6 years agofirmware: keystone: Update NetCP PDSP firmware to 3.0.1.2
Reece R. Pollack [Mon, 22 Dec 2014 23:29:16 +0000 (18:29 -0500)]
firmware: keystone: Update NetCP PDSP firmware to 3.0.1.2

This patch updates the NetCP PDSP firmware to rev 3.0.1.2. It
requires a companion patch to update the PA2 PDSP constants.

Signed-off-by: Reece R. Pollack <x0183204@ti.com>
6 years agoMerge branch 'master/rebuild/24-drivers-net' into master/master
Reece R. Pollack [Thu, 18 Dec 2014 20:24:44 +0000 (15:24 -0500)]
Merge branch 'master/rebuild/24-drivers-net' into master/master

6 years agoMerge branch 'rebuild/15-keystone-devicetree'
WingMan Kwok [Thu, 18 Dec 2014 19:45:12 +0000 (14:45 -0500)]
Merge branch 'rebuild/15-keystone-devicetree'

6 years agoMerge branch 'rebuild/13-keystone-defconfig'
WingMan Kwok [Thu, 18 Dec 2014 19:45:05 +0000 (14:45 -0500)]
Merge branch 'rebuild/13-keystone-defconfig'

6 years agoMerge branch 'rebuild/31-drivers-usb'
WingMan Kwok [Thu, 18 Dec 2014 19:44:55 +0000 (14:44 -0500)]
Merge branch 'rebuild/31-drivers-usb'

6 years agokeystone: dts: add bindings for second usb controller on K2E
WingMan Kwok [Mon, 15 Dec 2014 20:19:48 +0000 (15:19 -0500)]
keystone: dts: add bindings for second usb controller on K2E

Since the USB connector for USB1 on K2E EVM is an USB
3.0 micro AB connector, adapter is needed for using it
in host mode.  Hence the devicetree bindings for USB1
is disabled by default.

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
6 years agokeystone: dts: add bindings for dwc3 core driver and phy driver
WingMan Kwok [Mon, 15 Dec 2014 20:46:06 +0000 (15:46 -0500)]
keystone: dts: add bindings for dwc3 core driver and phy driver

This binding is applicable to K2HK, K2L and K2E since each
platform has at least one usb host controller.

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
6 years agonet: keystone: Update K2 NetCP PA PDSP constants for 3.0.1.1 firmware
Reece R. Pollack [Thu, 18 Dec 2014 19:03:18 +0000 (14:03 -0500)]
net: keystone: Update K2 NetCP PA PDSP constants for 3.0.1.1 firmware

A related commit updated the K2 NetCP PA PDSP firmware to 3.0.1.1, but
the constant values were not updated to match. This patch updates those
constants.

Signed-off-by: Reece R. Pollack <x0183204@ti.com>
6 years agoARM: keystone2: enable usb phy driver by default
WingMan Kwok [Fri, 12 Dec 2014 22:09:06 +0000 (17:09 -0500)]
ARM: keystone2: enable usb phy driver by default

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
6 years agousb: keystone: dts instantiation of platform specific phy and dwc3 core drivers
WingMan Kwok [Mon, 15 Dec 2014 19:39:30 +0000 (14:39 -0500)]
usb: keystone: dts instantiation of platform specific phy and dwc3 core drivers

Current implementation registers and starts the generic
nop phy driver and dwc3 core driver from within the
dwc3 keystone specific glue driver.  This is not scalable
in the sense that supporting more than one usb controller
would be difficult.  This patch adds a keystone specific
phy driver.  Both of this phy driver and the dwc3 core driver
are instantiated through devicetree bindings.  This
approach makes it easier to implement the support of more
than one USB controller.

This is is the same approach taken in the upstreamed version
of the keystone usb driver.  The upstreamed version cannot be
backported cleanly due to API changes between kernel versions.

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
6 years agousb: keystone: handle irq directly instead of through irq-chip
WingMan Kwok [Mon, 15 Dec 2014 19:20:50 +0000 (14:20 -0500)]
usb: keystone: handle irq directly instead of through irq-chip

Currently the usb irq is handled through the implementation of
an irq-chip.  But since the irq is solely for usb, there is no
need to handle the irq through such an indirect route.  This patch
removes the irq-chip implementation and allow the driver handles
irq directly.  Direct handling should improve the performance
and have cleaner usb driver code.

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
6 years agousb: dwc3: revert back to original version
WingMan Kwok [Sat, 13 Dec 2014 11:08:02 +0000 (06:08 -0500)]
usb: dwc3: revert back to original version

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
6 years agoxhci: remove compile warning
WingMan Kwok [Fri, 5 Dec 2014 15:45:58 +0000 (10:45 -0500)]
xhci: remove compile warning

This patch removes the following compile warning
when CONFIG_USB_DEFAULT_PERSIST is defined.

drivers/usb/host/xhci.c: In function 'xhci_free_dev':
drivers/usb/host/xhci.c:3506:17: warning: unused variable 'dev' [-Wunused-variable]
drivers/usb/host/xhci.c: In function 'xhci_alloc_dev':
drivers/usb/host/xhci.c:3592:17: warning: unused variable 'dev' [-Wunused-variable]

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
6 years agoxhci: remove compile warning
WingMan Kwok [Fri, 5 Dec 2014 15:45:58 +0000 (10:45 -0500)]
xhci: remove compile warning

This patch removes the following compile warning
when CONFIG_USB_DEFAULT_PERSIST is defined.

drivers/usb/host/xhci.c: In function 'xhci_free_dev':
drivers/usb/host/xhci.c:3506:17: warning: unused variable 'dev' [-Wunused-variable]
drivers/usb/host/xhci.c: In function 'xhci_alloc_dev':
drivers/usb/host/xhci.c:3592:17: warning: unused variable 'dev' [-Wunused-variable]

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
6 years agoMerge branch 'v3.10.61/rebuild/34-drivers-crypto' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 17:00:36 +0000 (12:00 -0500)]
Merge branch 'v3.10.61/rebuild/34-drivers-crypto' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/33-drivers-pcie' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 17:00:32 +0000 (12:00 -0500)]
Merge branch 'v3.10.61/rebuild/33-drivers-pcie' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/32-drivers-rpmsg' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 17:00:26 +0000 (12:00 -0500)]
Merge branch 'v3.10.61/rebuild/32-drivers-rpmsg' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/31-drivers-usb' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 17:00:19 +0000 (12:00 -0500)]
Merge branch 'v3.10.61/rebuild/31-drivers-usb' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/30-drivers-uio' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:59:55 +0000 (11:59 -0500)]
Merge branch 'v3.10.61/rebuild/30-drivers-uio' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/29-drivers-rproc' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:59:45 +0000 (11:59 -0500)]
Merge branch 'v3.10.61/rebuild/29-drivers-rproc' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/28-drivers-mtd' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:59:32 +0000 (11:59 -0500)]
Merge branch 'v3.10.61/rebuild/28-drivers-mtd' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/27-drivers-common-clk' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:59:01 +0000 (11:59 -0500)]
Merge branch 'v3.10.61/rebuild/27-drivers-common-clk' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/26-drivers-misc' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:58:52 +0000 (11:58 -0500)]
Merge branch 'v3.10.61/rebuild/26-drivers-misc' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/24-drivers-net' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:58:22 +0000 (11:58 -0500)]
Merge branch 'v3.10.61/rebuild/24-drivers-net' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/23-drivers-dmaengine' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:58:00 +0000 (11:58 -0500)]
Merge branch 'v3.10.61/rebuild/23-drivers-dmaengine' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/22-drivers-hwqueue' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:57:53 +0000 (11:57 -0500)]
Merge branch 'v3.10.61/rebuild/22-drivers-hwqueue' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/21-drivers-virtio' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:57:07 +0000 (11:57 -0500)]
Merge branch 'v3.10.61/rebuild/21-drivers-virtio' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/20-firmware' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:56:55 +0000 (11:56 -0500)]
Merge branch 'v3.10.61/rebuild/20-firmware' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/15-keystone-devicetree' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:56:37 +0000 (11:56 -0500)]
Merge branch 'v3.10.61/rebuild/15-keystone-devicetree' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/13-keystone-defconfig' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:56:28 +0000 (11:56 -0500)]
Merge branch 'v3.10.61/rebuild/13-keystone-defconfig' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/12-keystone-machine' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:56:05 +0000 (11:56 -0500)]
Merge branch 'v3.10.61/rebuild/12-keystone-machine' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/11-keystone-misc' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:55:55 +0000 (11:55 -0500)]
Merge branch 'v3.10.61/rebuild/11-keystone-misc' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/10-keystone-lpae' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:55:45 +0000 (11:55 -0500)]
Merge branch 'v3.10.61/rebuild/10-keystone-lpae' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/05-davinci-common-clk' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:55:35 +0000 (11:55 -0500)]
Merge branch 'v3.10.61/rebuild/05-davinci-common-clk' into v3.10.61/master

6 years agoMerge branch 'v3.10.61/rebuild/02-no-upstream' into v3.10.61/master
Murali Karicheri [Wed, 3 Dec 2014 16:55:25 +0000 (11:55 -0500)]
Merge branch 'v3.10.61/rebuild/02-no-upstream' into v3.10.61/master

6 years agocrypto: keystone: Fix size argument being passed to find_first_free_zero_bit()
Tinku Mannan [Thu, 20 Nov 2014 19:16:00 +0000 (14:16 -0500)]
crypto: keystone: Fix size argument being passed to find_first_free_zero_bit()

find_first_zero_bit() second argument expects the size in amount of bits (512),
but sizeof() is passed so it is passing the number of bytes, causing SA
sideband contexts >64 to be dropped.  The patch changes the second argument to
pass in the number of bits.

Signed-off-by: Tinku Mannan <tmannan@ti.com>