summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2013-11-03Merge tag 'v3.10' into sdk-kernel-3.10Scott Wood
git rebase --continue Linux 3.10 Conflicts: Documentation/virtual/kvm/api.txt arch/ia64/kvm/Makefile arch/powerpc/Kconfig arch/powerpc/Makefile arch/powerpc/boot/dts/b4420qds.dts arch/powerpc/boot/dts/b4860qds.dts arch/powerpc/boot/dts/b4qds.dts arch/powerpc/boot/dts/fsl/b4420si-post.dtsi arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi arch/powerpc/boot/dts/fsl/b4860si-post.dtsi arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi arch/powerpc/boot/dts/fsl/b4si-post.dtsi arch/powerpc/boot/dts/fsl/p1010si-post.dtsi arch/powerpc/boot/dts/fsl/p2041si-post.dtsi arch/powerpc/boot/dts/fsl/p3041si-post.dtsi arch/powerpc/boot/dts/fsl/p4080si-post.dtsi arch/powerpc/boot/dts/fsl/p5020si-post.dtsi arch/powerpc/boot/dts/fsl/p5040si-post.dtsi arch/powerpc/boot/dts/fsl/qonverge-usb2-dr-0.dtsi arch/powerpc/boot/dts/fsl/qoriq-sec5.0-0.dtsi arch/powerpc/boot/dts/fsl/t4240si-post.dtsi arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi arch/powerpc/boot/dts/p1025rdb_36b.dts arch/powerpc/boot/dts/t4240qds.dts arch/powerpc/configs/corenet64_smp_defconfig arch/powerpc/configs/mpc85xx_defconfig arch/powerpc/configs/mpc85xx_smp_defconfig arch/powerpc/include/asm/cputable.h arch/powerpc/include/asm/kvm_host.h arch/powerpc/include/asm/kvm_ppc.h arch/powerpc/include/asm/machdep.h arch/powerpc/include/uapi/asm/kvm.h arch/powerpc/kernel/cpu_setup_fsl_booke.S arch/powerpc/kernel/cputable.c arch/powerpc/kernel/idle.c arch/powerpc/kernel/pci-common.c arch/powerpc/kvm/Kconfig arch/powerpc/kvm/book3s.c arch/powerpc/kvm/booke.c arch/powerpc/kvm/e500.c arch/powerpc/kvm/e500_mmu.c arch/powerpc/kvm/e500_mmu_host.c arch/powerpc/kvm/e500mc.c arch/powerpc/kvm/emulate.c arch/powerpc/kvm/irq.h arch/powerpc/kvm/mpic.c arch/powerpc/kvm/powerpc.c arch/powerpc/mm/tlb_nohash.c arch/powerpc/platforms/85xx/Kconfig arch/powerpc/platforms/85xx/b4_qds.c arch/powerpc/platforms/85xx/t4240_qds.c arch/powerpc/platforms/pseries/smp.c arch/powerpc/sysdev/fsl_85xx_l2ctlr.c arch/powerpc/sysdev/fsl_msi.c arch/powerpc/sysdev/fsl_pci.c arch/powerpc/sysdev/fsl_pci.h arch/powerpc/sysdev/mpic.c arch/x86/kvm/Makefile arch/x86/kvm/x86.c drivers/Kconfig drivers/clk/Kconfig drivers/cpufreq/Makefile drivers/crypto/caam/caamalg.c drivers/crypto/caam/intern.h drivers/crypto/caam/jr.c drivers/crypto/caam/regs.h drivers/infiniband/ulp/ipoib/ipoib_ethtool.c drivers/iommu/Makefile drivers/iommu/amd_iommu.c drivers/iommu/exynos-iommu.c drivers/iommu/intel-iommu.c drivers/iommu/iommu.c drivers/iommu/msm_iommu.c drivers/iommu/omap-iommu.c drivers/iommu/tegra-gart.c drivers/iommu/tegra-smmu.c drivers/misc/Makefile drivers/mmc/card/block.c drivers/mmc/card/queue.c drivers/mmc/core/core.c drivers/mtd/nand/fsl_ifc_nand.c drivers/net/ethernet/3com/3c501.c drivers/net/ethernet/8390/3c503.c drivers/net/ethernet/dec/ewrk3.c drivers/net/ethernet/freescale/fec.c drivers/net/ethernet/freescale/gianfar.c drivers/net/ethernet/freescale/gianfar.h drivers/net/ethernet/i825xx/3c505.c drivers/net/ethernet/i825xx/3c507.c drivers/rtc/rtc-ds3232.c drivers/s390/net/qeth_core_main.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/ccg/u_ether.c drivers/usb/gadget/fsl_udc_core.c drivers/usb/otg/fsl_otg.c drivers/vfio/vfio.c drivers/watchdog/Kconfig include/linux/iommu.h include/linux/kvm_host.h include/linux/mmc/sdhci.h include/linux/msi.h include/linux/netdev_features.h include/linux/pci.h include/linux/skbuff.h include/net/ip6_route.h include/net/sch_generic.h include/net/xfrm.h include/uapi/linux/kvm.h net/core/netpoll.c virt/kvm/irqchip.c virt/kvm/kvm_main.c
2013-10-29Revert to 3.8 (no rt, no stable)Scott Wood
This is a merge from rtmerge, which has been similarly reverted. Conflicts: drivers/crypto/caam/caamalg.c drivers/misc/Makefile
2013-10-29Revert to v3.8 (no RT, no stable)Scott Wood
2013-10-28fmd: add fman-mac registers representation inside the sysfsMandy Lavi
Added the following new sysfs files: /sys/devices/fsl,dpaa.*/ethernet.*/net/fm*-gb*/mac_regs Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Change-Id: If77c82b42d925529ae7eb81b75d51debfa8253e0 Reviewed-on: http://git.am.freescale.net:8181/5844 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com> Reviewed-by: Thomas Trefny <Tom.Trefny@freescale.com>
2013-10-28Patch to enable ASF by default using delta defconfig.Rajan Gupta
This patch enables ASF using delta defconfig and removes default setting from Kconfig. Signed-off-by: Nikhil Agarwal <nikhil.agarwal@freescale.com> Change-Id: I73199e7fe53ce3b04c14354187777113f0ec5510 Reviewed-on: http://git.am.freescale.net:8181/5970 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Gupta Rajan-B15745 <rajan.gupta@freescale.com> Reviewed-by: Thomas Trefny <Tom.Trefny@freescale.com>
2013-10-28fmd: add fman registers representation inside the sysfsMandy Lavi
Added the following new sysfs files: *.fman/*.port/fm_port_regs *.fman/*.port/fm_port_bmi_regs *.fman/*.port/fm_port_qmi_regs *.fman/fm_regs *.fman/fm_ctrl_code_ver *.fman/fm_muram_free_size *.fman/fm_plcr_regs *.fman/fm_kg_pe_regs *.fman/fm_kg_regs *.fman/cls_plans/cls_plan_* *.fman/schemes/scheme_* *.fman/profiles/profile_* *.fman/fm_prs_regs *.fman/fm_fpm_regs *.fman/tnums_dbg/tnum_dbg_* Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Change-Id: If625ef3550bf66da5fb6fb282975a70df78438b1 Reviewed-on: http://git.am.freescale.net:8181/5843 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com> Reviewed-by: Thomas Trefny <Tom.Trefny@freescale.com>
2013-10-24Prevent kernel panic if USDPAA mem cannot be allocatedRoy Pledge
USDPAA DMA memory is allocated very early in the boot process using the memblock_alloc functions. The old function would call panic() in cases that the allocation would fail, but no indication would be given on the console since the drivers were not loaded yet. This patch changes the function called so that the panic will not occur and debug info can be seen in the boot log Signed-off-by: Roy Pledge <Roy.Pledge@freescale.com> Change-Id: I8ebe9eb826973ea8ef6d16ba6fc73512b779ab77 Reviewed-on: http://git.am.freescale.net:8181/5953 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Haiying Wang <Haiying.Wang@freescale.com> Reviewed-by: Thorpe Geoff-R01361 <Geoff.Thorpe@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-24iommu/fsl: Allocate a default DMA window for a device once it's detachedVarun Sethi
from a domain. This allows the device to be assigned back to the host, once a guest VM exits. Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com> Change-Id: I211b4452d2f7fce572ed8828a1fc5457d7f3b0e5 Reviewed-on: http://git.am.freescale.net:8181/5869 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Bhushan Bharat-R65777 <Bharat.Bhushan@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-24iommu/fsl: Store the domain information for PCI device in itsVarun Sethi
corresponding device structure. Earlier we were using the PCI controller structure to store the domain information. Move this information to the PCI device. Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com> Change-Id: If8663c37babfab800676ffa79c5bad9c2ba70033 Reviewed-on: http://git.am.freescale.net:8181/5868 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Bhushan Bharat-R65777 <Bharat.Bhushan@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-24fsl_qman: set and update stashing in pamu when pamu is availableHaiying Wang
For the SoC without PAMU, we need to restrict the iommu domain apis under the condition of CONFIG_FSL_PAMU, then avoid to update the pamu stash setting for migrating portal when iommu_domain is not available. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Change-Id: Iaa826e8f3a0173ba7d5c8781964a0aa7d0cc3657 Reviewed-on: http://git.am.freescale.net:8181/5954 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Thorpe Geoff-R01361 <Geoff.Thorpe@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-22dpaa_eth: Offline port queues initializationBogdan Purcareata
Add an optional .dts parameter to the Offline Port node, that would specify a set of TX queues. The Offline Port probe routine will take care of creating those queues. This makes the Offline Port an independent structure with respect to its TX queues creation. Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com> Change-Id: I8f1c045285b373360355b9462c502ce0e745fce9 Reviewed-on: http://git.am.freescale.net:8181/5204 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Cristian-Constantin Sovaiala <Cristian.Sovaiala@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-22mmc:core: Avoid useless detecting task when card is busyHaijun Zhang
When card is in cpu polling mode to detect card present. Card detecting task will be scheduled about once every second. When card is busy in large file transfer, detecting task will be hang and call trace will be prompt. When handling the request, CMD13 is always followed by every command when it was complete. So assume that card is present to avoid this duplicate detecting. Only polling card when card is free to reduce conflict with data transfer. <7>mmc0: req done (CMD13): 0: 00000e00 00000000 00000000 00000000 INFO: task kworker/u:1:12 blocked for more than 120 seconds. "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. kworker/u:1 D 00000000 0 12 2 0x00000000 Call Trace: [ee06dd50] [44042028] 0x44042028 (unreliable) [ee06de10] [c0007a0c] __switch_to+0xa0/0xf0 [ee06de30] [c04dd50c] __schedule+0x1f8/0x4a4 [ee06dea0] [c04dd898] schedule+0x30/0xbc [ee06deb0] [c03816a4] __mmc_claim_host+0x98/0x19c [ee06df00] [c0385f88] mmc_sd_detect+0x38/0xc0 [ee06df10] [c0382b0c] mmc_rescan+0x294/0x2e0 [ee06df40] [c00661cc] process_one_work+0x140/0x3e0 [ee06df70] [c0066bf8] worker_thread+0x18c/0x36c [ee06dfb0] [c006bf10] kthread+0x7c/0x80 [ee06dff0] [c000de58] kernel_thread+0x4c/0x68 <7>sdhci [sdhci_irq()]: *** mmc0 got interrupt: 0x00000001 Signed-off-by: Haijun Zhang <haijun.zhang@freescale.com> Change-Id: I267ac6597a647dad58fea76d695a6ee92e520c78 Reviewed-on: http://git.am.freescale.net:8181/4356 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Xie Xiaobo-R63061 <X.Xie@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-22Powerpc/eSDCH: Specify voltage for T4240QDSHaijun Zhang
Freescale T4240QDS reference board has extra voltage shifters added to allow 3.3V operation, so add 3.3v voltage support for T4240QDS. 1.8v and 3.3v is recommand for eMMC and SDHC card. Signed-off-by: Haijun Zhang <haijun.zhang@freescale.com> Change-Id: I3cd97a087535406ac4db4e30dc6169ab024d20bf Reviewed-on: http://git.am.freescale.net:8181/4824 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Xie Xiaobo-R63061 <X.Xie@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-22fsl_qman: add APIs to set CQ CR/ER eligibility within the channelHaiying Wang
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Change-Id: I1ba0d8eb5f0a5c4b1b7156e2556253b916d351e9 Reviewed-on: http://git.am.freescale.net:8181/5871 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Thorpe Geoff-R01361 <Geoff.Thorpe@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-21dpaa_eth: TX csum computation refactoringBogdan Purcareata
Automatically set DTC bit in fd.cmd for all traffic originating from macless interfaces. Update dpa_shared_tx code to bypass calling dpa_enable_tx_csum when priv->mac_dev == NULL. Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com> Change-Id: I66c6662559c3c560cba1b55ab082f8390a30988d Reviewed-on: http://git.am.freescale.net:8181/5205 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Bucur Madalin-Cristian-B32716 <madalin.bucur@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-21fsl_qbman: Fix warnings when !HOTPLUG_CPUEmil Medve
drivers/staging/fsl_qbman/bman_driver.c:304:13: warning: ‘bman_online_cpu’ defined but not used [-Wunused-function] static void bman_online_cpu(unsigned int cpu) ^ drivers/staging/fsl_qbman/qman_driver.c:645:13: warning: ‘qman_online_cpu’ defined but not used [-Wunused-function] static void qman_online_cpu(unsigned int cpu) ^ Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com> Change-Id: I8b9bb2cc21d46b38d605470e091ddf55ca86c534 Reviewed-on: http://git.am.freescale.net:8181/5840 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Thorpe Geoff-R01361 <Geoff.Thorpe@freescale.com> Reviewed-by: Haiying Wang <Haiying.Wang@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-18mpc85xx: Add Freescale data collection module driverTang Yuantian
Add the Data Collection Module(DCM) support which is used to monitor power consumption of the board. Usage: 1. start data colloection: echo 0 > /sys/devices/platform/fsl-dcm.0/control 2. stop data collection: echo 1 > /sys/devices/platform/fsl-dcm.0/control 3. display the result: cat /sys/devices/platform/fsl-dcm.0/result Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com> Change-Id: Iff738d7ad55e3467e0b470da8b464467fa58645a Reviewed-on: http://git.am.freescale.net:8181/4784 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Hongtao Jia <hongtao.jia@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-17dpaa_eth: Add pool channel in each affined portal's SDQCRCristian Sovaiala
There might be CPUs which are not enabled at boottime, therefore the pool channel is not currently set to the SDQCR of the affined portals of those CPUs. This means that the portals affined to the offline CPUs and which are migrated to the boot CPU, will not issue interrupts to the boot CPU in first instance and to the affined CPU (when this comes online) in the second instance. Therefore we set the pool channel to the SDQCR of each affined portal. Signed-off-by: Cristian Sovaiala <cristian.sovaiala@freescale.com> Change-Id: I63f5649e0c2169617dff991f08dd872a435578a8 Reviewed-on: http://git.am.freescale.net:8181/5629 Reviewed-by: Bucur Madalin-Cristian-B32716 <madalin.bucur@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Ruxandra Ioana Radulescu <ruxandra.radulescu@freescale.com> Reviewed-by: Bogdan Hamciuc <bogdan.hamciuc@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-17fsl_qman: confirm num_ceetms in qman_initHaiying Wang
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Change-Id: Ieff662d29203e37813ba9553e750e2777fc25591 Reviewed-on: http://git.am.freescale.net:8181/5631 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Thorpe Geoff-R01361 <Geoff.Thorpe@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-17fsl_qbman: use pointer type for affine_portalsHaiying Wang
Those pointers don't need to be converted to a "numerical" form Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Change-Id: Ic6ee5d3e20ae6134bbb571a832938996b3a023e7 Reviewed-on: http://git.am.freescale.net:8181/5633 Reviewed-by: Ladouceur Jeffrey-R11498 <Jeffrey.Ladouceur@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Thorpe Geoff-R01361 <Geoff.Thorpe@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-17fsl_qman: fix two compilation warningsHaiying Wang
drivers/staging/fsl_qbman/qman_high.c: In function 'qman_shutdown_fq': drivers/staging/fsl_qbman/qman_high.c:4834:1: warning: control reaches end of non-void function [-Wreturn-type] drivers/staging/fsl_qbman/fsl_usdpaa.c: In function 'dump_frags': drivers/staging/fsl_qbman/fsl_usdpaa.c:230:3: warning: format '%llx' expects argument of type 'long long unsigned int', but argument 4 has type 'long unsigned int' [-Wformat] Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Change-Id: Ia61d1b303f033b777658131e517f5f10b16bf6b0 Reviewed-on: http://git.am.freescale.net:8181/5632 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Thorpe Geoff-R01361 <Geoff.Thorpe@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-17hwmon: (ina2xx) Add device tree support to pass the shunt resistorTang Yuantian
Adding another way that is device tree to pass the shunt resistor value to driver except for platform data. Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com> [Guenter Roeck: Added missing of.h include] Signed-off-by: Guenter Roeck <linux@roeck-us.net> Change-Id: I6596e57de7e9021a19d16e6060c3c78f83cc81c3 Reviewed-on: http://git.am.freescale.net:8181/4786 Reviewed-by: Hongtao Jia <hongtao.jia@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-12fsl_qman: add cpu hotplug supportHaiying Wang
- Initialize all the portals at the boot time based cpu_possible_mask. Migrate the portals on offline cpus to bootcpu when there is less cpu online at boot time. - Register cpu hotplug notifier to migrate the portals to boot cpu when cpus are offlined, and migrate the portal back to original cpu when cpu is onlined. - Re-direct irq and sdest of the portal in the migrate function. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Change-Id: Ica4d1b2b0fd3c3ae5e043663febd9f4cb7c762cf Reviewed-on: http://git.am.freescale.net:8181/5452 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Ladouceur Jeffrey-R11498 <Jeffrey.Ladouceur@freescale.com> Reviewed-by: Thorpe Geoff-R01361 <Geoff.Thorpe@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-12fsl_qman: extend some QMan APIs with portal parameterHaiying Wang
Some APIs might be called in a migration situation(e.g. cpu hotplug), and they may need to continue accessing the portal that execution was affine to prior to migration, we exend those APIs with qman_p_***. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Change-Id: I9b1422d1dfbd59561e3bf072af5c009047e4f47b Reviewed-on: http://git.am.freescale.net:8181/5451 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Thorpe Geoff-R01361 <Geoff.Thorpe@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-11fsl_bman: add cpu hotplug supportHaiying Wang
- Initialize all the portals at the boot time based cpu_possible_mask. Migrate the portals on offline cpus to bootcpu when there is less cpu online at boot time. - Register cpu hotplug notifier to migrate the portals to boot cpu when cpus are offlined, and migrate the portal back to original cpu when cpu is onlined. - Re-direct irq of the portal in the migrate function. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Change-Id: I863d5c15c7f35f9de4ea3d985e4ff467167924b7 Reviewed-on: http://git.am.freescale.net:8181/5453 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Ladouceur Jeffrey-R11498 <Jeffrey.Ladouceur@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-09Fix 2 errors in USDPAA cleanup processingRoy Pledge
The USPDAA cleanup processing wasn't properly merging DMA memory fragments. Also if a new portal needed to be allocated for Frame Queue cleanup it wasn't properly assigned to the array of cleanup portals Signed-off-by: Roy Pledge <Roy.Pledge@freescale.com> Change-Id: I616d4bdbf1dd356267231e6b642cce112487ed1b Reviewed-on: http://git.am.freescale.net:8181/5140 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Vakul Garg <vakul@freescale.com> Reviewed-by: Wang Haiying-R54964 <Haiying.Wang@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-08driver/mtd/ifc: Read Status while programming NAND flashPrabhakar Kushwaha
as per controller description, "While programming a NAND flash, status read should never skipped. Because it may happen that a new command is issued to the NAND Flash, even when the device has not yet finished processing the previous request. This may result in unpredictable behaviour." IFC controller never polls for R/B signal after command send. It just return control to software. This behaviour may not occur with NAND flash access. because new commands are sent after polling R/B signal. But it may happen in scenario where GPCM-ASIC and NAND flash device are working simultaneously. Update the controller driver to take care of this requirement Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> Change-Id: Iaac4b1a0b6b3def93a9f7d3e33624a35c10df85f Reviewed-on: http://git.am.freescale.net:8181/5176 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Wood Scott-B07421 <scottwood@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-08dpaa_eth: Fix freeing of global buffer poolIoana Radulescu
In case an error is encountered during probe, don't actually free the structure containing global buffer pool information unless its reference count has reached zero. Signed-off-by: Ioana Radulescu <ruxandra.radulescu@freescale.com> Change-Id: Ica7b995ecf31a878a9e7685ec905119f1c38f17b Reviewed-on: http://git.am.freescale.net:8181/5186 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Bogdan Hamciuc <bogdan.hamciuc@freescale.com> Reviewed-by: Cristian-Constantin Sovaiala <Cristian.Sovaiala@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-08dpa_offload: Fix inconsistent use of case labelsAnca Jeanina FLOAREA
In function set_cnt_classif_node_retrieve_func the switch was made based on enum dpa_stats_classif_node_type but the case values were taken from enum dpa_cls_tbl_type. Fix it by using case values from the correct enum. Signed-off-by: Anca Jeanina FLOAREA <anca.floarea@freescale.com> Change-Id: I041ad4ad56d84d9fd1f8424609c0efbe2da5c726 Reviewed-on: http://git.am.freescale.net:8181/5174 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Aurelian Zanoschi <Aurelian.Zanoschi@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-05fmd: Enforce minimum value for fsl_fm_rx_extra_headroomIoana Radulescu
fsl_fm_rx_extra headroom must have a value of at least 16 bytes. The Kconfig option has this lower limit, but when configuring the parameter through bootargs no check was made. So enforce the lower limit for all input methods, to avoid invalid values. Signed-off-by: Ioana Radulescu <ruxandra.radulescu@freescale.com> Change-Id: Ibf6dfe82d7497745b04eb46e0e7b0a1497c3aa7f Reviewed-on: http://git.am.freescale.net:8181/5172 Reviewed-by: Bogdan Hamciuc <bogdan.hamciuc@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-02Merge branch 'sdk-kernel-3.8'J. German Rivera
2013-10-02Merge branch 'sdk-v1.4.x' into sdk-kernel-3.8J. German Rivera
2013-10-02Merge branch 'b4860rev2' into sdk-v1.4.xJ. German Rivera
2013-10-02dpa_offload: Allow statistics enable on NEXT_TABLE classifier table entriesMarian Chereji
The DPA classifier allowed the user to enable statistics only for "enqueue" and "drop" type table entries. It now allows the user to enable statistics also for the "next_table" type table entries. Change-Id: I9d57af14922170a7554431b7ba5abcaaaeac04ac Signed-off-by: Marian Chereji <marian.chereji@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/5151 Reviewed-by: Floarea Anca Jeanina-B12569 <anca.floarea@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-02dpaa_eth: Enable FMan v3 recycling on S/G driverIoana Radulescu
Make sure the support for buffer recycling on FMan v3 platforms gets selected for the S/G driver as well. Signed-off-by: Ioana Radulescu <ruxandra.radulescu@freescale.com> Change-Id: I39cfaa9482f6204ddc2b788f635de39de6b4c8f3 Reviewed-on: http://git.am.freescale.net:8181/5146 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Bogdan Hamciuc <bogdan.hamciuc@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-02dpa_offload: Fix de-allocation of uninitialized valueAnca Jeanina FLOAREA
The tbl pointer is dereference without it being previously initialized. The code should use variable cnode instead of tbl in case DPA Stats counters of type DPA_STATS_CNT_CLASSIF_NODE is being created. Signed-off-by: Anca Jeanina FLOAREA <anca.floarea@freescale.com> Change-Id: I10f8cd233f850c339e82d44522f2005dfb9ab27f Reviewed-on: http://git.am.freescale.net:8181/5149 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Marian-Cornel Chereji <marian.chereji@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-02dpa_offload: Fix double free pointer issue in DPA multicast componentRadu Bulie
replic_grp_params variable would be freed a second time if the multicast group creation function failed to obtain a group handle from the FMD driver or imported from the user. The patch fixes the issue by freeing the resource, before any checks are performed on the group handle. Signed-off-by: Radu Bulie <radu.bulie@freescale.com> Change-Id: I547b0a2d476e1cd57aa3b561efa9a2cba99b7e3f Reviewed-on: http://git.am.freescale.net:8181/5147 Reviewed-by: Bulie Radu-Andrei-B37577 <Radu.Bulie@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Marian-Cornel Chereji <marian.chereji@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-10-01dpaa_eth: Replace for_each_online_cpu with for_each_possible_cpuCristian Sovaiala
At bootime, we currently initialize a NAPI instance per each online core, per interface. Booting with a subset of cores and bringing up more cores afterwards means that no NAPI instances are created for the newly added cores. Therefore we create a NAPI instance for each possible core in the system such that there will always be <total_no_of_cores> NAPI instances for each interface. This also gurantees that we do enable/disable NAPI on all possible cores at ifconfig up/down thus eliminating the need to keep track of the cores that were online at the previous ifconfig operation. Even though we do create a NAPI instance and enable it for all possible cores (including offline cores), the scheduler ensures that NAPI will not be scheduled on offline cores. Signed-off-by: Cristian Sovaiala <cristian.sovaiala@freescale.com> Change-Id: I666bbb870fb8645495a80343cdbefb047c086f4c Reviewed-on: http://git.am.freescale.net:8181/5118 Reviewed-by: Bogdan Hamciuc <bogdan.hamciuc@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-09-30dpa_offload: Propagate error code when IPSec module fails to recognize ioctl ↵Marian Chereji
command IPSec module used to silently fail when an ioctl command was not recognized. This may cause applications to take inconsistent (uninitialized) data as granted. Signed-off-by: Marian Chereji <marian.chereji@freescale.com> Change-Id: Id2ec3b0894d9d80332c279c976127c1d40345c7e Reviewed-on: http://git.am.freescale.net:8181/5038 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Varvara Andrei-B21317 <andrei.varvara@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-09-30powerpc/fsl-pci: Use the quirk function of fsl_pci.c instead of quirk ↵Chunhe Lan
function of quirks.c In the fsl_pci.c, it has the quirk function: DECLARE_PCI_FIXUP_HEADER and quirk_fsl_pcie_header. But for fixing the following notice information: pci 0000:00:00.0: ignoring class 0x0b2000 (doesn't match header type 01) We use the DECLARE_PCI_FIXUP_EARLY and quirk_fsl_pcie_early instead of DECLARE_PCI_FIXUP_HEADER and quirk_fsl_pcie_header. This patch reverts commit 586c2c9eb2bc5da79d8e093b2b7dd98b5050e094: Remove the DECLARE_PCI_FIXUP_EARLY and quirk_freescale_class function in the quirks.c, because they have the same function as DECLARE_PCI_FIXUP_EARLY and quirk_fsl_pcie_early function in the fsl_pci.c. At the same time, in the fsl_pci.c quirk_fsl_pcie_early function can handle both of the RC devices and EP devices. Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com> Change-Id: Iee569a14eeedd9a09d4511494a59d07b03f63f95 Reviewed-on: http://git.am.freescale.net:8181/4898 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Zang Tiefei-R61911 <tie-fei.zang@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-09-27Merge branch 'sdk-kernel-3.8'J. German Rivera
2013-09-27Merge branch 'sdk-v1.4.x' into sdk-kernel-3.8J. German Rivera
2013-09-27Merge branch 'b4860rev2' into sdk-v1.4.xJ. German Rivera
2013-09-27dpa_offload: Fix static index initialization in DPA ClassifierMarian Chereji
The static indexes used in recursive functions "init_hm_chain" and "remove_hm_chain" were not initialized. Also, "remove_hm_chain" was not decrementing this index as it removed header manipulations. Signed-off-by: Marian Chereji <marian.chereji@freescale.com> Change-Id: I00bd44c00749578a4c785741082e0ad2c1076c27 Reviewed-on: http://git.am.freescale.net:8181/4412 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Bulie Radu-Andrei-B37577 <Radu.Bulie@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-09-27dpa_offload: Improve debug printing in DPA ClassifierMarian Chereji
Signed-off-by: Marian Chereji <marian.chereji@freescale.com> Change-Id: Ibe6ba10afc6447cf284b27cc7e3caed854eab304 Reviewed-on: http://git.am.freescale.net:8181/4413 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Bulie Radu-Andrei-B37577 <Radu.Bulie@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-09-27driver/mtd/IFC: Add support of 8K page size NAND flashPrabhakar Kushwaha
Current IFC driver supports till 4K page size NAND flash. Add support of 8K Page size NAND flash - Add nand_ecclayout for 4 bit & 8 bit ecc - Defines constants - also fix ecc.strength for 8bit ecc of 8K page size NAND Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> Change-Id: I58b7cab3723ea71ffa6c02ab4b3e3f70b3446e3b Reviewed-on: http://git.am.freescale.net:8181/4984 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Wood Scott-B07421 <scottwood@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-09-27SPI:remove depends on CONFIG_EXPERIMENTAL for CONFIG_MTD_M25P80Zhao Qiang
Now MTD_M25P80 doesn't need to depend on EXPERIMENTAL, which limited the use of M25P80 SPI flash. So we remove the unused EXPERIMENTAL to have MTD_M25P80(needed by P1010RDB-PB, etc) work. Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Signed-off-by: Zhao Qiang <B45475@freescale.com> Change-Id: I6559a3992713666635ba6a51c75b24f5e8f50a2b Reviewed-on: http://git.am.freescale.net:8181/4944 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Zang Tiefei-R61911 <tie-fei.zang@freescale.com> Reviewed-by: Hu Mingkai-B21284 <Mingkai.Hu@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-09-27net/phy: update AT803x driver to add support for AT8033Shengzhou Liu
Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Change-Id: I841731e258b147b425aec91224e1fff6ed4d4239 Reviewed-on: http://git.am.freescale.net:8181/4363 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Zang Tiefei-R61911 <tie-fei.zang@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-09-27dpa_offload: Change memory allocation to support 512 countersAnca Jeanina FLOAREA
The driver fails to allocate a huge amount of memory in order to support 512 counters. Fixed it by changing memory allocation from static to dynamic for certain structure members. Counters that do not support the modify action will continue to have the memory allocated static. Change-Id: Ibdf76a9ce9e1a11d590166a2f93bbfd282edbeea Signed-off-by: Anca Jeanina FLOAREA <anca.floarea@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/5009 Reviewed-by: Zanoschi Aurelian-B43522 <Aurelian.Zanoschi@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-09-27dpa_offload: Allow 0xff masks for HASH classifier table entriesMarian Chereji
As key masks are not supported in HASH tables, the DPA Classifier was refusing to add an entry to a HASH table with a key that had any mask (mask pointer not NULL). This was changed so that the DPA Classifier can recognize a 0xff mask all over and ignore it. Any other (more complex) mask will still be refused. Change-Id: I0732d873fa5d10def4f2646c2bd248aadcffa736 Signed-off-by: Marian Chereji <marian.chereji@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/4911 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Bulie Radu-Andrei-B37577 <Radu.Bulie@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>