| Message ID | 20220905162132.2943088-1-colin.foster@in-advantage.com |
|---|---|
| Headers | show |
| Series | add support for VSC7512 control over SPI | expand |
On Mon, 05 Sep 2022, Colin Foster wrote: > There are a few Ocelot chips that contain the logic for this bus, but are > controlled externally. Specifically the VSC7511, 7512, 7513, and 7514. In > the externally controlled configurations these registers are not > memory-mapped. > > Add support for these non-memory-mapped configurations. > > Signed-off-by: Colin Foster <colin.foster@in-advantage.com> > Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > Acked-by: Jakub Kicinski <kuba@kernel.org> > --- > > v16 > * Add Andy Reviewed-by tag > > v15 > * No changes > > v14 > * Add Reviewed and Acked tags > > --- > drivers/net/mdio/mdio-mscc-miim.c | 42 +++++++++---------------------- > 1 file changed, 12 insertions(+), 30 deletions(-) Applied, thanks.
On Mon, 05 Sep 2022, Colin Foster wrote: > DEFINE_RES_ macros have been created for the commonly used resource types, > but not IORESOURCE_REG. Add the macro so it can be used in a similar manner > to all other resource types. > > Signed-off-by: Colin Foster <colin.foster@in-advantage.com> > Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > --- > > v16 > * Add Andy Reviewed-by tag > > v15 > * No changes > > v14 > * Add Reviewed tag > > --- > include/linux/ioport.h | 5 +++++ > 1 file changed, 5 insertions(+) Applied, thanks.
On Thu, Sep 08, 2022 at 02:22:56PM +0000, Vladimir Oltean wrote: > On Thu, Sep 08, 2022 at 10:40:48AM +0100, Lee Jones wrote: > > Applied, thanks. > > Hurray! > > Colin, what plans do you have for the rest of VSC7512 upstreaming? > Do you need Lee to provide a stable branch for networking to pull, so > you can continue development in this kernel release cycle, or do you > expect that there won't be dependencies and you can therefore just test > on linux-next? Yay! My plan was to start sending RFCs on the internal copper phys and get some feedback there. I assume there'll be a couple rounds and I don't expect to hit this next release (if I'm being honest). So I'll turn this question around to the net people: would a round or two of RFCs that don't cleanly apply to net-next be acceptable? Then I could submit a patch right after the next merge window? I've been dragging these patches around for quite some time, I can do it for another month :-)
On Thu, 08 Sep 2022, Colin Foster wrote: > On Thu, Sep 08, 2022 at 02:22:56PM +0000, Vladimir Oltean wrote: > > On Thu, Sep 08, 2022 at 10:40:48AM +0100, Lee Jones wrote: > > > Applied, thanks. > > > > Hurray! > > > > Colin, what plans do you have for the rest of VSC7512 upstreaming? > > Do you need Lee to provide a stable branch for networking to pull, so > > you can continue development in this kernel release cycle, or do you > > expect that there won't be dependencies and you can therefore just test > > on linux-next? > > Yay! > > My plan was to start sending RFCs on the internal copper phys and get > some feedback there. I assume there'll be a couple rounds and I don't > expect to hit this next release (if I'm being honest). > > So I'll turn this question around to the net people: would a round or > two of RFCs that don't cleanly apply to net-next be acceptable? Then I > could submit a patch right after the next merge window? I've been > dragging these patches around for quite some time, I can do it for > another month :-) Immutable branch now tested and pushed. See reply to cover-letter.
On Thu, 8 Sep 2022 08:04:13 -0700 Colin Foster wrote: > My plan was to start sending RFCs on the internal copper phys and get > some feedback there. I assume there'll be a couple rounds and I don't > expect to hit this next release (if I'm being honest). > > So I'll turn this question around to the net people: would a round or > two of RFCs that don't cleanly apply to net-next be acceptable? Then I > could submit a patch right after the next merge window? I've been > dragging these patches around for quite some time, I can do it for > another month :-) FWIW RFC patches which don't apply cleanly seem perfectly fine to me. Perhaps note the base in the cover letter for those who may want to test them. We can pull Lee's branch (thanks!) if it turns out the code is ready long before the MW.
The patch set in general is to add support for the VSC7512, and eventually the VSC7511, VSC7513 and VSC7514 devices controlled over SPI. Specifically this patch set enables pinctrl, serial gpio expander access, and control of an internal and an external MDIO bus. I have mentioned previously: The hardware setup I'm using for development is a beaglebone black, with jumpers from SPI0 to the microchip VSC7512 dev board. The microchip dev board has been modified to not boot from flash, but wait for SPI. An ethernet cable is connected from the beaglebone ethernet to port 0 of the dev board. Network functionality will be included in a future patch set. The device tree I'm using is included in the documentation, so I'll not include that in this cover letter. I have exported the serial GPIOs to the LEDs, and verified functionality via "echo heartbeat > sys/class/leds/port0led/trigger" / { vscleds { compatible = "gpio-leds"; vscled@0 { label = "port0led"; gpios = <&sgpio_out1 0 0 GPIO_ACTIVE_LOW>; default-state = "off"; }; vscled@1 { label = "port0led1"; gpios = <&sgpio_out1 0 1 GPIO_ACTIVE_LOW>; default-state = "off"; }; [ ... ] }; }; I verified module functionality with modprobe ocelot-soc; modprobe pinctrl-ocelot; modprobe pinctrl-microchip-sgpio; I only have hardware to test the last patch, so any testers are welcome. I've been extra cautious about the ocelot_regmap_from_resource helper function, both before and after the last patch. I accidentally broke it in the past and would like to avoid doing so again. RFC history: v16 * Add reviewed-by tags (patches 1-6) * Utilize resource_size() (patch 8/8) * One more round of missed includes (patch 8/8) * Remove pinctrl-ocelot module patch, which was applied in v6.0-rc1 v15 * Add missed includes * Fix punctuation and function convention inside comments * Utilize spi_message_init_with_transfers() instead of spi_message_add_tail() * Remove unnecessary "< 0" comparisons * Utilize HZ_PER_MHZ instead of magic numbers v14 * Add header guards to include/linux/mfd/ocelot.h and drivers/mfd/ocelot.h * Lines extended to 100 chars (patch 9/9) * Remove unnecessary "dev" and "spi" elements from ocelot_ddata structure * Add doc comments for ocelot_ddata * Add Reviewed and Acked tags * Submit to MFD instead of net-next v13 * Suggestions from Andy for code cleanup, missed includes, forward declarations, module names. * Fix x86 allmodconfig build * MFD module name is now ocelot-soc * Add module names to Kconfig for pinctrl changes v12 * Suggestions from Vladimir, Andy, Randy, and Rob. Thanks as always! * Utilize dev_get_regmap to clean up interfaces * MFD_OCELOT can be a module v11 * Suggestions from Rob and Andy. Thanks! * Add pinctrl module functionality back and fixing those features * Fix aarch64 compiler error v10 * Fix warning by removing unused function v9 * Submitting as a PATCH instead of an RFC * Remove switch functionality - will be a separate patch set * Remove Kconfig tristate module options * Another round of suggestions from Lee, Vladimir, and Andy. Many thanks! * Add documentation * Update maintainers v8 * Applied another round of suggestions from Lee and Vladimir * Utilize regmap bus reads, which speeds bulk transfers up by an order of magnitude * Add two additional patches to utilize phylink_generic_validate * Changed GPL V2 to GPL in licenses where applicable (checkpatch) * Remove initial hsio/serdes changes from the RFC v7 * Applied as much as I could from Lee and Vladimir's suggestions. As always, the feedback is greatly appreciated! * Remove "ocelot_spi" container complication * Move internal MDIO bus from ocelot_ext to MFD, with a devicetree change to match * Add initial HSIO support * Switch to IORESOURCE_REG for resource definitions v6 * Applied several suggestions from the last RFC from Lee Jones. I hope I didn't miss anything. * Clean up MFD core - SPI interaction. They no longer use callbacks. * regmaps get registered to the child device, and don't attempt to get shared. It seems if a regmap is to be shared, that should be solved with syscon, not dev or mfd. v5 * Restructured to MFD * Several commits were split out, submitted, and accepted * pinctrl-ocelot believed to be fully functional (requires commits from the linux-pinctrl tree) * External MDIO bus believed to be fully functional v4 * Functional * Device tree fixes * Add hooks for pinctrl-ocelot - some functionality by way of sysfs * Add hooks for pinctrl-microsemi-sgpio - not yet fully functional * Remove lynx_pcs interface for a generic phylink_pcs. The goal here is to have an ocelot_pcs that will work for each configuration of every port. v3 * Functional * Shared MDIO transactions routed through mdio-mscc-miim * CPU / NPI port enabled by way of vsc7512_enable_npi_port / felix->info->enable_npi_port * NPI port tagging functional - Requires a CPU port driver that supports frames of 1520 bytes. Verified with a patch to the cpsw driver v2 * Near functional. No CPU port communication, but control over all external ports * Cleaned up regmap implementation from v1 v1 (accidentally named vN) * Initial architecture. Not functional * General concepts laid out Colin Foster (8): mfd: ocelot: add helper to get regmap from a resource net: mdio: mscc-miim: add ability to be used in a non-mmio configuration pinctrl: ocelot: add ability to be used in a non-mmio configuration pinctrl: microchip-sgpio: allow sgpio driver to be used as a module pinctrl: microchip-sgpio: add ability to be used in a non-mmio configuration resource: add define macro for register address resources dt-bindings: mfd: ocelot: add bindings for VSC7512 mfd: ocelot: add support for the vsc7512 chip via spi .../devicetree/bindings/mfd/mscc,ocelot.yaml | 160 ++++++++++ MAINTAINERS | 7 + drivers/mfd/Kconfig | 21 ++ drivers/mfd/Makefile | 3 + drivers/mfd/ocelot-core.c | 161 ++++++++++ drivers/mfd/ocelot-spi.c | 299 ++++++++++++++++++ drivers/mfd/ocelot.h | 49 +++ drivers/net/mdio/mdio-mscc-miim.c | 42 +-- drivers/pinctrl/Kconfig | 5 +- drivers/pinctrl/pinctrl-microchip-sgpio.c | 14 +- drivers/pinctrl/pinctrl-ocelot.c | 16 +- include/linux/ioport.h | 5 + include/linux/mfd/ocelot.h | 62 ++++ 13 files changed, 795 insertions(+), 49 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/mscc,ocelot.yaml create mode 100644 drivers/mfd/ocelot-core.c create mode 100644 drivers/mfd/ocelot-spi.c create mode 100644 drivers/mfd/ocelot.h create mode 100644 include/linux/mfd/ocelot.h