From: David S. Miller Date: Fri, 22 May 2020 21:08:29 +0000 (-0700) Subject: Merge branch 'net-atlantic-QoS-implementation' X-Git-Tag: microblaze-v5.10~660^2~139 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=b79f91f15721f3378e618c690c7ad9a477cd7900;p=linux-2.6-microblaze.git Merge branch 'net-atlantic-QoS-implementation' Igor Russkikh says: ==================== net: atlantic: QoS implementation This patch series adds support for mqprio rate limiters and multi-TC: * max_rate is supported on both A1 and A2; * min_rate is supported on A2 only; This is a joint work of Mark and Dmitry. To implement this feature, a couple of rearrangements and code improvements were done, in areas of TC/ring management, allocation control, etc. One of the problems we faced is conflicting ptp functionality, which consumes a whole traffic class due to hardware limitations. Patches below have a more detailed description on how PTP and multi-TC co-exist right now. v2: * accommodated review comments (-Wmissing-prototypes and -Wunused-but-set-variable findings); * added user notification in case of conflicting multi-TC<->PTP configuration; * added automatic PTP disabling, if a conflicting configuration is detected; * removed module param, which was used for PTP disabling in v1; v1: https://patchwork.ozlabs.org/cover/1294380/ ==================== Acked-by: Jakub Kicinski Signed-off-by: David S. Miller --- b79f91f15721f3378e618c690c7ad9a477cd7900