summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-30KVM: PPC: e500mc: Advertise E.PT to support HTW guestsMihai Caraman
Enable E.PT for vcpus with MMU MAV 2.0 to support Hardware Page Tablewalk (HTW) in guests. Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> (cherry picked and merged from sdk1.5 commit 815866e615d1452083c7f379391926aa42eddcf0) Change-Id: Ia73322e2d4eaff2acc62afb6e3b36f27d751dc29 Reviewed-on: http://git.am.freescale.net:8181/11563 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Stuart Yoder <stuart.yoder@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-30KVM: PPC: e500: Fix tlbilx_all emulation for HTWMihai Caraman
tlbilx_all emulation requies HW TLB invalidation for entries added by HTW. Add inval_tlb_on_host() function to do this invalidation and move inval_ea_on_host() to a common place. Add dedicated functions for lpid and pid tlb invalidation refactoring the existing kvmppc_e500_tlbil_all() function. Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> (cherry picked and merged from sdk1.5 commit f9efafeef721d45eb60cdfe45534a788ca55f0bd) Change-Id: I4231ac6ac60927256d1a99084812bf958ac94f71 Reviewed-on: http://git.am.freescale.net:8181/11562 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Stuart Yoder <stuart.yoder@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-30KVM: PPC: e500: TLB emulation for IND entriesMihai Caraman
Handle indirect entries (IND) in TLB emulation code. Translation size of IND entries differ from the size of referred Page Tables (Linux guests now use IND of 2MB for 4KB PTs) and this require careful tweak of the existing logic. TLB search emulation requires additional search in HW TLB0 (since these entries are directly added by HTW) and found entries shoud be presented to the guest with RPN changed from PFN to GFN. There might be more GFNs pointing to the same PFN so the only way to get the corresponding GFN is to search it in guest's PTE. If IND entry for the corresponding PT is not available just invalidate guest's ea and report a tlbsx miss. This patch only implements the invalidation and let a TODO note for searching HW TLB0. Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> (cherry picked and merged from sdk1.5 commit fa267bdd889348c8f7f1ebd0f72173ad5c780abc) Change-Id: Ibb3910c44a5413aa0b2ace0c858f46643c0dfa8d Reviewed-on: http://git.am.freescale.net:8181/11561 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Stuart Yoder <stuart.yoder@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-30KVM: PPC: Book3E: Handle LRAT error exceptionMihai Caraman
Handle LRAT error exception with support for lrat mapping/invalidation and prepare for emulation. Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> (cherry picked and merged from sdk1.5 commit fd2bba8b66657eb452c152d6cf0b1cd4320df204) Change-Id: Ifa9a9ce3a9aacab53f6184b2aff00edde1acf47d Reviewed-on: http://git.am.freescale.net:8181/11560 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Stuart Yoder <stuart.yoder@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-30powerpc/booke3e: Move tlb lock/unlock functionsMihai Caraman
Move book3e_tlb_lock/unlock functions from hugetlbpages to mm to be used from other kernel places. Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> (cherry picked and merged from sdk1.5 commit c84bbd80aebb40de4fcc7894759dfff8857d405c) Change-Id: I89239824880e81c8257fe612cad903eebbb5adbe Reviewed-on: http://git.am.freescale.net:8181/11559 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Stuart Yoder <stuart.yoder@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-30powerpc/booke64: Add LRAT next and max entries to tlb_per_core structureMihai Caraman
LRAT (Logical to Real Address Translation) is shared between hw threads. Add LRAT next and max entries to tlb_per_core data structure and initialize them. Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> (cherry picked and merged from sdk1.5 commit aa10cefcc1588338b3a80e842bc4db351dcec176) Change-Id: If229acd9f4ae28fb49ce42132831d720bd436b84 Reviewed-on: http://git.am.freescale.net:8181/11558 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Stuart Yoder <stuart.yoder@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-30powerpc/booke64: Add LRAT error exception handlerMihai Caraman
Add LRAT (Logical to Real Address Translation) error exception handler to Book3E 64-bit kernel. Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> (cherry picked and merged from sdk1.5 commit 70fdc82f73e5330acd9bb978029004c88a754d4e) Change-Id: I0cb34c4b9ebec350ddf46e94876c099c9a8b2c7c Reviewed-on: http://git.am.freescale.net:8181/11557 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Stuart Yoder <stuart.yoder@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-29Revert "Make the diu driver work without board level initialization"Wang Dongsheng
This reverts commit cf42c0223c36e5fc2bc99ac01a7dec2ba5ccfec6. This patch is a old methods, and platform operation shouldn't in driver code. The patch has been replaced by the new patch. And for binding also not need to modify. Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com> Change-Id: I5abf5c05400082b18822bcdd03117b7698ec859c Reviewed-on: http://git.am.freescale.net:8181/11644 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-29powerpc/cpu-hotplug: fix cpu re-online failed issueWang Dongsheng
Errata-A-006568. If SOC-rcpm is V1, we need enable cpu first, T4240rev2 and later Soc has been fixed. But before, this errata is still needed. Tested on P4080ds, T1042rdb_pi, T4240qds, B4860qds. root@p4080ds:/usr/etc# echo 0 > /sys/devices/system/cpu/cpu7/online Cannot set affinity for irq 467 root@p4080ds:/usr/etc# root@p4080ds:/usr/etc# echo 1 > /sys/devices/system/cpu/cpu7/online smp_85xx_kick_cpu: timeout waiting for core 7 to reset smp: failed starting cpu 7 (rc -2) Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com> Signed-off-by: Chenhui Zhao <chenhui.zhao@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/11356 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Yang Li <LeoLi@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com> Change-Id: Ib300dffe28b2436fe44431286ff707124402204d Reviewed-on: http://git.am.freescale.net:8181/11648
2014-04-29fsl/pci: The new pci suspend/resume implementationWang Dongsheng
If we do nothing in suspend/resume, some platform PCIe ip-block can't guarantee the link back to L0 state from sleep, then, when we read the EP device will hang. Only we send pme turnoff message in pci controller suspend, and send pme exit message in resume, the link state will be normal. When we send pme turnoff message in pci controller suspend, the links will into l2/l3 ready, then, host cannot communicate with ep device, but pci-driver will call back EP device to save them state. So we need to change platform_driver->suspend/resume to syscore->suspend/resume. So the new suspend/resume implementation, send pme turnoff message in suspend, and send pme exit message in resume. And add a PME handler, to response PME & message interrupt. Change platform_driver->suspend/resume to syscore->suspend/resume. pci-driver will call back EP device, to save EP state in pci_pm_suspend_noirq, so we need to keep the link, until pci_pm_suspend_noirq finish. Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com> Change-Id: Id82d2e92994e466de1b2a4eb9ecef73c112ec753 Reviewed-on: http://git.am.freescale.net:8181/11538 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Yang Li <LeoLi@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-29p1022/pci: through PIXIS to reset pci slot when DIU enableWang Dongsheng
Add indirect_access_pixis_reset_pcie_slot & direct_access_pixis_reset_pcie_slot into p1022_ds.c. When the DIU enable, we through the way of indirect access to read/write pixis register. Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com> Change-Id: I7ccc3d7db7f45630ce269c0f680eed726b2efd3a Reviewed-on: http://git.am.freescale.net:8181/11537 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Zhengxiong Jin <Jason.Jin@freescale.com> Reviewed-by: Yang Li <LeoLi@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-29mpc85xx/lbc: modify suspend/resume entry sequenceWang Dongsheng
Modify platform driver suspend/resume to syscore suspend/resume. Because p1022ds need to use localbus when entering the PCIE resume. Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/6992 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Tiefei Zang <roy.zang@freescale.com> Reviewed-by: Thomas Trefny <Tom.Trefny@freescale.com> Change-Id: Ib12831f0c7cd935765ec54f7306b8451212a8ecb Reviewed-on: http://git.am.freescale.net:8181/11536 Reviewed-by: Yang Li <LeoLi@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-29fsl/diu: enable diu support for t1042rdb_pi boardWang Dongsheng
This patch add the DIU platform support for T1042RDB board. The hdmi port is verified on the board. Signed-off-by: Jason Jin <Jason.Jin@freescale.com> Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com> Change-Id: I9642fe4112ecc33d89007d80347b40c3d42cc122 Reviewed-on: http://git.am.freescale.net:8181/11535 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-29defconfig: Enabled DIU as default configWang Dongsheng
Now we fix DIU initialization entry, we can add DIU into default config. We need to always enable DIU module. Because u-boot through FPGA startup DIU and kernel also need to handle FPGA in kernel. otherwise system cannot go to deep sleep state. Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/11168 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Yang Li <LeoLi@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com> Change-Id: Ia9195c5185ee130e3105d5146d150eeaf08daef9 Reviewed-on: http://git.am.freescale.net:8181/11533 Reviewed-by: Zhengxiong Jin <Jason.Jin@freescale.com>
2014-04-29powerpc/diu: adjust DIU initialization entryWang Dongsheng
Move fsl_diu_init into diu probe function, because it should be initialized when system get diu device tree node, not always do initialization. Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com> Change-Id: I7666ed0dfe73b65ad98cfba9edea322ceaae4edc Reviewed-on: http://git.am.freescale.net:8181/11532 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-29fmd: Change defintion to reduce memory allocationMandy Lavi
Change-Id: I2e77a6b8038008e66495ccf4e0f66460a19fe148 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/11568 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Nir Erez <nir.erez@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-29fmd: remove resource allocation algorithmMandy Lavi
After the removal of the resource allocation algorithm fmd will use the default configuration of resource allocation which should cover all common cases. Special un-common cases should use the chosen-node mechanism to program the resources differently Change-Id: I5943bc70f790bc3cc331a9cde6569fad6a882c8f Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/11567 Reviewed-by: Nir Erez <nir.erez@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com> Tested-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-29fsl/mpic_timer: make mpic_timer to support deep sleep featureWang Dongsheng
At T104x platfrom the timer clock will be changed from platform_clock to sys_ref_clock when system going to deep sleep. So before system going to deep sleep, we need to change time to adapt to the new frequency that is sys_ref_clock. And after resume from deep sleep, restore the time that based on platform_clock. Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com> Change-Id: I15608aa39df70ab6ca28c8dbed3b0cbf6d71343e Reviewed-on: http://git.am.freescale.net:8181/11531 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Yang Li <LeoLi@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-29fsl/pm: add api to get suspend state which is STANDBY or MEMWang Dongsheng
Add set_pm_suspend_state & pm_suspend_state functions to set/get suspend state. When system going to sleep or deep sleep, devices can get the system suspend state(STANDBY/MEM) through pm_suspend_state function and to handle different situations. Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com> Change-Id: Ibd369079f6f0777854d88d7e1af21f455eaf909e Reviewed-on: http://git.am.freescale.net:8181/11530 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Yang Li <LeoLi@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-29powerpc/deepsleep: set MPIC to the mixed mode to avoid deep sleep issueZhao Chenhui
The deep sleep does not wake consistently on T1040 and T1042 with the external proxy facility mode of MPIC (MPIC_ENABLE_COREINT), so use the mixed mode of MPIC. Set mpic_get_irq() to ppc_md.get_irq to enable the mixed mode. Change-Id: I5eee6a15c845fb994c39d74a4e8140a610caf5f9 Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/11438 Reviewed-by: Yang Li <LeoLi@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-29powerpc/deepsleep: Disable CPC speculation to avoid deep sleep hangChenhui Zhao
Disable CPC speculation to avoid deep sleep hang, especially in secure boot mode. This bit will be cleared automatically when resuming from deep sleep. Change-Id: I2e4debed63eed39fa059c42de5b7f49b5d6c48f3 Signed-off-by: Chenhui Zhao <chenhui.zhao@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/11362 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Dongsheng Wang <dongsheng.wang@freescale.com> Reviewed-by: Yang Li <LeoLi@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-28fsl_dce: add stateful performance testJeffrey Ladouceur
Add test that demonstrates fsl dce stateful performance metrics. This is similar to the stateless test except that multiple chunks are sent on a stream instead on one big chunk. Signed-off-by: Jeffrey Ladouceur <Jeffrey.Ladouceur@freescale.com> Change-Id: I222981506f013febf6ae1f95ba610507c8dd0a49 Reviewed-on: http://git.am.freescale.net:8181/11630 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-28dce: common test code updateJeffrey Ladouceur
Add api to display multi buffer scatter gather data. Distinguish between allocated dce data and amount of data copied to it. Add attribute to gzip request structure to enable adding them to a list. Add request structure to invalidate a stream context record. Signed-off-by: Jeffrey Ladouceur <Jeffrey.Ladouceur@freescale.com> Conflicts: drivers/staging/fsl_dce/tests/common/test_frame_helpers.c Change-Id: I59fa85503f4de953c2b48042942d3670f9e41a17 Reviewed-on: http://git.am.freescale.net:8181/11628 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-28fsl_dce: A apis to dce stream objectJeffrey Ladouceur
Add an API to get the length of the internal objects fifo. Add invalidate stream context record api. Missing flags parameter to process API. Add checking for REV1 limitations. Set default object fifo depth to 256. Add private header file. Signed-off-by: Jeffrey Ladouceur <Jeffrey.Ladouceur@freescale.com> Change-Id: I0149ab9309ad41d920c21192cb9f0aa3bfb9256a Reviewed-on: http://git.am.freescale.net:8181/11626 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-28net/phy: tune get_phy_c45_ids to support more c45 phyShengzhou Liu
As some C45 10G PHYs(e.g. Cortina CS4315/CS4340 PHY) have zero Devices In package, current driver can't get correct devices_in_package value by non-zero Devices In package. so let's probe more with zero Devices In package to support more C45 PHYs which have zero Devices In package. Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Change-Id: I468aa36c18a6cae538a09a7da3347e7584e1a07e Reviewed-on: http://git.am.freescale.net:8181/11387 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Shaohui Xie <Shaohui.Xie@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-26crypto: caam - Fix key inlining in AEAD shared descriptorsVakul Garg
The variable 'keys_fit_inline' is initialised correctly to avoid using its stale value while creating shared descriptor for decryption and given-iv-encryption. Signed-off-by: Vakul Garg <vakul@freescale.com> Change-Id: I4e1482a7c9ea21b02523f90fc9ed68a61817c0be Reviewed-on: http://git.am.freescale.net:8181/11546 Reviewed-by: Horia Ioan Geanta Neag <horia.geanta@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-25Enable magic SysRq key for P1023 family boardsBogdan Purcareata
This enables certain investigation facilities when the system is stuck. The option is present for P4 boards (corenet32_smp_defconfig) and T4 boards (85xx/e6500rev2_defconfig). In particular, LXC containers use it by default. Change-Id: Ie119c16fcf6f5702477b3866b65d5876d17ba5ed Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/11375 Reviewed-by: Mihai Claudiu Caraman <mihai.caraman@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-25Properly align USDPAA DMA memoryRoy Pledge
DMA memory must be aligned to the page boundary when mapped into the processes virtual address space Signed-off-by: Roy Pledge <Roy.Pledge@freescale.com> Change-Id: Ibc6320991d8e5317b8724fc2cfdc23ce47faaaf4 Reviewed-on: http://git.am.freescale.net:8181/11409 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Geoff Thorpe <Geoff.Thorpe@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-25Fix issue where shared mapping was only partialy mappedRoy Pledge
USDPAA DMA memory mappings can consist of multiple segments to avoid power of 4 restrictions imposed by TLB1 hardware. The total size of the mapping must be tracked so that a shared mapping will cover all pages when it is mapped by another process Signed-off-by: Roy Pledge <Roy.Pledge@freescale.com> Change-Id: I9f55f3f876e0ca8fc8aa7eb81ec461414eebea27 Reviewed-on: http://git.am.freescale.net:8181/11408 Reviewed-by: Jeffrey Ladouceur <Jeffrey.Ladouceur@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Geoff Thorpe <Geoff.Thorpe@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-25Allow a shared DMA maps to be mapped into a process many timesRoy Pledge
Add reference counting to the USDPAA DMA mapping logic so that dma_mem_create() can be called multiple times on the same shared region by a process. Signed-off-by: Roy Pledge <Roy.Pledge@freescale.com> Change-Id: I7419fd60b3f823764d367018d08f4e620ae09899 Reviewed-on: http://git.am.freescale.net:8181/11407 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Jeffrey Ladouceur <Jeffrey.Ladouceur@freescale.com> Reviewed-by: Geoff Thorpe <Geoff.Thorpe@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-25dpa_offload: Remove shared interface from T2080RDB DTS fileMarian Chereji
Removed the shared interface from the t2080rdb-usdpaa-shared-interfaces DTS file to align Ethernet interfaces with the other dpaa offloading applications on T2080RDB. Signed-off-by: Marian Chereji <marian.chereji@freescale.com> Change-Id: Ic24a39a8524ffd4485c91feb4760877a440ff803 Reviewed-on: http://git.am.freescale.net:8181/11528 Reviewed-by: Aurelian Zanoschi <Aurelian.Zanoschi@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-25t1040rdb: Add usdpaa device tree and usdpaa sharedSandeep Singh
interface device tree. Signed-off-by: Sandeep Singh <sandeep@freescale.com> Change-Id: I5b1221cc99b58453a053db30647e93b9f16d92f3 Reviewed-on: http://git.am.freescale.net:8181/8997 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Vakul Garg <vakul@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com> (cherry picked from commit 3253b362d4b02d50efa1be47c4402904d44c8a34) Reviewed-on: http://git.am.freescale.net:8181/11210
2014-04-25vfio: Fix dummy-iommu compilationBharat Bhushan
We are getting compilation error because commit id "9a110858ed2e494b8be683c6959113f73685eb1f" converts compund_trans_head() to compound_head() and similar change required in drivers/vfio/vfio_iommu_dummy.c. Signed-off-by: Bharat Bhushan <Bharat.Bhushan@freescale.com> Change-Id: Ie9686ce7ac34b0eb2609b8d9458493815c94e65b Reviewed-on: http://git.am.freescale.net:8181/11276 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Varun Sethi <Varun.Sethi@freescale.com> Reviewed-by: Mihai Claudiu Caraman <mihai.caraman@freescale.com> Reviewed-by: Stuart Yoder <stuart.yoder@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-25testmgr: fix TLS module build errorCristian Stoica
This is a fix specific for sdk-v1.6.x with linux kernel 3.12. reinit_completion does not exist yet - it was introduced shortly after kernel 3.12. Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com> Change-Id: Ic154ed5c64ac9f3c5cfeefd6ff0c180e8b543216 Reviewed-on: http://git.am.freescale.net:8181/11447 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Horia Ioan Geanta Neag <horia.geanta@freescale.com> Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
2014-04-25crypto: caam/qi - remove hardcoded offsets in tls10 encap descriptorTudor Ambarus
The Shared Descriptor's relative offsets vary depending on the keys length. Signed-off-by: Tudor Ambarus <tudor.ambarus@freescale.com> Change-Id: I75ccafa582ec2c20ea2745599ed650adf649ad33 Reviewed-on: http://git.am.freescale.net:8181/11471 Reviewed-by: Horia Ioan Geanta Neag <horia.geanta@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Cristian Stoica <cristian.stoica@freescale.com> Reviewed-by: Mircea Pop <mircea.pop@freescale.com> Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
2014-04-25crypto: caam - remove hardcoded offsets in tls10 encap descriptorTudor Ambarus
The Shared Descriptor's relative offsets vary depending on the keys length. Signed-off-by: Tudor Ambarus <tudor.ambarus@freescale.com> Change-Id: Iaf72d57ceb2c048057ca33a2bb5c9a02ca4680db Reviewed-on: http://git.am.freescale.net:8181/11470 Reviewed-by: Horia Ioan Geanta Neag <horia.geanta@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Cristian Stoica <cristian.stoica@freescale.com> Reviewed-by: Mircea Pop <mircea.pop@freescale.com> Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
2014-04-24fmd: fix pause frame handler for txMarian Rotariu
"Command Config" register for mEMAC gets corrupted being wrongfully initialized with "TX FIFO Sections" register values. Signed-off-by: Marian Rotariu <marian.rotariu@freescale.com> Change-Id: Ifa6c0fe497e45e9864acd3ed9dbae2aa1af45a50 Reviewed-on: http://git.am.freescale.net:8181/11405 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Vakul Garg <vakul@freescale.com> Reviewed-by: Mircea Pop <mircea.pop@freescale.com> Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com> (cherry picked from commit db26a2e672299a318b2b941ad28fddba8c38a747) Reviewed-on: http://git.am.freescale.net:8181/11472 Tested-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
2014-04-24dpaa_eth: Cleaning up port suspend/resume error pathsCristian Sovaiala
Add goto labels and relevant error messages when RX/TX port suspend/resume or set WoL fail. Returning a != 0 value from suspend callback we trigger a rollback of the suspend sequence. In resume callback, in case RX port resume fails we suspend the TX port and keep WoL disabled. Change-Id: I330249c06525785d7045c627dcf218d031028857 Signed-off-by: Cristian Sovaiala <cristian.sovaiala@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/11367 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Bogdan Hamciuc <bogdan.hamciuc@freescale.com> Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com> (cherry picked from commit 56956b78e098c2ae9166bfe93efaaac97758c0cf) Reviewed-on: http://git.am.freescale.net:8181/11437 Tested-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
2014-04-22bonding: make LAG codes to fit different kernelJianhua Xie
Linux kernel API bond_for_each_slave of bonding.h has different params along with different kernel version as below table: Older version: bond_for_each_slave(bond, pos, int cnt), 3.11.0-rc1(dec1e90e8): bond_for_each_slave(bond, pos), 3.12.0-rc1(9caff1e7b): bond_for_each_slave(bond, slave, list_head *iter) This patch is making LAG codes to fit different kernel version. Signed-off-by: Jianhua Xie <jianhua.xie@freescale.com> Change-Id: Ifd365cd232aba67a437b156568d88c6e16c44c1a Reviewed-on: http://git.am.freescale.net:8181/11293 Reviewed-by: Dongsheng Wang <dongsheng.wang@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Jiafei Pan <Jiafei.Pan@freescale.com> Reviewed-by: Scott Wood <scottwood@freescale.com>
2014-04-18fsl_pme: remove incorrect usage of flag to request_irqJeffrey Ladouceur
The hardware doesn't support affinity on individual error interrupts. Therefore it's not possible to remove correctly remove the warning "Cannot set affinity for irq" since this is a reflection of reality. Signed-off-by: Jeffrey Ladouceur <Jeffrey.Ladouceur@freescale.com> Change-Id: Ide2a507c60dc1e6b4be1c5f0aba352a37071ae80 Reviewed-on: http://git.am.freescale.net:8181/#/c/11126/ Reviewed-on: http://git.am.freescale.net:8181/11213 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Scott Wood <scottwood@freescale.com>
2014-04-18fsl_pme: Reduce time taking to enter and exit deepsleepJeffrey Ladouceur
Reduce the number of requests sent the the PME device by bulking many requests into a contiguous frame. Added unmapping of memory. Signed-off-by: Jeffrey Ladouceur <Jeffrey.Ladouceur@freescale.com> Change-Id: Ic15560be5bd7bb3d965a88e5eab0553552f262b5 Reviewed-on: http://git.am.freescale.net:8181/10927 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Geoff Thorpe <Geoff.Thorpe@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/11212 Reviewed-by: Scott Wood <scottwood@freescale.com>
2014-04-18fsl_pme: disable interrupts in suspendJeffrey Ladouceur
In order to enter deepsleep the pme device must clear all pending interrupts. Setting the interrupt inhibit register accomplishes this. On wakeup this register is restored by the original backed up value. Signed-off-by: Jeffrey Ladouceur <Jeffrey.Ladouceur@freescale.com> Change-Id: Id50cbc5376b24de885260cff817e7ce5e304c306 Reviewed-on: http://git.am.freescale.net:8181/10821 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Geoff Thorpe <Geoff.Thorpe@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com> (cherry picked from commit 18de78a95ba92cc561844285eea9534ac061b7f9) Reviewed-on: http://git.am.freescale.net:8181/11211 Reviewed-by: Scott Wood <scottwood@freescale.com>
2014-04-18Merge branch 'master-tmp' into sdk-v1.6.xScott Wood
master-tmp is the master branch as of 8b60f5ea90c49344692a70f62cd4aa349de38b48 with the following commits reverted due to excessive conflicts: commit b35a69559c46e066e6f24bb02d5a6090483786e3 Author: Scott Wood <scottwood@freescale.com> Date: Fri Apr 18 15:27:52 2014 -0500 Revert "net: add sysfs helpers for netdev_adjacent logic" This reverts commit 0be682ca768d671c91cfd1379759efcb3b29102a. commit 1c0dc06e47e11bf758f3e84ea90c2178a31dbf0f Author: Scott Wood <scottwood@freescale.com> Date: Fri Apr 18 15:27:47 2014 -0500 Revert "net: rename sysfs symlinks on device name change" This reverts commit 45ce45c69750b93b8262aa66792185bd49150293. Conflicts: drivers/iommu/fsl_pamu.c drivers/net/bonding/bond_3ad.c drivers/net/bonding/bond_sysfs.c drivers/net/bonding/bonding.h drivers/net/ethernet/freescale/gianfar.c Signed-off-by: Scott Wood <scottwood@freescale.com> Conflicts: drivers/iommu/fsl_pamu.c drivers/net/bonding/bond_3ad.c drivers/net/bonding/bond_sysfs.c drivers/net/bonding/bonding.h drivers/net/ethernet/freescale/gianfar.c
2014-04-18Merge remote-tracking branch 'origin/sdk-kernel-3.12' into sdk-v1.6.xScott Wood
2014-04-18Revert "net: add sysfs helpers for netdev_adjacent logic"Scott Wood
This reverts commit 0be682ca768d671c91cfd1379759efcb3b29102a.
2014-04-18Revert "net: rename sysfs symlinks on device name change"Scott Wood
This reverts commit 45ce45c69750b93b8262aa66792185bd49150293.
2014-04-18iommu/fsl: Work around erratum A-007907Scott Wood
Erratum A-007907 can cause a core hang under certain circumstances. Part of the workaround involves not stashing to L1 Cache. On affected chips, stash to L2 when L1 is requested. Signed-off-by: Scott Wood <scottwood@freescale.com> Change-Id: Ie8b16bf84831aae2b97897e4da91f91e8bdd9868 Reviewed-on: http://git.am.freescale.net:8181/11208 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
2014-04-18fman: don't redefine NO_IRQScott Wood
This triggered a warning on the v3.12 merge. Redefining standard kernel symbols is *wrong*. Don't do it. FWIW, NO_IRQ is deprecated and should not be used at all. Use zero. I tried removing this redefinition entirely, but that caused a build failure. I tried adding an #include of the relevant Linux header from drivers/net/ethernet/freescale/fman/src/inc/types_linux.h which AFAICT is the place for Linux dependencies, but it still wasn't getting included so I gave up and defined it to the same exact thing as Linux. Note that while this warning did not appear on v3.13-rc3 (presumably due to headers being included in different order), there are lots of warnings about "fm_port_suspend missing" both before and after moving to 3.12. Please fix these. Warnings should be treated as errors, not ignored. Signed-off-by: Scott Wood <scottwood@freescale.com> Change-Id: I18e8d71ed8a9494547cb0a2b7dca475deb26c030 Reviewed-on: http://git.am.freescale.net:8181/10770 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Kim Phillips <Kim.Phillips@freescale.com> Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
2014-04-18powerpc/kvm/booke: Fix build break due to stack frame size warningMihai Caraman
Commit ce11e48b7fdd256ec68b932a89b397a790566031 ("KVM: PPC: E500: Add userspace debug stub support") added "struct thread_struct" to the stack of kvmppc_vcpu_run(). thread_struct is 1152 bytes on my build, compared to 48 bytes for the recently-introduced "struct debug_reg". Use the latter instead. This fixes the following error: cc1: warnings being treated as errors arch/powerpc/kvm/booke.c: In function 'kvmppc_vcpu_run': arch/powerpc/kvm/booke.c:760:1: error: the frame size of 1424 bytes is larger than 1024 bytes make[2]: *** [arch/powerpc/kvm/booke.o] Error 1 make[1]: *** [arch/powerpc/kvm] Error 2 make[1]: *** Waiting for unfinished jobs.... Signed-off-by: Scott Wood <scottwood@freescale.com> (cherry picked and merged from upstream commit f5f972102d5c12729f0a35fce266b580aaa03f66) Change-Id: Iaa6996949b07b5f38e9c443071fcb38d71f05a94 Reviewed-on: http://git.am.freescale.net:8181/11191 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
2014-04-18UIO/DMA: Add dma uio private mmap functionLiu Gang
UIO mmap cannot map an unaligned page address, and the PowerPC DMA register space has an unaligned page base address. So the mmap for DMA register address should be supported via a private function. Signed-off-by: Liu Gang <gang.liu@freescale.com> Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com> Change-Id: Ic5672dd4f86031fab34830d47e231fb1c46b2070 Reviewed-on: http://git.am.freescale.net:8181/11081 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Mingkai Hu <Mingkai.Hu@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>