summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/freescale/fman
AgeCommit message (Collapse)Author
2014-12-11fmd: add support for t1024 featuresMandy Lavi
Change-Id: I37dbffe63e57af8a783b251d0f78087400b09d99 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/23940 Reviewed-by: Eyal Harari <Eyal.Harari@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Nir Erez <nir.erez@freescale.com> Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com>
2014-12-11fmd: fix static analysis issuesMandy Lavi
Change-Id: I2d6cead7b62116cd6a264ec91d82f3bdc3a03c10 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/23939 Reviewed-by: Igal Liberman <Igal.Liberman@freescale.com> Tested-by: Richard Schmitt <richard.schmitt@freescale.com> Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com>
2014-12-11Revert "fmd: fix static analysis issues"Matthew Weigel
This reverts commit 5e921ed07acbc6f05536aac89b9edc2578663840. Change-Id: Ic4d1166b5ad6419f369e3be278f41ea5764ff6fc Reviewed-on: http://git.am.freescale.net:8181/23784 Reviewed-by: Matthew Weigel <Matthew.Weigel@freescale.com> Tested-by: Matthew Weigel <Matthew.Weigel@freescale.com>
2014-12-11fmd: fix static analysis issuesMandy Lavi
Change-Id: I428d24ec05b1e6ef2137ad2ba6385ddfa3a01872 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/22882 Reviewed-by: Nir Erez <nir.erez@freescale.com> Reviewed-by: Matthew Weigel <Matthew.Weigel@freescale.com> Tested-by: Matthew Weigel <Matthew.Weigel@freescale.com>
2014-12-11powerpc/t1024: update defconfig and dts for fman_v3l platformShengzhou Liu
- add CONFIG_FMAN_V3L by default for FMan_V3L platform. - t1024 officially supports 6 portals of QMan/BMan instead of 10 - remove CONFIG_ALTIVEC as e5500 core has no ALTIVEC. Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Change-Id: I71a5426ad441ef034c66e2d794a86b366092530d Reviewed-on: http://git.am.freescale.net:8181/23188 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com>
2014-12-11dpaa_eth: add PTPd 1588 stack supportYangbo Lu
Support PTPd 1588 stack by adding PTP 1588 clock using the dTSEC Signed-off-by: Yangbo Lu <yangbo.lu@freescale.com> Change-Id: I4f6fb9a721cede75c6cf23560014b55b46c84fef Reviewed-on: http://git.am.freescale.net:8181/20295 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Xiaobo Xie <X.Xie@freescale.com> Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com>
2014-12-11Integrate t1024 patchesRich Schmitt
Merge remote-tracking branch 't1024-linux/master'
2014-12-11capwap: fix stree test issue of fragPan Jiafei
Signed-off-by: Pan Jiafei <Jiafei.Pan@freescale.com> Change-Id: Ifcd657229e3cbc9eab88866ac4a05230321a6a6d Reviewed-on: http://git.am.freescale.net:8181/21439 Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Tested-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Reviewed-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
2014-12-11fmd: add CapwapFragmentationStatsPan Jiafei
Signed-off-by: Pan Jiafei <Jiafei.Pan@freescale.com> Change-Id: I98b45ed877ab65e5ce2cd673787a7657e5faacbc Reviewed-on: http://git.am.freescale.net:8181/21437 Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Tested-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Reviewed-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
2014-12-11fmd: add p_capwap_reassembly_manip to ioc_compat_fm_port_pcd_params_tPan Jiafei
Signed-off-by: Pan Jiafei <Jiafei.Pan@freescale.com> Change-Id: Ia7c5b214817804e6e1ee31d74608ffbacd09cf39 Reviewed-on: http://git.am.freescale.net:8181/21433 Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Tested-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Reviewed-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
2014-12-11fmd: tmp capwap supportMandy Lavi
Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Change-Id: I426f384c05479a5ddc1607e9b8fa92d972c612ce Reviewed-on: http://git.am.freescale.net:8181/21432 Reviewed-by: Jiafei Pan <Jiafei.Pan@freescale.com> Reviewed-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Tested-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
2014-12-11fmd: extend workaround of fman reset for T1024Shengzhou Liu
The same hang issue was observed on T1024 as well. Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Change-Id: Ifad3fff1b430be90b6cc9548a959365ecd28236d Reviewed-on: http://git.am.freescale.net:8181/21425 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Xiaobo Xie <X.Xie@freescale.com>
2014-12-11qe: move qe from arch/powerpc/sysdev/ to drivers/soc/Zhao Qiang
ls1 has qe ip block too, so move qe code from platform directory to public directory. Signed-off-by: Zhao Qiang <B45475@freescale.com> --- patch on upstream can be found with this link: http://patchwork.ozlabs.org/patch/385724/, it is under discussion Change-Id: I39aed531a4792990e3bb8ecc6f4e57f8d9b41bae Reviewed-on: http://git.am.freescale.net:8181/15818 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Xiaobo Xie <X.Xie@freescale.com> Reviewed-by: Zhengxiong Jin <Jason.Jin@freescale.com>
2014-12-11Merge commit '60cce3da4a8393d1e15bf1a9dbe3956a8aaabbaf'Rich Schmitt
2014-10-19fmd: force port down when qbmi busyMandy Lavi
Change-Id: I17411cd51bb88c5294bbdf97b8bd18609a00a7f6 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/17708 Reviewed-by: Igal Liberman <Igal.Liberman@freescale.com> Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Tested-by: Mandy Lavi <Mandy.Lavi@freescale.com>
2014-10-08fmd: use proper return valueMadalin Bucur
Channel value is uint16_t, return adequate type. Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com> Change-Id: I4295b7f706e9db36ac9d6d02b8896fa11067f612 Reviewed-on: http://git.am.freescale.net:8181/18840 Reviewed-by: Marian Cristian Rotariu <marian.rotariu@freescale.com>
2014-10-08fmd: fix casting warningMandy Lavi
Coverity issue Change-Id: If0a7e1dffa09e3513b7ccb13a1dc09bf91056238 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/18831 Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Tested-by: Mandy Lavi <Mandy.Lavi@freescale.com> Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
2014-09-29fmd: do not apply erratum A005127 on fmanV3LMandy Lavi
Change-Id: I3de0664e687cb75564d08758889c0cd0878acfb4 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/19953 Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Tested-by: Mandy Lavi <Mandy.Lavi@freescale.com>
2014-09-19FMD: DSAR: Don't disable/enable Tx explicitly. Change call to exit DSAR to ↵Eyal Harari
fm_soc_resume Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com> Change-Id: I888b95ca0c7f2e13266ecf81c41e779666a6e612 Reviewed-on: http://git.am.freescale.net:8181/19106 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Cristian-Constantin Sovaiala <Cristian.Sovaiala@freescale.com> Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com>
2014-09-05FMD: DSAR: call device_set_wakeup_enable only for AR. Do it in .suspend and ↵Eyal Harari
.resume Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com>
2014-09-05FMD: DS: configure SCFG_FMCLKDPSLPCR for all DS cases, not only AREyal Harari
Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com>
2014-09-05FMD: DSAR: configure conflict detection bit for ARP and NDEyal Harari
Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com>
2014-09-05FMD: DSAR: fixed compatibility of structures t_FmPortDsarOidsEntry and ↵Eyal Harari
auto_res_snmp_entry Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com>
2014-08-21FMD: fix build for p4080 and other old archsEyal Harari
Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com> Change-Id: I8b02d8538c564fb2deb849a2053c5a6b82661fc6 Reviewed-on: http://git.am.freescale.net:8181/17192 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com>
2014-07-29DSAR: change name of variables to reflect their correct behaviourEyal Harari
Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com>
2014-07-29DSAR: configure tcp flags in DSAR tablesEyal Harari
Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com>
2014-07-21FMD: DSAR - fix deep sleep entry sequenceEyal Harari
The current sequence fixes the order of operations executed when entering deep sleep state. It also implements a workaround for a hardware bug by writing to fm_cld register - disabling DMA after a short idle period. Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com> Change-Id: I2c73406543495dad5a7fb240a2e8fab01b81e05e
2014-06-04fmd: add new attribute total-fifo-size to fman chosen nodeMandy Lavi
This will enable increasing the total allowed fifo-size to more than 120KB for FManV1 parts (up to 160KB) for the purpose of better traffic performance in case that jumbo frames are involved Change-Id: I3e357e08656af7d4f6c7e1c071212ccc81825449 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/13297 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Nir Erez <nir.erez@freescale.com> Reviewed-by: Thomas Trefny <Tom.Trefny@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-05-29FMD: add dependency on CONFIG_FSL_QORIQ_PM for calling fsl_set_power_except()Eyal Harari
Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com> Change-Id: If804bfb9694ad08330e7a7c083cec9970ad4954d Reviewed-on: http://git.am.freescale.net:8181/13062 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-05-29fmd: fix potentially uninitialized pointerMandy Lavi
Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Change-Id: I5ef4f9bd5f0cb1d9b43d8bcc4ac7b1efb3b0bd38 Reviewed-on: http://git.am.freescale.net:8181/12856 Reviewed-by: Nir Erez <nir.erez@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com> Tested-by: Jose Rivera <German.Rivera@freescale.com> (cherry picked from commit 39967816be45a10552e25ec27e2d20de0a466534) Reviewed-on: http://git.am.freescale.net:8181/13060
2014-05-29fmd: enable addition of CCtable entry not linked to a keygenMandy Lavi
This fixes the problem that if at a time, a path between a keygen and a CCtable is broken (e.g. by deleting an entry in a previous table) then it is impossible to add any entry in that table or in any tables that are "behind" it until a new path would be created Also fixing the case w.r.t. to share CC nodes when deleting entry in a CC node attached to first port will corrupt context of ccnode shared with other ports. Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Change-Id: I089982acee71c489b6ed9275b641afa74315c18f Reviewed-on: http://git.am.freescale.net:8181/12820 Reviewed-by: Nir Erez <nir.erez@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com> Tested-by: Jose Rivera <German.Rivera@freescale.com> (cherry picked from commit e25a50bbcd56f0c1f4a725b70eab5f75604d14a3) Reviewed-on: http://git.am.freescale.net:8181/13059
2014-05-28FMD: DSAR: stabilize DSAREyal Harari
Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com> Change-Id: Ica2eaeb13ecd0a2ad3084ad427a3e2f2da86b21f Reviewed-on: http://git.am.freescale.net:8181/13019 Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com> Tested-by: Jose Rivera <German.Rivera@freescale.com>
2014-05-28FMD: DSAR: Conditionally compile started_ar_enter variableCristian Sovaiala
started_ar_enter variable is defined inside CONFIG_PM so guard the variable all over it is referenced. Signed-off-by: Cristian Sovaiala <cristian.sovaiala@freescale.com> Change-Id: I3a9ea33b20c947909689f63fddd8152f5f38c9f9 Reviewed-on: http://git.am.freescale.net:8181/13010 Reviewed-by: Eyal Harari <Eyal.Harari@freescale.com> Reviewed-by: Cristian Bercaru <cristian.bercaru@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
2014-05-27FMD: DSAR: workaround patch which enables AR in DSEyal Harari
Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com> Change-Id: I90e7e97c9ff8a149893c8244cb0e8376c66eb2ad Reviewed-on: http://git.am.freescale.net:8181/12925 Reviewed-by: Cristian-Constantin Sovaiala <Cristian.Sovaiala@freescale.com> Tested-by: Richard Schmitt <richard.schmitt@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com> Tested-by: Jose Rivera <German.Rivera@freescale.com>
2014-05-21fmd: disabling OH ports no longer availableCristian Bercaru
With this patch, the option FMAN_DISABLE_OH_TO_REUSE_RESOURCES is not availeble anymore because it depends on FMAN_RESOURCE_ALLOCATION_ALGORITHM, which no longer exists. Signed-off-by: Cristian Bercaru <cristian.bercaru@freescale.com> Change-Id: I67a1e45f8b8b11c9b191cae0d8c9b56bdc912876 Reviewed-on: http://git.am.freescale.net:8181/12502 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-05-19fmd: change p1023 DEFAULT_totalFifoSize to 49KBMandy Lavi
49KB can accomodate buffers for 2x1G + 1xOH + 1xOP Change-Id: Ib2da4bb8e9d393f207bb756cf1b5a3ab1e75cdd2 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/12499 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-05-19fmd: change fmanV3L DEFAULT_totalFifoSize to 142KMandy Lavi
142KB can accomodate buffers for 5x1G + 1xOH + 1xOP 5*0x6400+0xa00+0x3200=140KB Change-Id: I37d7a1713101796cf3ab942ad4981d0070df4a98 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/12473 Reviewed-by: Jianhua Xie <jianhua.xie@freescale.com> 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-05-19fmd: tgec and dtsec adjust to NO_IRQ eq 0Mandy Lavi
Change-Id: Ided02763bb84061238a52d00bc3976a6681c5bfc Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/12455 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-05-16fmd: fman advanced args should not be mandatoryMandy Lavi
Change-Id: I0080ab68d4658bf8eb855b6c4b43ed2526f2a878 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/12366 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-05-16fmd: remove wrong assumption wrt num of portsMandy Lavi
Change-Id: I54409ee49f85935ced3f9c2038a8dfcc801e6f6e Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/12365 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-05-14FMD: Added functions for fm soc configuration during Deep SleepEyal Harari
Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com> Change-Id: I2b775e3609510a0290e751adc1cf3726cf11904f Reviewed-on: http://git.am.freescale.net:8181/12341 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Cristian-Constantin Sovaiala <Cristian.Sovaiala@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-05-13Revert "fman: updating default value of FSL_FM_RX_EXTRA_HEADROOM from 64 to ↵Richard Schmitt
128 bytes" This reverts commit 98345f7c55a5a52b30aa0982cec8644ad9636bdb. Change-Id: I7cc841b30ed0e23728b40dd10057edb9c54d07fe Reviewed-on: http://git.am.freescale.net:8181/12289 Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com> Tested-by: Jose Rivera <German.Rivera@freescale.com>
2014-05-13fman: Add t10xx port constraintJianhua Xie
There are two FMAN V3 version: FMAN_V3H and FMAN_V3L. Some hardware resources are different between the two version. T1040, T1042, T1020, T1022 belong to FMAN_V3L, there are 4 Offline/Host Command Ports (O/H n) in FMAN_V3L. But there are 6 Offline/Host Command Ports (O/H n) in FMAN_V3H. This patch is correcting some definition like INTG_MAX_NUM_OF_FM, FM_MAX_NUM_OF_10G_MACS, FM_MAX_NUM_OF_1G_MACS and etc. according to (T1040RM Rev D, 04/2014) Signed-off-by: Jianhua Xie <jianhua.xie@freescale.com> Change-Id: I3f7fa9b70fad30b49cd76da57429ab8ad08b5176 Reviewed-on: http://git.am.freescale.net:8181/12241 Reviewed-by: Jiafei Pan <Jiafei.Pan@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-05-09fman: updating default value of FSL_FM_RX_EXTRA_HEADROOM from 64 to 128 bytesAlok Makhariya
64 is not enough to handle IPv6-IPSec and it will impact both Linux and ASF IPSec-IPv6 performance so updating the headroom to 128 bytes CR:ENGR00309290 Signed-off-by: Alok Makhariya <B46187@freescale.com> Change-Id: Iae44de3c58d616a846a5f04d2f3013f7c7581ad7 Reviewed-on: http://git.am.freescale.net:8181/12056 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Hemant Agrawal <hemant@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
2014-04-30fmd: extend workaround of fman reset for T4080Shengzhou Liu
The same hang issue was observed on T4080 as well. Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Change-Id: Ie4327353b43444dc3d312765ca5842cf63cf6428 Reviewed-on: http://git.am.freescale.net:8181/11296 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Xiaobo Xie <X.Xie@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-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-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-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>
generated by cgit v0.10.2 at 2024-09-25 14:05:12 (GMT)