summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-03-23fsl/dpa: fixup to support 2.5G SGMIIShengzhou Liu
- correct the location of disabling auto-neg for 2.5G in SetupSgmiiInternalPhy. - add the missing condition e_ENET_MODE_SGMII_2500 in memac_init_phy. - fix sgmii_2500 to sgmii-2500 to match u-boot. Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Change-Id: I3e3481f1a22e0931acaaaf739dccce944e91e76c Reviewed-on: http://git.am.freescale.net:8181/25752 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-23t1024rdb/dts: add support for 2.5G SGMIIShengzhou Liu
Add 2.5G SGMII support for T1024RDB Rev-B. Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Change-Id: I5e278f2dacde8c27b42c6486808366f8009186a2 Reviewed-on: http://git.am.freescale.net:8181/26736 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Xiaobo Xie <X.Xie@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-23fmd: memac: distinguish TX_FIFO_SECTIONS for t1024Mandy Lavi
t1024 requires for its 10g "best effort" port a different value for TX_FIFO_SECTIONS[TX_AVAIL] than other 10g ports in other devices: 0x60 instead of 0x19 Change-Id: I06fa4166fdff7ef39c02ebe4d97807230ae01f3d Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/31540 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Igal Liberman <Igal.Liberman@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-23fmd: create new config flavor for FManV3LMandy Lavi
CONFIG_FMAN_T4240 was eliminated Instead, there are now two flags representing FmanV3: CONFIG_FMAN_V3H for FmanV3H arch and CONFIG_FMAN_V3L for FmanV3L arch. FmanV3H h/w block is integrated in B4860, B4420, T4240, T4160, T2080 etc FmanV3L h/w block is integrated in T1040, T1024, T1020, T1022 etc defconfig files changes: corenet64_fmanv3_smp_defconfig -> corenet64_fmanv3l_smp_defconfig corenet32_fmanv3_smp_defconfig -> corenet32_fmanv3l_smp_defconfig 85xx/e6500rev2_defconfig -> corenet64_fmanv3h_smp_defconfig Change-Id: I9fcfb454bc3bd2d72c5d55c616400a808e181413 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/30539 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-23dpaa_eth: fix compile error when selecting 1588 configYangbo Lu
Signed-off-by: Yangbo Lu <yangbo.lu@freescale.com> Change-Id: I56995d4297e8b1001dc8089ae650604dea311428 Reviewed-on: http://git.am.freescale.net:8181/32977 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-23dpa_offload: Fix statistics info for multipolicy IPSec outbound SAsMarian Chereji
The dpa_ipsec driver was only providing statistics for the first policy of the outbound SAs. It is now correctly suming up the statistics for all the outbound SA's policies. Signed-off-by: Marian Chereji <marian.chereji@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/28731 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Bogdan Constantin Popescu <bogdan.c.popescu@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com> Change-Id: Ide98e16c6a6c684b6d51fa190388c7a95b1a8490 Reviewed-on: http://git.am.freescale.net:8181/33188
2015-03-20powerpc: Make boot_cpuid common between 32 and 64-bitBenjamin Herrenschmidt
Move the definition to setup-common.c and set the init value to -1 on both 32 and 64-bit (it was 0 on 64-bit). Additionally add a check to prom.c to garantee that the init value has been udpated after the DT scan. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Change-Id: I3aa6499dd65bfa5410d382880ca42f259906cdea Reviewed-on: http://git.am.freescale.net:8181/33084 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-20powerpc/mpc85xx: Add ranges to etsec2 nodesScott Wood
Commit 746c9e9f92dd "of/base: Fix PowerPC address parsing hack" limited the applicability of the workaround whereby a missing ranges is treated as an empty ranges. This workaround was hiding a bug in the etsec2 device tree nodes, which have children with reg, but did not have ranges. Signed-off-by: Scott Wood <scottwood@freescale.com> Reported-by: Alexander Graf <agraf@suse.de> Change-Id: I4c77ddeeb3c8de2ae180d8a24aae9871f2988fa6 Reviewed-on: http://git.am.freescale.net:8181/33083 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-20fsl/fman: Use ccflags-y instead of deprecated EXTRA_CFLAGSWang Dongsheng
This allows users to pass in additional compiler flags through the environment variable EXTRA_CFLAGS, e.g. make EXTRA_CFLAGS=-Wno-error Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com> CC: Mandy Lavi <mandy.lavi@freescale.com> Change-Id: I73b952f3c3862e6bd96f6b90df110f8f195721d9 Reviewed-on: http://git.am.freescale.net:8181/33154 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-20Merge remote-tracking branch 'ls1-linux/LS1-SDK'Olivia Yin-R63875
2015-03-20fsl: Use ccflags-y instead of deprecated EXTRA_CFLAGSWang Dongsheng
This allows users to pass in additional compiler flags through the environment variable EXTRA_CFLAGS, e.g. make EXTRA_CFLAGS=-Wno-error Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com> Change-Id: I36513506ee1671c31bb076e9b73c2e8e2442cf4f Reviewed-on: http://git.am.freescale.net:8181/33146 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-20fmd: update FmanV3L constantsMandy Lavi
Change-Id: I8b2b5e146358ab5aa9ce995c458471b4d037310b Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/29110 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Jianhua Xie <jianhua.xie@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-20powerpc/e6500: Optimize hugepage TLB missesScott Wood
Some workloads take a lot of TLB misses despite using traditional hugepages. Handle these TLB misses in the asm fastpath rather than going through a bunch of C code. Signed-off-by: Scott Wood <scottwood@freescale.com> Change-Id: I84a1f6fad189130c32a44e73ff60a26ffadfd59b Reviewed-on: http://git.am.freescale.net:8181/32729 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-20fmd: fix reading fm_port_ipv4_opt to not panicMandy Lavi
Change-Id: Id4166dad03d6e51202caa367de188ff8486fa9dc Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/28750 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Igal Liberman <Igal.Liberman@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-19dpaa_eth: remove unused argumentMadalin Bucur
Removed unnecessary argument to dpa_bp_free(). Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com> Change-Id: Ib16b37b0057857875805eb5692e1fd5a273883cb Reviewed-on: http://git.am.freescale.net:8181/32981 Reviewed-by: Cristian-Constantin Sovaiala <Cristian.Sovaiala@freescale.com> Reviewed-by: Marian Cristian Rotariu <marian.rotariu@freescale.com>
2015-03-19Merge branch 'qoriq-sdk' into LS1-SDKJason Jin
2015-03-19clock: hrtimer: Add workaround to fix building error about hrtimer based ↵Alison Wang
broadcast on PowerPC The hrtimer broad support was back-ported from upstream for LS1, the Power platform do not implement this yet. The tick_setup_hrtimer_broadcast function was not defined on Power platform. When build for PowerPC with this backport support, such error occurs: In file included from include/linux/tick.h:9:0, from arch/powerpc/kernel/idle.c:27: include/linux/clockchips.h:193:13: error: 'tick_setup_hrtimer_broadcast' defined but not used [-Werror=unused-function] As hrtimer based broadcast was only backported for ARM, this patch try to provide a workaround to fix the build error on Power platform. In linux-next, PowerPC will support hrtimer based broadcast too. There will be no build error and no workaround needed. Signed-off-by: Alison Wang <alison.wang@freescale.com> Change-Id: If0f61062d6aa3d91ff81d074f20765a5880a5168 Reviewed-on: http://git.am.freescale.net:8181/33071 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Zhengxiong Jin <Jason.Jin@freescale.com>
2015-03-18dpaa_eth: use proper recycling conditionMadalin Bucur
The condition that needs to be evaluated to determine if a certain fd is to be recycled (buffers released in the buffer pool by HW) is (fd.bpid != 0xff). Several places in the code were using the previous condition (fd.cmd & FM_FD_CMD_FCO) that is always true after the unification of the recycling and confirmation paths. Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com> Change-Id: I23789acc6879086f356ca9accfe400122fd4f0f3 Reviewed-on: http://git.am.freescale.net:8181/32879 Reviewed-by: Marian Cristian Rotariu <marian.rotariu@freescale.com>
2015-03-17fmd: MACSEC integrationMandy Lavi
This is the MACSEC lower API integration. Change-Id: I3b6f172b323f1e297d6202856524ac059b7745c1 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/19442 Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Tested-by: Mandy Lavi <Mandy.Lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/28484 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Cristian-Constantin Sovaiala <Cristian.Sovaiala@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-17fmd: disable auto-neg if ports is SGMII2.5GMandy Lavi
In order to do so it was also required to introduce a new if type for SGMII2.5G Change-Id: Iddbe223d8b716c3ed348c7a8a53bee0c037f04f4 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/23474 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-17fmd: Render match table key statistics accessible from user spaceMarian Chereji
The key statistics for match tables are not accessible from user space using fmlib. This update implements the support for the function FM_PCD_MatchTableGetKeyStatistics to be accessible from user space. Signed-off-by: Marian Chereji <marian.chereji@freescale.com> Change-Id: Ibcf40fdcf7a60afc65b2f926c2a1474513ae8950 Reviewed-on: http://git.am.freescale.net:8181/25376 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-17gianfar: Reduce logging noise seen due to phy polling if link is downGuenter Roeck
Commit 6ce29b0e2a04 ("gianfar: Avoid unnecessary reg accesses in adjust_link()") eliminates unnecessary calls to adjust_link for phy devices which don't support interrupts and need polling. As part of that work, the 'new_state' local flag, which was used to reduce logging noise on the console, was eliminated. Unfortunately, that means that a 'Link is Down' log message will now be issued continuously if a link is configured as UP, the link state is down, and the associated phy requires polling. This occurs because priv->oldduplex is -1 in this case, which always differs from phydev->duplex. In addition, phydev->speed may also differ from priv->oldspeed. gfar_update_link_state() is therefore called each time a phy is polled, even if the link state did not change. Cc: Claudiu Manoil <claudiu.manoil@freescale.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Claudiu Manoil <claudiu.manoil@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net> Change-Id: Iab3e64c4c5828133ff0e1441a087e55c5287408f Reviewed-on: http://git.am.freescale.net:8181/32703 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-17gianfar: correct the bad expression while writing bit-patternSanjeev Sharma
This patch correct the bad expression while writing the bit-pattern from software's buffer to hardware registers. Signed-off-by: Sanjeev Sharma <Sanjeev_Sharma@mentor.com> Signed-off-by: David S. Miller <davem@davemloft.net> Change-Id: I3cdc480f17d1c18f47c5dbea47b843c76c9669a2 Reviewed-on: http://git.am.freescale.net:8181/32702 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-17net: gianfar: remove the unneeded check of disabled deviceKevin Hao
Since commit cd1e65044d44 ("of/device: Don't register disabled devices"), the disabled device will not be registered at all. So we don't need to do the check again in the platform device driver. Signed-off-by: Kevin Hao <haokexin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Change-Id: I3a851a9b6eb649a1fa9694970c6aa34d11f76fda Reviewed-on: http://git.am.freescale.net:8181/32701 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-17net: gianfar: add missing __iomem annotationKevin Hao
Fix the following spare warning: drivers/net/ethernet/freescale/gianfar.c:3521:60: warning: incorrect type in argument 1 (different address spaces) drivers/net/ethernet/freescale/gianfar.c:3521:60: expected unsigned int [noderef] <asn:2>*addr drivers/net/ethernet/freescale/gianfar.c:3521:60: got unsigned int [usertype] *rfbptr drivers/net/ethernet/freescale/gianfar.c:205:16: warning: incorrect type in assignment (different address spaces) drivers/net/ethernet/freescale/gianfar.c:205:16: expected unsigned int [usertype] *rfbptr drivers/net/ethernet/freescale/gianfar.c:205:16: got unsigned int [noderef] <asn:2>*<noident> drivers/net/ethernet/freescale/gianfar.c:2918:44: warning: incorrect type in argument 1 (different address spaces) drivers/net/ethernet/freescale/gianfar.c:2918:44: expected unsigned int [noderef] <asn:2>*addr drivers/net/ethernet/freescale/gianfar.c:2918:44: got unsigned int [usertype] *rfbptr Signed-off-by: Kevin Hao <haokexin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Change-Id: I85e5f6de656028a5ff96a0083fd36aa07869e6dc Reviewed-on: http://git.am.freescale.net:8181/32700 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-17net: gianfar: mark the local functions staticKevin Hao
Signed-off-by: Kevin Hao <haokexin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> The results of backporting this upstream fix to SDK are: * removal of unused lock|unlock_tx_qs(); * gfar_new_skb() cannot be made static beacause it is exported to ASF; Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com> Change-Id: I42b348fbfa33858b0db84c1055dd6b92000e3b3e Reviewed-on: http://git.am.freescale.net:8181/32699 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-17gianfar: Add FCS to rx buffer size (fix)Claudiu Manoil
For each Rx frame the eTSEC writes its FCS (Frame Check Sequence) to the Rx buffer. The eTSEC h/w manual states in the "Receive Buffer Descriptor Field Descriptions" table: "Data length is the number of octets written by the eTSEC into this BD's data buffer if L is cleared (the value is equal to MRBLR), or, if L is set, the length of the frame including *CRC*, FCB (if RCTRL[PRSDEP > 00), preamble (if MACCFG2[PreAmRxEn]=1), time stamp (if RCTRL[TS] = 1) and any padding (RCTRL[PAL])." Though the FCS bytes are removed by the driver before passing the skb to the net stack, the Rx buffer size computation does not currently take into account the FCS bytes (4 bytes). Because the Rx buffer size is multiple of 512 bytes, leaving out the FCS is not a problem for the default MTU of 1500, as the Rx buffer size is 1536 in this case. However, for custom MTUs, where the difference between the MTU size and the Rx buffer size is less, this can be a problem as the computed Rx buffer size won't be enough to accomodate the FCS for a received frame that is big enough (close to MTU size). In such case the received frame is considered to be incomplete (L flag not set in the RxBD status) and silently dropped. Note that the driver does not currently support S/G on Rx, so it has to compute its Rx buffer size based on the MTU of the device. Reported-by: Kristian Otnes <kotnes@cisco.com> Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net> Change-Id: I75eab6badeb8cd57afffee4e88a2e47fc1685a2f Reviewed-on: http://git.am.freescale.net:8181/32698 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-17fmd: optimize shared schemes used for IPR across multiple portsMandy Lavi
Change-Id: Ifb357bd9b78c06042aa6e9fbb7c50b821f955064 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/32794 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Liron Himi <Liron.Himi@freescale.com> Reviewed-by: Pinghua An <pinghua.an@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-16Revert "Revert "powerpc/hugetlb: Replace __get_cpu_var with get_cpu_var""Scott Wood
This reverts commit 978464fa78fef73e7c225e3a316662b6bfd1c261. Change-Id: I7d529835a9503cfc130da2da7bcda536b9c58762 Reviewed-on: http://git.am.freescale.net:8181/32820 Reviewed-by: Scott Wood <scottwood@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
2015-03-16pci_layerscape : Enable support of RT kernel in PCI-MSI interrupt handlerMeenakshi Aggarwal
generic_handle_irq() should always be called in interrupt disabled context, this patch ensures that interrupts are disabled while calling generic_handle_irq(). It call local_irq_disable() before calling generic_handle_irq() and local_irq_enable() on exit. In case of non-rt kernel, ls_pcie_msi_irq_handler is called in interrupt disabled context, so no need to explicitly disabling interrupt while calling generic_handle_irq(). Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal@freescale.com> Change-Id: I13d83423ea45c1ce5021474c04640ac7118664af Reviewed-on: http://git.am.freescale.net:8181/31478 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Priyanka Jain <Priyanka.Jain@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-16Revert "powerpc/hugetlb: Replace __get_cpu_var with get_cpu_var"Honghua Yin
This reverts commit 64ded519fc23ff43dc257dce37dfd1b7801f1e99. Change-Id: I31b93b7ed5e2e5acd1198be4f90d0414e39aad61 Reviewed-on: http://git.am.freescale.net:8181/32782 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-16Revert "powerpc/perf: fix fsl_emb_pmu_start to write correct pmc value"Honghua Yin
This reverts commit a82bc85b91aabe41b47eb7ef4b15c466f671ecbc. Change-Id: If8da9358abad19bef990e0578a81b48e92487799 Reviewed-on: http://git.am.freescale.net:8181/32775 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-16dpa_offload: Fix SEC era info acquisitionMarian Chereji
The dpa_ipsec driver was unreliable is acquiring the SEC era for toggling the ESP padding removal setting of the SEC. The SEC version was used which is not a good criteria to follow in order to assume the ESP padding removal feature is available. The implementation was updated and the driver is now searching for the first device tree node which has a "fsl,sec-era" property and is using that information for further configuration of the SEC. Signed-off-by: Marian Chereji <marian.chereji@freescale.com> Change-Id: I80ffe931995b8aac38d42a0e013d760fbb7a5cd6 Reviewed-on: http://git.am.freescale.net:8181/29887 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Horia Ioan Geanta Neag <horia.geanta@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-16powerpc/perf: fix fsl_emb_pmu_start to write correct pmc valueTom Huynh
PMCs on PowerPC increases towards 0x80000000 and triggers an overflow interrupt when the msb is set to collect a sample. Therefore, to setup for the next sample collection, pmu_start should set the pmc value to 0x80000000 - left instead of left which incorrectly delays the next overflow interrupt. Same as commit 9a45a9407c69 ("powerpc/perf: power_pmu_start restores incorrect values, breaking frequency events") for book3s. Change-Id: I5ba1acaec8436973970d00fdbd4b100107559a32 Reviewed-on: http://git.am.freescale.net:8181/29119 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-16powerpc/hugetlb: Replace __get_cpu_var with get_cpu_varTiejun Chen
Replace __get_cpu_var safely with get_cpu_var to avoid the following call trace: [ 7253.637591] BUG: using smp_processor_id() in preemptible [00000000 00000000] code: hugemmap01/9048 [ 7253.637601] caller is free_hugepd_range.constprop.25+0x88/0x1a8 [ 7253.637605] CPU: 1 PID: 9048 Comm: hugemmap01 Not tainted 3.10.20-rt14+ #114 [ 7253.637606] Call Trace: [ 7253.637617] [cb049d80] [c0007ea4] show_stack+0x4c/0x168 (unreliable) [ 7253.637624] [cb049dc0] [c031c674] debug_smp_processor_id+0x114/0x134 [ 7253.637628] [cb049de0] [c0016d28] free_hugepd_range.constprop.25+0x88/0x1a8 [ 7253.637632] [cb049e00] [c001711c] hugetlb_free_pgd_range+0x6c/0x168 [ 7253.637639] [cb049e40] [c0117408] free_pgtables+0x12c/0x150 [ 7253.637646] [cb049e70] [c011ce38] unmap_region+0xa0/0x11c [ 7253.637671] [cb049ef0] [c011f03c] do_munmap+0x224/0x3bc [ 7253.637676] [cb049f20] [c011f2e0] vm_munmap+0x38/0x5c [ 7253.637682] [cb049f40] [c000ef88] ret_from_syscall+0x0/0x3c [ 7253.637686] --- Exception: c01 at 0xff16004 Signed-off-by: Tiejun Chen<tiejun.chen@windriver.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> (cherry picked from commit 94b09d75546247ec7e0d441f352f548946619fe8) Signed-off-by: Scott Wood <scottwood@freescale.com> Change-Id: Iaafa3adce6ef75d8838f8e94caa759905ed77bf8 Reviewed-on: http://git.am.freescale.net:8181/29328 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-16fmd: Fix "owner" update in remove PCD chain with header manipulationMarian Chereji
When user askes to update a particular CC Node which points to another CC node that contains entries with header manipulation the owner of the header manipulation node is increased. This patch decreases back the owner explicitly, as owner shouldn't be changed in this situation. Signed-off-by: Ella Segal <ella.segal@freescale.com> Reviewed-by: Marian Chereji <marian.chereji@freescale.com> Change-Id: Ibf963791198d47ade1d376ec1bf8902f510b9900 Reviewed-on: http://git.am.freescale.net:8181/30463 Reviewed-by: Marian-Cornel Chereji <marian.chereji@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
2015-03-13Merge remote-tracking branch 'dpaa/dpaa-next'Olivia Yin-R63875
2015-03-12dpaa_eth: fix udev interferenceMadalin Bucur
udev renames each new interface as soon as it's created so all interfaces are named eth1, resulting in name conflicts for the debugfs files created based on device name. This patch fixes that problem by imposing eth1..N naming for the debugfs entries. Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com> Change-Id: I105c0b1bf0cc604ae6c3f18eb74769b05e0367a2 Reviewed-on: http://git.am.freescale.net:8181/32669 Reviewed-by: Marian Cristian Rotariu <marian.rotariu@freescale.com>
2015-03-11dpaa_eth: fix unused variable warningMadalin Bucur
Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com>
2015-03-11dpaa_eth: remove unnecessary operation for onicRotariu Marian Cristian-B44860
Protocol and nexthdr, variables from ipv4 and ipv6 layers, are 1 byte long, therefore no byte order conversion is needed. Signed-off-by: Rotariu Marian Cristian-B44860 <marian.rotariu@freescale.com> Change-Id: Ibaa4da641b2eeb29c8186aac9714b154eee5ab13 Reviewed-on: http://git.am.freescale.net:8181/20908 Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/32488
2015-03-11dpaa_eth: add reference for ioremap callsMarian-Cristian Rotariu
Signed-off-by: Marian-Cristian Rotariu <marian.rotariu@freescale.com> Change-Id: I3b79c9bb946102f52361278126d12606a1c5652e Reviewed-on: http://git.am.freescale.net:8181/32485 Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
2015-03-11dpaa_eth: mark per CPU variablesRotariu Marian Cristian-B44860
This annotation helps sparse track and signal issues related to per-CPU variables. Signed-off-by: Rotariu Marian Cristian-B44860 <marian.rotariu@freescale.com> Change-Id: I197d6225b5b6447c78f09865c3bd09b62e43ab04 Reviewed-on: http://git.am.freescale.net:8181/20905 Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/32487
2015-03-11dpaa_eth: fix PFC supportMadalin Bucur
PFC support code was using a removed FQ type. Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com>
2015-03-11dpaa_eth: fix the address settings of a FDMarian-Cristian Rotariu
There is no need to set high and low addresses separately. Signed-off-by: Marian-Cristian Rotariu <marian.rotariu@freescale.com> Change-Id: I584d11704d7d0f790ccbab7b35c7ec2ba7b1402a Reviewed-on: http://git.am.freescale.net:8181/32484 Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
2015-03-11dpaa_eth: memset the local declared arrayMarian-Cristian Rotariu
For some reason, in the simulator, the newly declared local array does not have the value set on 0. This patch will memset the array to 0. These values are sent to the BMan driver. Signed-off-by: Marian-Cristian Rotariu <marian.rotariu@freescale.com> Change-Id: I1a8c9c48748885e021d7d45ce3286e23a4e3c39d Reviewed-on: http://git.am.freescale.net:8181/30393 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com> Reviewed-by: Yang Li <LeoLi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/32505
2015-03-11dpaa_eth: fix debugfs errorsMarian-Cristian Rotariu
This patch removes one header dependency and attaches the debugfs directory of the DPAA Ethernet driver to the root directory of the debugfs. Signed-off-by: Marian-Cristian Rotariu <marian.rotariu@freescale.com> Change-Id: Ib84fcbd86be7e9666ff8274c2aa52915771df988 Reviewed-on: http://git.am.freescale.net:8181/29106 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com> Reviewed-by: Mingkai Hu <Mingkai.Hu@freescale.com> Reviewed-by: Yang Li <LeoLi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/32504
2015-03-11dpaa_eth: fix endianness issue in the dts parserMarian-Cristian Rotariu
The phandle value in the dtb is a BE value and will not be properly parsed on a LE architecture. This patch adds the proper device tree parser API call that has the conversion to a proper architecture integrated in its implementation. Change-Id: I2c462acaf0801bb47a2179e02fc9c8d610a6f0ff Signed-off-by: Marian-Cristian Rotariu <marian.rotariu@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/25779 Reviewed-on: http://git.am.freescale.net:8181/32503 Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
2015-03-11dpaa_eth: make the S/G rx routine endian portableMarian-Cristian Rotariu
This patch modifies the shared S/G rx routine used by shared and macless driver to properly receive the S/G frames from FMan. Signed-off-by: Marian-Cristian Rotariu <marian.rotariu@freescale.com> Change-Id: Icc467cb9ced12db75db28876e606e23fd3ee7788 Reviewed-on: http://git.am.freescale.net:8181/22852 Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/32502
2015-03-11dpaa_eth: convert sg entry to be endian portableMarian-Cristian Rotariu
The S/G entry resides in the main memory and is used directly by the FMan, therefore it needs proper conversion on both rx and tx. Change-Id: I4d85d80589fb8b72e98a13b9665ff2ebffcfc387 Reviewed-on: http://git.am.freescale.net:8181/22443 Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com> Reviewed-by: Marian Cristian Rotariu <marian.rotariu@freescale.com> Tested-by: Marian Cristian Rotariu <marian.rotariu@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/32501
2015-03-11dpaa_eth: make the common code endian portableMarian-Cristian Rotariu
The parse results structure is in the main memory and is used by the FMan, which is BE. Also, the release function for an SG table entry should use the address in a proper CPU endianness. Signed-off-by: Marian-Cristian Rotariu <marian.rotariu@freescale.com> Change-Id: Iddc6ee051426a1a584e3a8b15a18b6b1544d8b49 Reviewed-on: http://git.am.freescale.net:8181/22451 Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/32500