- 02 Mar, 2019 40 commits
-
-
David S. Miller authored
Merge tag 'wireless-drivers-next-for-davem-2019-03-01' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next Kalle Valo says: ==================== wireless-drivers-next patches for 5.1 Last set of patches. A new hardware support for mt76 otherwise quite normal. Major changes: mt76 * add driver for MT7603E/MT7628 ath10k * more preparation for SDIO support wil6210 * support up to 20 stations in AP mode ==================== Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Ido Schimmel authored
When calculating the multipath hash for input routes the flow info is not available and therefore should not be used. Fixes: 24ba1440 ("route: Add multipath_hash in flowi_common to make user-define hash") Signed-off-by:
Ido Schimmel <idosch@mellanox.com> Cc: wenxu <wenxu@ucloud.cn> Acked-by:
wenxu <wenxu@ucloud.cn> Acked-by:
Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
David S. Miller authored
Antoine Tenart says: ==================== net: mvpp2: fixes and improvements This series aims to improve the Marvell PPv2 driver and to fix various issues we encountered while testing the ports in many different configurations. The series is based on top of Russell PPv2 phylink rework and improvement. I'm not sending a v2 of the previous fixes series as half the patches are not the same and lots of development happened in between. While this series contains fixes, it's sent to net-next as it is based on top of Russell patches that were merged into net-next. I'm also aiming at net-next as the series reworks critical paths of the PPv2 driver, such as the reset handling of various blocks, to let more weeks for users to tests and for possible fixes to be sent before it lands into a stable kernel version. The series is divided into three parts: - Patches 1 to 3 are cosmetic changes, sent alongside the series, as I saw these small issues while working on this. - Patches 5 to 8 are fixing (or improving) individual issues that we found while testing PPv2.1 and PPv2.2 ports while using various interfaces. Notable fixes are we support back RGMII interfaces (on both PPv2.1 and PPv2.2), as their support was broken by previous patches. We also reworked the RXQ computation as the RXQ assignment was not checking the maximum number of RXQ available, and was broken for PPv2.1. - As discussed in a previous fixes series, patches 9 to 15 rework the way blocks are set in reset in the PPv2 engine (plus related changes). There are four blocks we want to control the reset status: two MAC (GMAC and XLG MAC) and two PCS (MPCS and XPCS). The XLG MAC is used for 10G connexions and uses the MPCS or the XPCS depending on the mode used (10GKR / XAUI / RXAUI) and the GMAC is used for the other modes. The idea is to set all blocks in reset by default, and when not used, and to de-assert the reset only when a block is used. There are four cases to take in account: 1. Boot time: all four blocks should be put in reset, as we do not know their initial state (configured by the firmware/bootloader). 2. Link up: only the blocks used by a given mode should be put out of reset (eg. 10GKR uses the XLG MAC and the MPCS). 3. Mode reconfiguration: some ports may support mode reconfiguration, and switching between the GMAC and the XLG MAC (or between the two PCS). All blocks should be put in reset, and only the one used should be put out of reset. 4. Link down: all four blocks are put in reset. ==================== Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
This patch adds calls in the stop() helper to ensure both MACs and both PCS blocks are set in reset when the user manually sets a port down. This is done so that we have the exact same block reset states at boot time and when a port is set down. Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
This patch sets both the XPCS and MPCS blocks in reset when they aren't used. This is done both at boot time and when reconfiguring a port mode. The advantage now is that only the PCS used is set out of reset when the port is configured (10GKR uses the MCPS while RXAUI uses the XPCS). Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
This patch makes sure both PPv2 MACs (GMAC + XLG MAC) are set in reset while a port is reconfigured. This is done so that we make sure a MAC is in a reset state when not used, as only one of the two will be set out of reset after the port is configured properly. Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
This patch reworks the way the XLG MAC is set in reset: the XLG MAC is set in reset at probe time and taken out of this state only when used. The idea is to move forward a situation where only the blocks used are taken out of reset. This also has the effect to handle the GMAC and the XLG MAC in a similar way (the GMAC already is set in reset at boot time). Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
This patch force the XLG MAC link state in the phylink link_up() and link_down() helpers when not using in-band auto-negotiation. This mimics what's already done for the GMAC and follows what's advised in the phylink documentation. Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
This patch improves the XLG configuration function, to only update the XLG configuration register when a change is needed. This helps not writing over and over the same XLG configuration each time phylink request the MAC to be configured. This mimics the GMAC configuration function. Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
This patch modifies the port_disable() helper to always disable both the GMAC and the XLG MAC when called. At boot time we do not know of a port was enabled in the firmware/bootloader, and if so what mode was used (hence which of the two MACs was used). This also help in implementing a logic where all blocks are disabled when not used, and only enabled regarding the current mode used on a given port. Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
The GMAC configuration helper modifies values in the auto-negotiation register. Some of its values require the port to be forced down when modifying their values. This patches fixes the check made on the bit to be updated in this register, so that the port is forced down when needed. This fix cases where some of those parameters were updated, but not taken into account, such as when using RGMII interfaces. Fixes: d14e078f ("net: marvell: mvpp2: only reprogram what is necessary on mac_config") Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
The patch fixes the computation of RXQs being used by the PPv2 driver, which is set depending on the PPv2 engine version and the queue mode used. There are three cases: - PPv2.1: 1 RXQ per CPU. - PPV2.2 with MVPP2_QDIST_MULTI_MODE: 1 RXQ per CPU. - PPv2.2 with MVPP2_QDIST_SINGLE_MODE: 1 RXQ is shared between the CPUs. The PPv2 engine supports a maximum of 32 queues per port. This patch adds a check so that we do not overstep this maximum. It appeared the calculation was broken for PPv2.1 engines since f8c6ba84, as PPv2.1 ports ended up with a single RXQ while they needed 4. This patch fixes it. Fixes: f8c6ba84 ("net: mvpp2: use only one rx queue per port per CPU") Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
The Phylink validate function is the Marvell PPv2 driver makes a check on the GoP id. This is valid an has to be done when using PPv2.2 engines but makes no sense when using PPv2.1. The check done when using an RGMII interface makes sure the GoP id is not 0, but this breaks PPv2.1. Fixes it. Fixes: 0fb628f0 ("net: mvpp2: fix phylink handling of invalid PHY modes") Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
This patch adds a check on the PPv2 version in-use not to reconfigure the port mode when an interface is updated when using PPv2.1 as the functions called are PPv2.2 specific. Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
We had a check in the mvpp2_mac_link_down() function (called by phylink) to avoid disabling the port when link interrupts are used. It turned out the interrupt can still be used with the port disabled. We can thus remove this check. Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
Cosmetic patch fix the alignment of the MVPP2_GMAC_CONFIG_MII_SPEED macro definition. Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
The Marvell PPv2 port structure stores the GoP id of a given port. This information is specific to PPv2.2, but cannot be used by PPv2.1. Update its comment to denote this specificity. Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Antoine Tenart authored
This cosmetic patch fixes a typo made in a comment in the Marvell PPv2 Ethernet driver header. Signed-off-by:
Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Arjun Vynipadath authored
netif_carrier_off() should be called only after register_netdev(). Signed-off-by:
Arjun Vynipadath <arjun@chelsio.com> Signed-off-by:
Vishal Kulkarni <vishal@chelsio.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
David S. Miller authored
Arjun Vynipadath says: ==================== cxgb4/cxgb4vf: VF link state support This series of patches adds support for ndo_set_vf_link_state in cxgb4 driver. Patch 1 implements ndo_set_vf_link_state Patch 2 reverts the existing force_link_up behaviour for cxgb4vf driver. v2: - Using reverse christmas tree for variable declaration in Patch 1 - Patch 2 has no change ==================== Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Arjun Vynipadath authored
Reverting force link up changes since this behaviour can be achieved using VF link state feature. Reverts: commit 0913667a ("cxgb4vf: Forcefully link up virtual interfaces") Signed-off-by:
Arjun Vynipadath <arjun@chelsio.com> Signed-off-by:
Vishal Kulkarni <vishal@chelsio.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Arjun Vynipadath authored
Use ndo_set_vf_link_state to control the link states associated with the virtual interfaces. Signed-off-by:
Arjun Vynipadath <arjun@chelsio.com> Signed-off-by:
Vishal Kulkarni <vishal@chelsio.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Arjun Vynipadath authored
Some of these macros were conflicting with global namespace, hence prefixing them with CXGB4VF. Signed-off-by:
Arjun Vynipadath <arjun@chelsio.com> Signed-off-by:
Vishal Kulkarni <vishal@chelsio.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
YueHaibing authored
drivers/net/dsa/mt7530.c:649:3-4: Unneeded semicolon drivers/net/ethernet/cisco/enic/enic_clsf.c:35:2-3: Unneeded semicolon drivers/net/ethernet/faraday/ftgmac100.c:1640:2-3: Unneeded semicolon drivers/net/ethernet/mediatek/mtk_eth_soc.c:229:2-3: Unneeded semicolon drivers/net/usb/sr9700.c:437:2-3: Unneeded semicolon Remove unneeded semicolon. Generated by: scripts/coccinelle/misc/semicolon.cocci Signed-off-by:
YueHaibing <yuehaibing@huawei.com> Acked-by: Sean Wang <sean.wang@mediatek.com> for mt7530 and mtk_eth_soc Signed-off-by:
David S. Miller <davem@davemloft.net>
-
David S. Miller authored
Eric Dumazet says: ==================== net: 64bit support for SO_MAX_PACING_RATE 64bit kernels adopted 64bit type for sk_max_pacing_rate in linux-4.20 We can change how we implement SO_MAX_PACING_RATE socket option to support 64bit values to/from user space as well. ==================== Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Eric Dumazet authored
For legacy applications using 32bit variable, SO_MAX_PACING_RATE has to cap the returned value to 0xFFFFFFFF, meaning that rates above 34.35 Gbit are capped. This patch allows applications to read socket pacing rate at full resolution, if they provide a 64bit variable to store it, and the kernel is 64bit. Signed-off-by:
Eric Dumazet <edumazet@google.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Eric Dumazet authored
64bit kernels now support 64bit pacing rates. This commit changes setsockopt() to accept 64bit values provided by applications. Old applications providing 32bit value are still supported, but limited to the old 34Gbit limitation. Signed-off-by:
Eric Dumazet <edumazet@google.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Lucas Bates authored
By adding a check for an optional key/value pair to the test case data, individual test cases may be skipped to prevent tdc from aborting a test run due to setup or teardown failure. If a test case is skipped, it will still appear in the results output to allow for a consistent number of executed tests in each run. However, the test will be marked as skipped. This support for skipping extends to any plugins that may generate additional results for each executed test. Signed-off-by:
Lucas Bates <lucasb@mojatatu.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
David S. Miller authored
Ido Schimmel says: ==================== mlxsw: spectrum_acl: Split rehash work into chunks Jiri says: When rehash happens on a vregion with many rules and they are being migrated, it might take significant time to finish the job. During that time vregion->lock is taken which prevents rules from being added/deleted from the vregion. Aim of this patchset is to allow to interrupt migration of rules during rehash, reschedule and give chance for rules to be added/deleted. Then continue migration in another execution of scheduled work. ==================== Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Jiri Pirko authored
The return value is ignored anyway, so just return void. Signed-off-by:
Jiri Pirko <jiri@mellanox.com> Signed-off-by:
Ido Schimmel <idosch@mellanox.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Jiri Pirko authored
Store pointer to vchunk where the migration was interrupted, as well as ventry pointer to start from and to stop at (during rollback). This saved pointers need to be forgotten in case of ventries list or vchunk list changes, which is done by couple of "changed" helpers. Signed-off-by:
Jiri Pirko <jiri@mellanox.com> Signed-off-by:
Ido Schimmel <idosch@mellanox.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Jiri Pirko authored
Currently, migration of vregions with many entries may take long time during which insertions and removals of the rules are blocked due to wait to acquire vregion->lock. To overcome this, allow to interrupt and continue rehash work according to the set credits - number of rules to migrate. Signed-off-by:
Jiri Pirko <jiri@mellanox.com> Signed-off-by:
Ido Schimmel <idosch@mellanox.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Jiri Pirko authored
In order to simplify the code and to prepare it for interrupted/continued migration process, do the rollback in case of migration error as another call to mlxsw_sp_acl_tcam_vchunk_migrate_all(). It can be understood as "migrate all back". Signed-off-by:
Jiri Pirko <jiri@mellanox.com> Signed-off-by:
Ido Schimmel <idosch@mellanox.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Jiri Pirko authored
In preparations of interrupt/continue of rehash work, put the code that is done at the beginning/end of vchunk migrate function into separate functions. Signed-off-by:
Jiri Pirko <jiri@mellanox.com> Signed-off-by:
Ido Schimmel <idosch@mellanox.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Jiri Pirko authored
Put the this_is_rollback flag into rehash context struct in preparations for interrupt/continue of rehash work. Signed-off-by:
Jiri Pirko <jiri@mellanox.com> Signed-off-by:
Ido Schimmel <idosch@mellanox.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Jiri Pirko authored
Remove some of variables in function mlxsw_sp_acl_tcam_ventry_migrate() so the names are aligned with the rest of the code. Signed-off-by:
Jiri Pirko <jiri@mellanox.com> Signed-off-by:
Ido Schimmel <idosch@mellanox.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Jiri Pirko authored
Make the vchunk->chunk contain pointer of a new chunk we migrate to. In case of a rollback, it contains the original chunk. Signed-off-by:
Jiri Pirko <jiri@mellanox.com> Signed-off-by:
Ido Schimmel <idosch@mellanox.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Jiri Pirko authored
Make the vregion->region contain pointer of a new region we migrate to. In case of a rollback, it contains the original region. Signed-off-by:
Jiri Pirko <jiri@mellanox.com> Signed-off-by:
Ido Schimmel <idosch@mellanox.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Jiri Pirko authored
Push code from the beginning and end of function mlxsw_sp_acl_tcam_vregion_migrate() into rehash_start()/end() functions. Then all the things needed to be done before and after the actual migration process will be grouped together. Signed-off-by:
Jiri Pirko <jiri@mellanox.com> Signed-off-by:
Ido Schimmel <idosch@mellanox.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Jiri Pirko authored
In preparations for interrupt/continue of rehash work, put the code at the beginning/end of the rehash function into separate functions. Signed-off-by:
Jiri Pirko <jiri@mellanox.com> Signed-off-by:
Ido Schimmel <idosch@mellanox.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-