summaryrefslogtreecommitdiff
path: root/drivers/staging
AgeCommit message (Collapse)Author
2013-09-07Merge branch 'sdk-v1.4.x' into sdk-kernel-3.8J. German Rivera
Conflicts temporarily resolved for: drivers/net/ethernet/freescale/dpa/dpaa_eth.c Permanent solution needs to be provided by the author of commit ec6aa025.
2013-09-06dpa_offload: Added Traffic Manager user-space counter implementationAurelian Zanoschi
Added support for Traffic Manager user-space DPA Stats counter in driver. The Traffic Manager counters can be used both from user-space or kernel-space depending on the user needs. If the counter is created from user-space, all the retrieving mechanism is implemented in user-space and same happens for kernel-space case. The counters is marked as a user-space counter and the kernel will provide for this counter only the offset where the user-space library to write the statistics of the counter. This patch corrects some compilation warnings caused by QMan CEETM API changes. Signed-off-by: Aurelian Zanoschi <Aurelian.Zanoschi@freescale.com> Change-Id: Ia97506a8a95e2c764f5176d35497f0ac95cb97cc Reviewed-on: http://git.am.freescale.net:8181/4447 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Chereji Marian-Cornel-R27762 <marian.chereji@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-09-03Merge branch 'sdk-v1.4.x' into sdk-kernel-3.8J. German Rivera
2013-09-03Removed dump_frag() duplicate definitionJ. German Rivera
2013-08-30Merge branch 'b4860rev2' into sdk-kernel-3.8J. German Rivera
2013-08-30Merge branch 'b4860rev2' into sdk-v1.4.xJ. German Rivera
2013-08-30Revert "dpa_offload: Added Traffic Manager user-space counter implementation" Rivera Jose-B46482
This reverts commit 658fb7c23113780e96ac8fc2503a058d49377281 This change has a bug related to misuse of the mutex_trylock() API (see line 3965) and causes non-obvious merge conflicts when merging to sdk-v1.4.x. Please rework this patch to ensure these issues are solved. Change-Id: If6be2d7fc98e3b3f0689b8c8abd241216adfd2f9 Reviewed-on: http://git.am.freescale.net:8181/4327 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-08-28fsl_qman: fix the incorrect return for xsfdr read in debugfsHaiying Wang
and fix the mask value for correctly getting the XSFDR value. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Change-Id: I72ba857bd01b93ca6042e354c7ca8c391f430e83 Reviewed-on: http://git.am.freescale.net:8181/4059 Reviewed-by: Thorpe Geoff-R01361 <Geoff.Thorpe@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-08-28dpa_offload: Added Traffic Manager user-space counter implementationAurelian Zanoschi
Added support for Traffic Manager user-space DPA Stats counter in driver. The Traffic Manager counters can be used both from user-space or kernel-space depending on the user needs. If the counter is created from user-space, all the retrieving mechanism is implemented in user-space and same happens for kernel-space case. The counters is marked as a user-space counter and the kernel will provide for this counter only the offset where the user-space library to write the statistics of the counter. This patch corrects some compilation warnings caused by QMan CEETM API changes. Change-Id: I48c4df286ab78efe2a16d46c4fd376d153732944 Signed-off-by: Aurelian Zanoschi <Aurelian.Zanoschi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/4196 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Chereji Marian-Cornel-R27762 <marian.chereji@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
2013-08-27Merge branch 'sdk-v1.4.x' into sdk-kernel-3.8J. German Rivera
2013-08-27Merge branch 'b4860rev2' into sdk-v1.4.xJ. German Rivera
2013-08-26Modify USDPAA DMA mapping code to allow non power of 4 mappingsRoy Pledge
This patch modifies the USDPAA code to allow non power of 4 DMA maps. The code will use multiple TLB1 entries if needed. DMA maps are still phyically and virually contiguous. Signed-off-by: Roy Pledge <Roy.Pledge@freescale.com> Change-Id: I42942067059a3c06f0b0d031d266d228295c7c45 Reviewed-on: http://git.am.freescale.net:8181/3857 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Wang Haiying-R54964 <Haiying.Wang@freescale.com> Reviewed-by: Rivera Jose-B46482 <Jose.G.Rivera@freescale.com>
2013-08-26Add API to allocate specific portals based on index. This allows an ↵Roy Pledge
application to get back the exact portal it was previously using by specifing the portals index value. Signed-off-by: Roy Pledge <Roy.Pledge@freescale.com> Change-Id: I8233816f0519731eb65b3671d68a01266eee42dd Reviewed-on: http://git.am.freescale.net:8181/4002 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Ladouceur Jeffrey-R11498 <Jeffrey.Ladouceur@freescale.com> Reviewed-by: Wang Haiying-R54964 <Haiying.Wang@freescale.com> Reviewed-by: Rivera Jose-B46482 <Jose.G.Rivera@freescale.com>
2013-08-26Make stash id and operation mapping index per window attributes.Varun Sethi
Stash ID and operation mapping can now be set per dma window. Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com> Change-Id: I987abbcba0575fea1b43843c2bce342f4eae4df2 Reviewed-on: http://git.am.freescale.net:8181/3439 Reviewed-by: Yoder Stuart-B08248 <stuart.yoder@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com> Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com> Conflicts: drivers/iommu/fsl_pamu.c drivers/iommu/fsl_pamu.h drivers/iommu/fsl_pamu_domain.c
2013-08-26dpa_offload : fix kernel segfault in ipsec_offload applicationAlexandru Badicioiu
Buffer pool id for frames enqueued to ipsec_offload inbound macless interface must match the interface bpid. Signed-off-by: Alexandru Badicioiu <alexandru.badicioiu@freescale.com>
2013-08-15Modify USDPAA DMA mapping code to allow non power of 4 mappingsRoy Pledge
This patch modifies the USDPAA code to allow non power of 4 DMA maps. The code will use multiple TLB1 entries if needed. DMA maps are still phyically and virually contiguous. Signed-off-by: Roy Pledge <Roy.Pledge@freescale.com> Change-Id: I42942067059a3c06f0b0d031d266d228295c7c45 Reviewed-on: http://git.am.freescale.net:8181/3857 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Wang Haiying-R54964 <Haiying.Wang@freescale.com> Reviewed-by: Rivera Jose-B46482 <Jose.G.Rivera@freescale.com>
2013-08-15Add API to allocate specific portals based on index.Roy Pledge
This allows an application to get back the exact portal it was previously using by specifing the portals index value. Signed-off-by: Roy Pledge <Roy.Pledge@freescale.com> Change-Id: I8233816f0519731eb65b3671d68a01266eee42dd Reviewed-on: http://git.am.freescale.net:8181/4002 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Ladouceur Jeffrey-R11498 <Jeffrey.Ladouceur@freescale.com> Reviewed-by: Wang Haiying-R54964 <Haiying.Wang@freescale.com> Reviewed-by: Rivera Jose-B46482 <Jose.G.Rivera@freescale.com>
2013-08-14dpa_offload: Add support in DPA Stats for miss statisticsAnca Jeanina FLOAREA
Added support in DPA Stats to retrieve the statistics for the miss-entry of either a Classification Node or a Classification Table. The user can request statistics for miss-entry by providing the key set to NULL. The Classification counter API was changed in order to allow the user to provide NULL instead of a valid key. Signed-off-by: Anca Jeanina FLOAREA <anca.floarea@freescale.com> Change-Id: Idf1324414f25e45dae908df01e0dc008db0fd083 Reviewed-on: http://git.am.freescale.net:8181/3740 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Zanoschi Aurelian-B43522 <Aurelian.Zanoschi@freescale.com> Reviewed-by: Rivera Jose-B46482 <Jose.G.Rivera@freescale.com>
2013-08-13dpa_offload: Updated the traffic manager counter implementationAurelian Zanoschi
Updated the traffic manager implementation based on the QMan CEETM API updates. The compilation warnings problem was also fixed. This commit fixes the statistics selection and checks for counter source and counter type. Change-Id: I329d390b52361dc944fc51c6f4f9c6059cd7a5a9 Signed-off-by: Aurelian Zanoschi <Aurelian.Zanoschi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/3437 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Floarea Anca Jeanina-B12569 <anca.floarea@freescale.com> Reviewed-by: Rivera Jose-B46482 <Jose.G.Rivera@freescale.com>
2013-08-10qman: Add CI-stashing support for QMan rev3.0 or laterHaiying Wang
Signed-off-by: Geoff Thorpe <Geoff.Thorpe@freescale.com> Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Change-Id: Icda6a8547559ab45ceea7160cde566ca022e92e8 Reviewed-on: http://git.am.freescale.net:8181/3698 Reviewed-by: Schmitt Richard-B43082 <B43082@freescale.com> Tested-by: Schmitt Richard-B43082 <B43082@freescale.com>
2013-08-10qman: remove eqcr_cmodeGeoff Thorpe
It was unused, and confusing efforts to implement support for EQCR_CI-stashing. Signed-off-by: Geoff Thorpe <Geoff.Thorpe@freescale.com> Change-Id: Ia390a4b4b54efba60b4e9b12a73b7d1ec88bf530 Reviewed-on: http://git.am.freescale.net:8181/3697 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Wang Haiying-R54964 <Haiying.Wang@freescale.com> Reviewed-by: Schmitt Richard-B43082 <B43082@freescale.com>
2013-08-09dpa_offload: dpa_ipsec - Update create SA function to set hmd to invalidAndrei Varvara
DPA Classifier API was updated by adding a new attribute (hmd) to the struct dpa_cls_tbl_next_table_desc. DPA IPSec is using the classifier feature for linking two tables, if inbound policy verification is required but does not require the hmd option. A minor update had to be made to set the hdm to -1 (not valid) otherwise the 0 value would have been concidered valid by classifier and crash since not hmd is required here. Signed-off-by: Andrei Varvara <andrei.varvara@freescale.com> Change-Id: I76eccbf6a60b7d563540de539be5144112c1567c Reviewed-on: http://git.am.freescale.net:8181/3474 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com> Reviewed-by: Schmitt Richard-B43082 <B43082@freescale.com> Tested-by: Schmitt Richard-B43082 <B43082@freescale.com>
2013-08-09dpa_offload: dpa_ipsec - Add support for NULL encryptionAndrei Varvara
The dpa ipsec component was not supporting ESP with NULL encryption. The patch is adding this suport. Signed-off-by: Andrei Varvara <andrei.varvara@freescale.com> Change-Id: I89111367e60c4592289687b0a13d84ac2911d23c Reviewed-on: http://git.am.freescale.net:8181/3473 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com> Reviewed-by: Schmitt Richard-B43082 <B43082@freescale.com> Tested-by: Schmitt Richard-B43082 <B43082@freescale.com>
2013-08-09dpa_offload: Copy multicast group and header manipulation descriptors to ↵Radu Bulie
userspace during look-up by key or by ref operations Multicast group and hmanip descriptors were copied to userspace in classifier wrapper during look-up by key or by ref operations. The patch fixes the above issue. Signed-off-by: Radu Bulie <radu.bulie@freescale.com> Change-Id: Ibba7869bcbe339a3ef23bd4071a3aaa682fe7b9d Reviewed-on: http://git.am.freescale.net:8181/3353 Reviewed-by: Bulie Radu-Andrei-B37577 <Radu.Bulie@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Chereji Marian-Cornel-R27762 <marian.chereji@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com> Reviewed-by: Schmitt Richard-B43082 <B43082@freescale.com> Tested-by: Schmitt Richard-B43082 <B43082@freescale.com>
2013-08-09dpa_offload: Copy storage profile id to userspace during look-up by key or ↵Radu Bulie
by ref operations Not all parameters were copied to userspace in classifier wrapper during look-up by key or by ref operations. The patch fixes the above issue. Change-Id: I4c33455a327c8dfd6fd0fa28d13cc7e28b856714 Signed-off-by: Radu Bulie <radu.bulie@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/3281 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Chereji Marian-Cornel-R27762 <marian.chereji@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-08-08dpa_offload: Add support in DPA Stats for miss statisticsAnca Jeanina FLOAREA
Added support in DPA Stats to retrieve the statistics for the miss-entry of either a Classification Node or a Classification Table. The user can request statistics for miss-entry by providing the key set to NULL. The Classification counter API was changed in order to allow the user to provide NULL instead of a valid key. Signed-off-by: Anca Jeanina FLOAREA <anca.floarea@freescale.com> Change-Id: Id871766e5cc7b494c934096829e12af15ded7544 Reviewed-on: http://git.am.freescale.net:8181/3830 Reviewed-by: Zanoschi Aurelian-B43522 <Aurelian.Zanoschi@freescale.com> Reviewed-by: Chereji Marian-Cornel-R27762 <marian.chereji@freescale.com> Reviewed-by: Schmitt Richard-B43082 <B43082@freescale.com> Tested-by: Schmitt Richard-B43082 <B43082@freescale.com>
2013-08-08dpa_offload: Add possibility to query classification table miss action detailsMarian Chereji
Added a new function to query classification table miss action details. This function is only advertised as internal API and is needed by the DPA Stats component to acquire Miss Action Statistics. Signed-off-by: Marian Chereji <marian.chereji@freescale.com> Change-Id: If9f506316c887bc44ebd5363c526a8f4fda3da1c Reviewed-on: http://git.am.freescale.net:8181/3829 Reviewed-by: Schmitt Richard-B43082 <B43082@freescale.com> Tested-by: Schmitt Richard-B43082 <B43082@freescale.com>
2013-07-31Merge remote-tracking branch 'fsl_devel/sdk-kernel-3.8' into sdk1.5Andy Fleming
2013-07-30fsl_qman: correctly update the cscn target when deleting cgr and releasing ccgHaiying Wang
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Change-Id: I7f0351f735232442c1bef4df80323852523e0315 Reviewed-on: http://git.am.freescale.net:8181/3304 Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com> Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-24Merge remote-tracking branch 'fsl_devel/b4860rev2' into sdk1.4Andy Fleming
2013-07-24Make stash id and operation mapping index per window attributes.Varun Sethi
Stash ID and operation mapping can now be set per dma window. Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com> Change-Id: I987abbcba0575fea1b43843c2bce342f4eae4df2 Reviewed-on: http://git.am.freescale.net:8181/3439 Reviewed-by: Yoder Stuart-B08248 <stuart.yoder@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com> Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-24Make stash id and operation mapping index per window attributes.Varun Sethi
Stash ID and operation mapping can now be set per dma window. Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com>
2013-07-23dpa_offload: dpa_ipsec - Update create SA function to set hmd to invalidAndrei Varvara
DPA Classifier API was updated by adding a new attribute (hmd) to the struct dpa_cls_tbl_next_table_desc. DPA IPSec is using the classifier feature for linking two tables, if inbound policy verification is required but does not require the hmd option. A minor update had to be made to set the hdm to -1 (not valid) otherwise the 0 value would have been concidered valid by classifier and crash since not hmd is required here. Signed-off-by: Andrei Varvara <andrei.varvara@freescale.com> Change-Id: I76eccbf6a60b7d563540de539be5144112c1567c Reviewed-on: http://git.am.freescale.net:8181/3474 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-23dpa_offload: dpa_ipsec - Add support for NULL encryptionAndrei Varvara
The dpa ipsec component was not supporting ESP with NULL encryption. The patch is adding this suport. Signed-off-by: Andrei Varvara <andrei.varvara@freescale.com> Change-Id: I89111367e60c4592289687b0a13d84ac2911d23c Reviewed-on: http://git.am.freescale.net:8181/3473 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-23Set SDQCR to ensure frame queues can reach the retired stateRoy Pledge
In some situations frame queues may still be on a work queue when a retirement command is sent during cleanup. In order to reach the retired state these frame queues must be scheduled. This patch sets an appropriate SDQCR value to ensure that the Frame Queue is scheduled. Since Frame Queues could be 'locked' to a particular portal if the Hold Active feature is enabled the shutrown routine must service all portals to ensure that the FQ reaches a retired state Signed-off-by: Roy Pledge <Roy.Pledge@freescale.com> Change-Id: I9faab0039e4bb7f8c740a271154e7756ce014d98 Reviewed-on: http://git.am.freescale.net:8181/3229 Reviewed-by: Wang Haiying-R54964 <Haiying.Wang@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com> Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-23Set SDQCR to ensure frame queues can reach the retired stateRoy Pledge
In some situations frame queues may still be on a work queue when a retirement command is sent during cleanup. In order to reach the retired state these frame queues must be scheduled. This patch sets an appropriate SDQCR value to ensure that the Frame Queue is scheduled. Since Frame Queues could be 'locked' to a particular portal if the Hold Active feature is enabled the shutrown routine must service all portals to ensure that the FQ reaches a retired state Signed-off-by: Roy Pledge <Roy.Pledge@freescale.com> Change-Id: I97f79d35c62f179f21b6bd11c23bc0150e54ff5f Reviewed-on: http://git.am.freescale.net:8181/3339 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com> Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-22dpa_offload: Copy multicast group and header manipulation descriptors to ↵Radu Bulie
userspace during look-up by key or by ref operations Multicast group and hmanip descriptors were copied to userspace in classifier wrapper during look-up by key or by ref operations. The patch fixes the above issue. Signed-off-by: Radu Bulie <radu.bulie@freescale.com> Change-Id: Ibba7869bcbe339a3ef23bd4071a3aaa682fe7b9d Reviewed-on: http://git.am.freescale.net:8181/3353 Reviewed-by: Bulie Radu-Andrei-B37577 <Radu.Bulie@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Chereji Marian-Cornel-R27762 <marian.chereji@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-22dpa_offload: Copy storage profile id to userspace during look-up by key or ↵Radu Bulie
by ref operations Not all parameters were copied to userspace in classifier wrapper during look-up by key or by ref operations. The patch fixes the above issue. Change-Id: I4c33455a327c8dfd6fd0fa28d13cc7e28b856714 Signed-off-by: Radu Bulie <radu.bulie@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/3281 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Chereji Marian-Cornel-R27762 <marian.chereji@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-22Fix regression that caused BMan interrupt lookup for USDPAARoy Pledge
to return incorrect information Signed-off-by: Roy Pledge <Roy.Pledge@freescale.com> Change-Id: I72e62fb6d37f63d13bd1f93029f1a4af24924ba9 Reviewed-on: http://git.am.freescale.net:8181/3336 Reviewed-by: Wang Haiying-R54964 <Haiying.Wang@freescale.com> Reviewed-by: Thorpe Geoff-R01361 <Geoff.Thorpe@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-18dpa_offload: Add direct scheme support for classifier miss actionRadu Bulie
This patch enables the direct schemesupport when a miss action is configured. Signed-off-by: Radu Bulie <radu.bulie@freescale.com> Change-Id: Ie16ab1e611a06b026fb5927ec2efea314bb0e2e1 Reviewed-on: http://git.am.freescale.net:8181/3354 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Chereji Marian-Cornel-R27762 <marian.chereji@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com> Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-18dpa_offload: Add separate resource pointer for multicast group import operationRadu Bulie
When multicast group was preallocated from a xml PCD file, the handle to the group was given as a multicast group parameter. To align the multicast component with header manipulation and classifier components, the group handle will be given as a resource input parameter to the function that creates a multicast group. Signed-off-by: Radu Bulie <radu.bulie@freescale.com> Change-Id: I254d1c681cc016513d4cb569e0dfcf5c56478163 Reviewed-on: http://git.am.freescale.net:8181/3279 Reviewed-by: Chereji Marian-Cornel-R27762 <marian.chereji@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com> Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-18dpa_offload: Add DPA Stats driver support for udev devicesAurelian Zanoschi
The device file in the file system is created automatically at init by the driver without need of any mknod commands. Change-Id: Ib0d5d4a47d3e92ec3d7a8813223017e0c24503a5 Signed-off-by: Aurelian Zanoschi <Aurelian.Zanoschi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/2881 Reviewed-by: Varvara Andrei-B21317 <andrei.varvara@freescale.com> Reviewed-by: Floarea Anca Jeanina-B12569 <anca.floarea@freescale.com> Reviewed-by: Chereji Marian-Cornel-R27762 <marian.chereji@freescale.com> Reviewed-by: Bulie Radu-Andrei-B37577 <Radu.Bulie@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com> Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-12fsl_qman: Fix flipping of CSCI interrupt bitBogdan Hamciuc
Commit 88d4c504 "fsl_qman: implement CEETM CCSCI and update some ccg APIs" inadvertently flips the QM_PIRQ_CSCI bit, reactivating a bug which allowed congestion state to become irreversible because of a missed interrupt. Clearing the CSCI bit puts the system back on track. Signed-off-by: Bogdan Hamciuc <bogdan.hamciuc@freescale.com> Change-Id: I18ffa06a694911567a7a690c7a7aa1e7b4cd85b9 Reviewed-on: http://git.am.freescale.net:8181/3031 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Wang Haiying-R54964 <Haiying.Wang@freescale.com> Reviewed-by: Ladouceur Jeffrey-R11498 <Jeffrey.Ladouceur@freescale.com> Reviewed-by: Thorpe Geoff-R01361 <Geoff.Thorpe@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-12qbman: unify qman and bman init in a sysinit_callHaiying Wang
and differ the initialization order for different partitions, e.g. the partition without qman/bman devices will wait till qman/bman devices are initialized or timeout setting expires. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Geoff Thorpe <Geoff.Thorpe@freescale.com> Change-Id: If4f1e213609d1a093c009330fbf206a5deb99c5a Reviewed-on: http://git.am.freescale.net:8181/2818 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-12fsl_qman: return ERANGE if querying fq np fields fails due to invalid FQIDHaiying Wang
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Change-Id: I403a97ef3dc0f8d52e83e3155e6df6e944b51e55 Reviewed-on: http://git.am.freescale.net:8181/2817 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Thorpe Geoff-R01361 <Geoff.Thorpe@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-12qbman: remove spurious includesGeoff Thorpe
Neither of these files requires these includes. Signed-off-by: Geoff Thorpe <Geoff.Thorpe@freescale.com> Change-Id: Ic1b14c959f246f4d9caf21516b11622cbc2ed4d3 Reviewed-on: http://git.am.freescale.net:8181/2416 Reviewed-by: Pledge Roy-R01356 <roy.pledge@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com> Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-12fsl_qbman: common portal lookup for usdpaa_irqGeoff Thorpe
The fsl_usdpaa.c code to find the portal that corresponds to a given mapped region already has to differentiate between qman and bman, so localise it there under a single function, rather than having fsl_usdpaa_irq.c distinguish as well and call qman and bman specific functions. Signed-off-by: Geoff Thorpe <Geoff.Thorpe@freescale.com> Change-Id: Ib8ac94e04fcaff76240cf7835056538ce67d9701 Reviewed-on: http://git.am.freescale.net:8181/2634 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Pledge Roy-R01356 <roy.pledge@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-12fsl_usdpaa: some cleanups in the IRQ codeGeoff Thorpe
* do wake_up_all() outside the spinlock * map_irq() had incomplete handling for the case where the ioctl cmd is called more than once on the same IRQ FD, and it isn't really needed anyway, so instead refuse this explicitly. * kernel pr_err()s as a result of user errors is not a good idea, so changing the relevant ones to pr_debug(). * remove some redundand white-space * removed some trailing ";"s from functions Signed-off-by: Geoff Thorpe <Geoff.Thorpe@freescale.com> Change-Id: Ieb2f4be392233a0f83333375e0ec91c9d592e748 Reviewed-on: http://git.am.freescale.net:8181/2633 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Pledge Roy-R01356 <roy.pledge@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-12fsl_usdpaa: fix warnings and white-spaceGeoff Thorpe
Also, the usdpaa_irq_handler() routine is made static. Signed-off-by: Geoff Thorpe <Geoff.Thorpe@freescale.com> Change-Id: I0bbfd15b0743194ff8fba4fee938f3d703148b1a Reviewed-on: http://git.am.freescale.net:8181/2632 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Pledge Roy-R01356 <roy.pledge@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
2013-07-12fsl_qbman: fix stockpile-debugging codeGeoff Thorpe
The check for concurrent access to unlocked stockpile state needs to avoid running checks when stockpiling is not enabled. Signed-off-by: Geoff Thorpe <Geoff.Thorpe@freescale.com> Change-Id: Id266c29e7b4432e796c41a1dc899fbee1718336c Reviewed-on: http://git.am.freescale.net:8181/3000 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Ladouceur Jeffrey-R11498 <Jeffrey.Ladouceur@freescale.com> Reviewed-by: Wang Haiying-R54964 <Haiying.Wang@freescale.com> Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>