summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mvpp2x: fixupsmcbinRussell King5 days1-9/+18
| | | | Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* Dont-Auto-BuildRussell King5 days1-0/+1
| | | | This commit is to tell the 0-day builder to avoid building this branch.
* usb: host: xhci: mvebu: add reset on resume quirkOfer Heifetz5 days1-0/+10
| | | | | | | | | | | | The resume operation of mvebu xHCI host have some issues, so The XHCI_RESET_ON_RESUME quirk is added for it. Signed-off-by: Ofer Heifetz <oferh@marvell.com> Tested-by: Nadav Haklai <nadavh@marvell.com> Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com> Reviewed-by: Lior Amsalem <alior@marvell.com> Tested-by: Lior Amsalem <alior@marvell.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* arm64: hacks and debugging from initial mcbin bringupRussell King5 days1-0/+127
| | | | Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* arm64: dts: marvell: mcbin: workaround wrongly wired i2c1 busRussell King5 days3-2/+29
| | | | | | | | The I2C1 bus on early mcbin hardware is mis-wired, swapping SCL and SDA. Work around this by using the i2c-gpio driver instead. XXX Caught early and this commit should be removed for mainline. XXX Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* arm64: switch to using in-band negotiation with mvpp2x driverRussell King5 days2-1/+5
| | | | Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* arm64: dts: mcbin: support 2W SFP modulesRussell King5 days1-0/+3
| | | | | | Allow the SFP cages to be used with 2W SFP modules. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* arm64: dts: marvell: mcbin: use sfp+ compatible for sfp+ slotsRussell King5 days1-2/+2
| | | | Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* arm64: dts: marvell: mcbin: add pinctrls for 10G PHYsRussell King5 days1-0/+38
| | | | | | Add the pinctrl settings and interrupts for the 10G PHYs. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* arm64: dts: marvell: mcbin: add mvpp2x ethernet supportRussell King5 days3-0/+181
| | | | | | | | Add support for the Marvell MVPP2x driver for Macchiatobin. The mainline MVPP2 driver can be selected by defining MCBIN_USE_MVPP2_DRIVER. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* arm64: dts: marvell: cp110: add Marvell mvpp2x ethernetRussell King5 days1-0/+78
| | | | | | Add ethernet controllers on CP110. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* net: marvell: mvpp2x: switch to 10GBASE-RRussell King5 days3-5/+40
| | | | | | Use the proper 10GBASE-R phy interface mode. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* net: marvell: mvpp2x: update mac_link_up() methodRussell King5 days1-1/+3
| | | | | | Update mvpp2x mac_link_up() for the changes to phylink. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* net: marvell: mvpp2x: add eee supportRussell King5 days3-0/+42
| | | | | | Add EEE support to the Marvell PP2x ethernet driver. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* net: marvell: mvpp2x: convert to gmacRussell King5 days4-188/+23
|
* net: mvgmac: support different hw versionsRussell King5 days3-13/+113
| | | | Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* net: mvneta: split out GMACRussell King5 days5-261/+438
| | | | | | | Split out the code handling the GMAC from the rest of the driver. This block appears to be shared amongst several revisions of the IP. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* arm64: dts: marvell: mcbin: wire up fan control as a gpio pinRussell King5 days1-1/+4
| | | | | | | This at least allows userspace to control whether the fans run or not. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* arm64: dts: marvell: mcbin: add remainder of pinctrlsRussell King5 days1-1/+14
| | | | | | | Add several pinctrls for functions brought out to connectors but not yet usable with the core DT description. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
* arm64: dts: marvell: mcbin: add comments about unused MPP pinsRussell King5 days1-0/+2
| | | | | | Comment about the use of currently unconfigured MPP pins. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
*-. Merge branches 'mvebu', 'mvpp2' and 'phy' into mcbinRussell King5 days48-862/+2477
|\ \
| | * net: phylink: add pcs operations [*experimental*]phyRussell King5 days2-22/+65
| | | | | | | | | | | | | | | | | | | | | Add a separate set of PCS operations, which MAC drivers can use to couple phylink with their associated MAC PCS layer. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: phylink: rename 'ops' to 'mac_ops'Russell King5 days1-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | Rename the bland 'ops' member of struct phylink to be a more descriptive 'mac_ops' - this is necessary as we're about to introduce another set of operations. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * doc: sfp-phylink: correct code indentationRussell King5 days1-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | Using vim to edit the phylink documentation reveals some mistakes due to the "invisible" pythonesque white space indentation that can't be seen with other editors. Fix it. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * arm64: dts: configure Macchiatobin 10G PHY LED modesRussell King5 days1-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure the Macchiatobin 10G PHY LED modes to correct their polarity. We keep the existing LED behaviours, but switch their polarity to reflect how they are connected. Tweak the LED modes as well to be: left: off = no link solid green = RJ45 link up (not SFP+ cage) flash green = traffic right: off = no link solid green = 10G solid yellow = 1G flash green = 100M flash yellow = 10M Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: phy: marvell10g: add support for configuring LEDsRussell King5 days1-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for configuring the LEDs. Macchiatobin has an oddity in that the left LED goes out when the cable is connected, and flashes when there's link activity. This is because the reset default for the LED outputs assume that the LED is connected to supply, not to ground. Add support for configuring the LED modes and polarities. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * dt-bindings: net: add dt bindings for marvell10g driverRussell King5 days1-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | Add a DT bindings document for the Marvell 10G driver, which will augment the generic ethernet PHY binding by having LED mode configuration. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: mii: add linkmode_adv_to_mii_adv_x()Russell King5 days1-0/+20
| | | | | | | | | | | | | | | | | | | | | Add a helper to convert a linkmode advertisement to a clause 37 advertisement value for 1000base-x and 2500base-x. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: mii: convert mii_lpa_to_ethtool_lpa_x() to linkmode variantRussell King5 days1-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | Add a LPA to linkmode decoder for 1000BASE-X protocols; this decoder only provides the modify semantics similar to other such decoders. This replaces the unused mii_lpa_to_ethtool_lpa_x() helper. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: sfp: display SFP module information *not for mainline*Russell King5 days4-11/+349
| | | | | | | | | | | | | | | | | | | | | Display SFP module information verbosely, splitting the generic parts into a separate file. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * net: sfp: add sfp+ compatible *not for mainline*Russell King5 days1-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add a compatible for SFP+ cages. SFP+ cages are backwards compatible, but the ethernet device behind them may not support the slower speeds of SFP modules. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: sfp: add debugfs supportRussell King5 days1-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add debugfs support to SFP so that the internal state of the SFP state machines and hardware signal state can be viewed from userspace, rather than having to compile a debug kernel to view state state transitions in the kernel log. The 'state' output looks like: Module state: empty Module probe attempts: 0 0 Device state: up Main state: down Fault recovery remaining retries: 5 PHY probe remaining retries: 12 moddef0: 0 rx_los: 1 tx_fault: 1 tx_disable: 1 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: sfp: add support for cooled SFP+ transceiversRussell King5 days1-6/+9
| | | | | | | | | | | | | | | | | | | | | Cooled SFP+ transceivers need a longer initialisation (startup) time. Select the initialisation time depending on the cooled option bit. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: phy: make phy_error() report which PHY has failedRussell King5 days1-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phy_error() is called from phy_interrupt() or phy_state_machine(), and uses WARN_ON() to print a backtrace. The backtrace is not useful when reporting a PHY error. However, a system may contain multiple ethernet PHYs, and phy_error() gives no clue which one caused the problem. Replace WARN_ON() with a call to phydev_err() so that we can see which PHY had an error, and also inform the user that we are halting the PHY. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: phy: marvell10g: allow PHY to probe without firmwareRussell King5 days1-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | Allow the PHY to probe when there is no firmware, but do not allow the link to come up by forcing the PHY state to PHY_HALTED in a similar way to phy_error(). Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: phy: provide phy driver start/stop hooksRussell King5 days2-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide phy driver start/stop hooks so that the PHY driver knows when the network driver is starting or stopping. This will be used for the Marvell 10G driver so that we can sanely refuse to start if the PHYs firmware is not present, and also so that we can sanely support SFPs behind the PHY. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: mvpp2: use resolved link config in mac_link_up()Russell King5 days1-36/+47
| | | | | | | | | | | | | | | | | | | | | Convert the Marvell mvpp2 ethernet driver to use the finalised link parameters in mac_link_up() rather than the parameters in mac_config(). Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: mvneta: use resolved link config in mac_link_up()Russell King5 days1-17/+38
| | | | | | | | | | | | | | | | | | | | | Convert the Marvell mvneta ethernet driver to use the finalised link parameters in mac_link_up() rather than the parameters in mac_config(). Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: macb: use resolved link config in mac_link_up()Russell King5 days2-20/+27
| | | | | | | | | | | | | | | | | | | | | Convert the macb ethernet driver to use the finalised link parameters in mac_link_up() rather than the parameters in mac_config(). Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: dpaa2-mac: use resolved link config in mac_link_up()Russell King5 days2-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the DPAA2 ethernet driver to use the finalised link parameters in mac_link_up() rather than the parameters in mac_config(), which are more suited to the needs of the DPAA2 MC firmware than those available via mac_config(). Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: axienet: use resolved link config in mac_link_up()Russell King5 days1-19/+19
| | | | | | | | | | | | | | | | | | | | | Convert the Xilinx AXI ethernet driver to use the finalised link parameters in mac_link_up() rather than the parameters in mac_config(). Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: mv88e6xxx: use resolved link config in mac_link_up()Russell King5 days1-16/+59
| | | | | | | | | | | | | | | | | | | | | Use the resolved link configuration to set the MAC configuration when mac_link_up() for non-internal-PHY ports. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: dsa: propagate resolved link config via mac_link_up()Russell King5 days9-9/+26
| | | | | | | | | | | | | | | | | | | | | Propagate the resolved link configuration down via DSA's phylink_mac_link_up() operation to allow split PCS/MAC to work. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: phylink: propagate resolved link config via mac_link_up()Russell King5 days12-44/+109
| | | | | | | | | | | | | | | | | | | | | Propagate the resolved link parameters via the mac_link_up() call for MACs that do not automatically track their PCS state. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: phy: marvell*: add support for hw resolved pause modesRussell King5 days2-2/+45
| | | | | | | | | | | | | | | | | | | | | Support reporting the hardware resolved pause enablement states via phylib, overriding our software implementation. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: phy: add resolved pause supportRussell King5 days2-0/+15
| | | | | | | | | | | | | | | | | | | | | Allow phylib drivers to pass the hardware-resolved pause state to MAC drivers, rather than using the software-based pause resolution code. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: phy: marvell: don't interpret PHY status unless resolvedRussell King5 days1-0/+5
| | | | | | | | | | | | | | | | | | | | | Don't attempt to interpret the PHY specific status register unless the PHY is indicating that the resolution is valid. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: phy: marvell10g: read copper results from CSSR1Russell King5 days1-52/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | Read the copper autonegotiation results from the copper specific status register, rather than decoding the advertisements. Reading what the link is actually doing will allow us to support downshift modes. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: phy: allow bcm84881 to be a moduleRussell King5 days1-2/+2
| | | | | | | | | | | | | | | | | | | | | Now that the phylib module loading issue has been resolved, we can allow this PHY driver to be built as a module. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| | * net: phylink: clarify flow control settings in documentationRussell King6 days1-8/+18
| | | | | | | | | | | | | | | | | | | | | Clarify the expected flow control settings operation in the phylink documentation for each negotiation mode. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>