- 04 Mar, 2020 40 commits
-
-
Jakub Kicinski authored
Core already zeroes out the struct ethtool_coalesce structure, drivers don't have to set every field to 0 individually. Signed-off-by:
Jakub Kicinski <kuba@kernel.org> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
David S. Miller authored
Vladimir Oltean says: ==================== Wire up Ocelot tc-flower to Felix DSA This series is a proposal on how to wire up the tc-flower callbacks into DSA. The example taken is the Microchip Felix switch, whose core implementation is actually located in drivers/net/ethernet/mscc/. The proposal is largely a compromise solution. The DSA middle layer handles just enough to get to the interesting stuff (FLOW_CLS_REPLACE, FLOW_CLS_DESTROY, FLOW_CLS_STATS), but also thin enough to let drivers decide what filter keys and actions they support without worrying that the DSA middle layer will grow exponentially. I am far from being an expert, so I am asking reviewers to please voice your opinion if you think it can be done differently, with better results. The bulk of the work was actually refactoring the ocelot driver enough to allow the VCAP (Versatile Content-Aware Processor) code for vsc7514 and the vsc9959 switch cores to live together. Flow block offloads have not been tested yet, only filters attached to a single port. It might be as simple as replacing ocelot_ace_rule_create with something smarter, it might be more complicated, I haven't tried yet. I should point out that the tc-matchall filter offload is not implemented in the same manner in current mainline. Florian has already went all the way down into exposing actual per-action callbacks, starting with port mirroring. Because currently only mirred is supported by this DSA mid layer, everything else will return -EOPNOTSUPP. So even though ocelot supports matchall (aka port-based) policers, we don't have a call path to call into them. Personally I think that this is not going to scale for tc-matchall (there may be policers, traps, drops, VLAN retagging, etc etc), and that we should consider whether further matchall filter/action combinations should be just passed on to drivers with no interpretation instead. As for the existing mirroring callbacks in DSA, they can either be kept as-is, or replaced with simple accessors to TC_CLSMATCHALL_REPLACE and TC_CLSMATCHALL_DESTROY, just like for flower, and drivers which currently implement the port mirroring callbacks will need to have some extra "if" conditions now, in order for them to call their port mirroring implementations. ==================== Signed-off-by: -
Vladimir Oltean authored
Export the cls_flower methods from the ocelot driver and hook them up to the DSA passthrough layer. Tables for the VCAP IS2 parameters, as well as half key packing (field offsets and lengths) need to be defined for the VSC9959 core, as they are different from Ocelot, mainly due to the different port count. Signed-off-by:
Vladimir Oltean <vladimir.oltean@nxp.com> Signed-off-by:
-
Vladimir Oltean authored
Due to the immense variety of classification keys and actions available for tc-flower, as well as due to potentially very different DSA switch capabilities, it doesn't make a lot of sense for the DSA mid layer to even attempt to interpret these. So just pass them on to the underlying switch driver. DSA implements just the standard boilerplate for binding and unbinding flow blocks to ports, since nobody wants to deal with that. Signed-off-by:
Florian Fainelli <f.fainelli@gmail.com> Signed-off-by:
-
Vladimir Oltean authored
Remove the definitions for the VCAP IS2 table from ocelot_ace.c, since it is specific to VSC7514. The VSC9959 VCAP IS2 table supports more rules (1024 instead of 64) and has a different width for the action (89 bits instead of 99). Signed-off-by:
-
Vladimir Oltean authored
The Felix driver is now using its own PHYLINK instance, not calling into ocelot_adjust_link. So the port_pcs_init function pointer is an unnecessary indirection. Remove it. Signed-off-by:
Horatiu Vultur <horatiu.vultur@microchip.com> Reviewed-by:
Allan W. Nielsen <allan.nielsen@microchip.com> Signed-off-by:
-
Vladimir Oltean authored
The IGR_PORT_MASK key width is different between the 11-port VSC7514 and the 6-port VSC9959 switches. And since IGR_PORT_MASK is one of the first fields of a VCAP key entry, it means that all further field offset/length pairs are shifted between the 2. The ocelot driver performs packing of VCAP half keys with the help of some preprocessor macros: - A set of macros for defining the HKO (Half Key Offset) and HKL (Half Key Length) of each possible key field. The offset of each field is defined as the sum between the offset and the sum of the previous field. - A set of accessors on top of vcap_key_set for shorter (aka less typing) access to the HKO and HKL of each key field. Since the field offsets and lengths are different between switches, defining them through the preprocessor isn't going to fly. So introduce a structure holding (offset, length) pairs and instantiate it in ocelot_board.c for VSC7514. In a future patch, a similar structure will be instantiated in felix_vsc9959.c for NXP LS1028A. The accessors also need to go. They are based on macro name concatenation, which is horrible to understand and follow. Signed-off-by:
-
Vladimir Oltean authored
This is a cosmetic patch that makes the name of the driver private variable be used uniformly in ocelot_ace.c as in the rest of the driver. Signed-off-by:
-
Vladimir Oltean authored
There is no need to check the "ret" variable, one can just return the function result back to the caller. Signed-off-by:
-
Vladimir Oltean authored
The "ocelot_rule" variable name is both annoyingly long trying to distinguish itself from struct flow_rule *rule = flow_cls_offload_flow_rule(f), as well as actually different from the "ace" variable name which is used all over the place in ocelot_ace.c and is referring to the same structure. And the "rule" variable name is, confusingly, different from f->rule, but sometimes one has to look up to the beginning of the function to get an understanding of what structure type is actually being handled. So let's use the "ace" name wherever possible ("Access Control Entry"). Signed-off-by: -
Vladimir Oltean authored
The ocelot tc-flower offload binds a second flow block callback (apart from the one for matchall) just because it uses a different block private structure (ocelot_port_private for matchall, ocelot_port_block for flower). But ocelot_port_block just appears to be boilerplate, and doesn't help with anything in particular at all, it's just useless glue between the (global!) struct ocelot_acl_block *block pointer, and a per-netdevice struct ocelot_port_private *priv. So let's just simplify that, and make struct ocelot_port_private be the private structure for the block offload. This makes us able to use the same flow callback as in the case of matchall. This also reveals that the struct ocelot_acl_block *block is used rather strangely, as mentioned above: it is defined globally, allocated at probe time, and freed at unbind time. So just move the structure to the main ocelot structure, which gives further opportunity for simplification. Also get rid of backpointers from struct ocelot_acl_block and struct ocelot_ace_rule back to struct ocelot, by reworking the function prototypes, where necessary, to use a more DSA-friendly "struct ocelot *ocelot, int port" format. And finally, remove the debugging prints that were added during development, since they provide no useful information at this point. Signed-off-by:
-
Yangbo Lu authored
The ocelot_ace_rule is port specific now. Make it flexible to be able to support multiple ports too. Signed-off-by:
Yangbo Lu <yangbo.lu@nxp.com> Signed-off-by:
-
David S. Miller authored
Leon Romanovsky says: ==================== Clean driver, module and FW versions This is second batch of the series which removes various static versions in favour of globaly defined Linux kernel version. The first part with better cover letter can be found here https://lore.kernel.org/lkml/20200224085311.460338-1-leon@kernel.org The code is based on 68e2c376 ("Merge branch 'hsr-several-code-cleanup-for-hsr-module'") and WIP branch is https://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git/log/?h=ethtool ==================== Signed-off-by:
-
Leon Romanovsky authored
Rely on ethtool to properly present the fact that FW and bus are not available for the gianfar driver. Signed-off-by:
Leon Romanovsky <leonro@mellanox.com> Signed-off-by:
-
Leon Romanovsky authored
Rely on ethtool to properly present the fact that FW is not available for the ucc_geth driver. Signed-off-by:
-
Leon Romanovsky authored
Rely on ethtool to properly present the fact that FW is not available for the dpaa driver. Signed-off-by:
-
Leon Romanovsky authored
There is no need to set static versions because linux kernel is released all together with same version applicable to the whole code base. Signed-off-by:
-
Leon Romanovsky authored
Use general linux kernel version instead of static driver version. Signed-off-by:
-
Leon Romanovsky authored
Use general linux kernel version instead of static driver version. Signed-off-by:
-
Leon Romanovsky authored
Remove driver version in favor of general linux kernel version. Signed-off-by:
-
Leon Romanovsky authored
Remove static driver version from the ethtool output. Signed-off-by:
-
Leon Romanovsky authored
Convert dlink drivers to use linux kernel version. Signed-off-by:
-
Leon Romanovsky authored
There is no need in assignments of driver version while linux kernel is released as a monolith where the whole code base is aligned to one general version. Signed-off-by:
-
Leon Romanovsky authored
Rely on global linux kernel version instead of static value. Signed-off-by:
-
Leon Romanovsky authored
Use default ethtool version instead of static variant. Signed-off-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
-
Leon Romanovsky authored
There is no need to overwrite global linux kernel version. Signed-off-by:
-
Leon Romanovsky authored
There is no need in static driver version, use global linux kernel version instead. Signed-off-by:
-
Leon Romanovsky authored
There is no need to set N/A if FW is not available. Signed-off-by:
-
Leon Romanovsky authored
Clean the code related to various versions: driver and module. Signed-off-by:
-
Leon Romanovsky authored
There is no need to set N/A for the ethtool fields. Signed-off-by:
-
Leon Romanovsky authored
Delete driver and module versions in favor of global linux kernel variant. Signed-off-by:
-
Leon Romanovsky authored
Size of LIQUIDIO_PACKAGE is 0 and it means that checks of package version never worked, delete dead code. Fixes: 32581245 ("liquidio: Consolidate common functionality") Signed-off-by:
-
Leon Romanovsky authored
Drop driver version in favor of global to linux kernel version. Signed-off-by:
-
Leon Romanovsky authored
Remove driver and module version in favor of default one. Signed-off-by:
-
Leon Romanovsky authored
There is no need to explicitly set N/A if FW not available. Signed-off-by:
-
Leon Romanovsky authored
Use linux kernel version for ethtool and module versions. Signed-off-by:
-
David S. Miller authored
Bjorn Andersson says: ==================== net: qrtr: Nameserver fixes The need to respond to the HELLO message from the firmware was lost in the translation from the user space implementation of the nameserver. Fixing this also means we can remove the FIXME related to launching the ns. ==================== Signed-off-by: -
Bjorn Andersson authored
The 2 second delay before calling qrtr_ns_init() meant that the remote processors would register as endpoints in qrtr and the say_hello() call would therefor broadcast the outgoing HELLO to them. With the HELLO handshake corrected this delay is no longer needed. Reviewed-by:
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Tested-by:
Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by:
-
Bjorn Andersson authored
Lost in the translation from the user space implementation was the detail that HELLO mesages must be exchanged between each node pair. As such the incoming HELLO must be replied to. Similar to the previous implementation no effort is made to prevent two Linux boxes from continuously sending HELLO messages back and forth, this is left to a follow up patch. say_hello() is moved, to facilitate the new call site. Fixes: 0c2204a4 ("net: qrtr: Migrate nameservice to kernel from userspace") Reviewed-by:
-
Gustavo A. R. Silva authored
The current codebase makes use of the zero-length array language extension to the C90 standard, but the preferred mechanism to declare variable-length types such as these ones is a flexible array member[1][2], introduced in C99: struct foo { int stuff; struct boo array[]; }; By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last in the structure, which will help us prevent some kind of undefined behavior bugs from being inadvertently introduced[3] to the codebase from now on. Also, notice that, dynamic memory allocations won't be affected by this change: "Flexible array members have incomplete type, and so the sizeof operator may not be applied. As a quirk of the original implementation of zero-length arrays, sizeof evaluates to zero."[1] This issue was found with the help of Coccinelle. [1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html [2] https://github.com/KSPP/linux/issues/21 [3] commit 76497732 ("cxgb3/l2t: Fix undefined behaviour") Signed-off-by:Gustavo A. R. Silva <gustavo@embeddedor.com> Reviewed-by:
Jiri Pirko <jiri@mellanox.com> Signed-off-by:
-
