| Message ID | 20220815005553.1450359-1-colin.foster@in-advantage.com |
|---|---|
| Headers | show |
| Series | add support for VSC7512 control over SPI | expand |
Add Lee - My apologies, it seems like you got a new email address and I didn't copy it on this series. On Sun, Aug 14, 2022 at 05:55:53PM -0700, Colin Foster wrote: > The VSC7512 is a networking chip that contains several peripherals. Many of > these peripherals are currently supported by the VSC7513 and VSC7514 chips, > but those run on an internal CPU. The VSC7512 lacks this CPU, and must be > controlled externally. > > Utilize the existing drivers by referencing the chip as an MFD. Add support > for the two MDIO buses, the internal phys, pinctrl, and serial GPIO. > > Signed-off-by: Colin Foster <colin.foster@in-advantage.com> > Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> > --- > > v16 > * Includes fixups: > * ocelot-core.c add includes device.h, export.h, iopoll.h, ioport,h > * ocelot-spi.c add includes device.h, err.h, errno.h, export.h, > mod_devicetable.h, types.h > * Move kconfig.h from ocelot-spi.c to ocelot.h > * Remove unnecessary byteorder.h Something is going on that I don't fully understand with <asm/byteorder.h>. I don't quite see how ocelot-core is throwing all sorts of errors in x86 builds now: https://patchwork.hopto.org/static/nipa/667471/12942993/build_allmodconfig_warn/stderr Snippet from there: /home/nipa/nipa/tests/patch/build_32bit/build_32bit.sh: line 21: ccache gcc: command not found ../drivers/mfd/ocelot-spi.c: note: in included file (through ../include/linux/bitops.h, ../include/linux/kernel.h, ../arch/x86/include/asm/percpu.h, ../arch/x86/include/asm/current.h, ../include/linux/sched.h, ...): ../arch/x86/include/asm/bitops.h:66:1: warning: unreplaced symbol 'return' ../drivers/mfd/ocelot-spi.c: note: in included file (through ../include/linux/bitops.h, ../include/linux/kernel.h, ../arch/x86/include/asm/percpu.h, ../arch/x86/include/asm/current.h, ../include/linux/sched.h, ...): ../include/asm-generic/bitops/generic-non-atomic.h:29:9: warning: unreplaced symbol 'mask' ../include/asm-generic/bitops/generic-non-atomic.h:30:9: warning: unreplaced symbol 'p' ../include/asm-generic/bitops/generic-non-atomic.h:32:10: warning: unreplaced symbol 'p' ../include/asm-generic/bitops/generic-non-atomic.h:32:16: warning: unreplaced symbol 'mask' ../include/asm-generic/bitops/generic-non-atomic.h:27:1: warning: unreplaced symbol 'return' ../drivers/mfd/ocelot-spi.c: note: in included file (through ../arch/x86/include/asm/bitops.h, ../include/linux/bitops.h, ../include/linux/kernel.h, ../arch/x86/include/asm/percpu.h, ../arch/x86/include/asm/current.h, ...): ../include/asm-generic/bitops/instrumented-non-atomic.h:26:1: warning: unreplaced symbol 'return' <asm/byteorder.h> was included in both drivers/mfd/ocelot-spi.c and drivers/mfd/ocelot.h previously, though Andy pointed out there didn't seem to be any users... and I didn't either. I'm sure there's something I must be missing. > * Utilize resource_size() function >
On Mon, Aug 15, 2022 at 07:19:13AM -0700, Colin Foster wrote: > Something is going on that I don't fully understand with <asm/byteorder.h>. > I don't quite see how ocelot-core is throwing all sorts of errors in x86 > builds now: > > https://patchwork.hopto.org/static/nipa/667471/12942993/build_allmodconfig_warn/stderr > > Snippet from there: > > /home/nipa/nipa/tests/patch/build_32bit/build_32bit.sh: line 21: ccache gcc: command not found > ../drivers/mfd/ocelot-spi.c: note: in included file (through ../include/linux/bitops.h, ../include/linux/kernel.h, ../arch/x86/include/asm/percpu.h, ../arch/x86/include/asm/current.h, ../include/linux/sched.h, ...): > ../arch/x86/include/asm/bitops.h:66:1: warning: unreplaced symbol 'return' > ../drivers/mfd/ocelot-spi.c: note: in included file (through ../include/linux/bitops.h, ../include/linux/kernel.h, ../arch/x86/include/asm/percpu.h, ../arch/x86/include/asm/current.h, ../include/linux/sched.h, ...): > ../include/asm-generic/bitops/generic-non-atomic.h:29:9: warning: unreplaced symbol 'mask' > ../include/asm-generic/bitops/generic-non-atomic.h:30:9: warning: unreplaced symbol 'p' > ../include/asm-generic/bitops/generic-non-atomic.h:32:10: warning: unreplaced symbol 'p' > ../include/asm-generic/bitops/generic-non-atomic.h:32:16: warning: unreplaced symbol 'mask' > ../include/asm-generic/bitops/generic-non-atomic.h:27:1: warning: unreplaced symbol 'return' > ../drivers/mfd/ocelot-spi.c: note: in included file (through ../arch/x86/include/asm/bitops.h, ../include/linux/bitops.h, ../include/linux/kernel.h, ../arch/x86/include/asm/percpu.h, ../arch/x86/include/asm/current.h, ...): > ../include/asm-generic/bitops/instrumented-non-atomic.h:26:1: warning: unreplaced symbol 'return' > > > <asm/byteorder.h> was included in both drivers/mfd/ocelot-spi.c and > drivers/mfd/ocelot.h previously, though Andy pointed out there didn't > seem to be any users... and I didn't either. I'm sure there's something > I must be missing. I got similar errors in our internal CI yesterday. Fixed by compiling sparse from git: https://git.kernel.org/pub/scm/devel/sparse/sparse.git/commit/?id=0e1aae55e49cad7ea43848af5b58ff0f57e7af99 The update is also available in the "testing" repo in case you are running Fedora 35 / 36: https://bodhi.fedoraproject.org/updates/FEDORA-2022-c58b53730f https://bodhi.fedoraproject.org/updates/FEDORA-2022-2bc333ccac
On Mon, Aug 15, 2022 at 05:35:12PM +0300, Ido Schimmel wrote: > On Mon, Aug 15, 2022 at 07:19:13AM -0700, Colin Foster wrote: > > Something is going on that I don't fully understand with <asm/byteorder.h>. > > I don't quite see how ocelot-core is throwing all sorts of errors in x86 > > builds now: > > > > https://patchwork.hopto.org/static/nipa/667471/12942993/build_allmodconfig_warn/stderr > > > > Snippet from there: > > > > /home/nipa/nipa/tests/patch/build_32bit/build_32bit.sh: line 21: ccache gcc: command not found > > ../drivers/mfd/ocelot-spi.c: note: in included file (through ../include/linux/bitops.h, ../include/linux/kernel.h, ../arch/x86/include/asm/percpu.h, ../arch/x86/include/asm/current.h, ../include/linux/sched.h, ...): > > ../arch/x86/include/asm/bitops.h:66:1: warning: unreplaced symbol 'return' > > ../drivers/mfd/ocelot-spi.c: note: in included file (through ../include/linux/bitops.h, ../include/linux/kernel.h, ../arch/x86/include/asm/percpu.h, ../arch/x86/include/asm/current.h, ../include/linux/sched.h, ...): > > ../include/asm-generic/bitops/generic-non-atomic.h:29:9: warning: unreplaced symbol 'mask' > > ../include/asm-generic/bitops/generic-non-atomic.h:30:9: warning: unreplaced symbol 'p' > > ../include/asm-generic/bitops/generic-non-atomic.h:32:10: warning: unreplaced symbol 'p' > > ../include/asm-generic/bitops/generic-non-atomic.h:32:16: warning: unreplaced symbol 'mask' > > ../include/asm-generic/bitops/generic-non-atomic.h:27:1: warning: unreplaced symbol 'return' > > ../drivers/mfd/ocelot-spi.c: note: in included file (through ../arch/x86/include/asm/bitops.h, ../include/linux/bitops.h, ../include/linux/kernel.h, ../arch/x86/include/asm/percpu.h, ../arch/x86/include/asm/current.h, ...): > > ../include/asm-generic/bitops/instrumented-non-atomic.h:26:1: warning: unreplaced symbol 'return' > > > > > > <asm/byteorder.h> was included in both drivers/mfd/ocelot-spi.c and > > drivers/mfd/ocelot.h previously, though Andy pointed out there didn't > > seem to be any users... and I didn't either. I'm sure there's something > > I must be missing. > > I got similar errors in our internal CI yesterday. Fixed by compiling > sparse from git: > https://git.kernel.org/pub/scm/devel/sparse/sparse.git/commit/?id=0e1aae55e49cad7ea43848af5b58ff0f57e7af99 > > The update is also available in the "testing" repo in case you are > running Fedora 35 / 36: > https://bodhi.fedoraproject.org/updates/FEDORA-2022-c58b53730f > https://bodhi.fedoraproject.org/updates/FEDORA-2022-2bc333ccac Thanks for the info! I haven't been able to fully recreate the issue locally, those are from kernel test robot. I'll give this a shot if I run into it locally though.
On Tue, Aug 16, 2022 at 6:20 PM Colin Foster <colin.foster@in-advantage.com> wrote: > > On Tue, Aug 16, 2022 at 11:52:53AM +0300, Andy Shevchenko wrote: > > On Mon, Aug 15, 2022 at 5:35 PM Ido Schimmel <idosch@idosch.org> wrote: > > > > > > On Mon, Aug 15, 2022 at 07:19:13AM -0700, Colin Foster wrote: > > > > Something is going on that I don't fully understand with <asm/byteorder.h>. > > > > I don't quite see how ocelot-core is throwing all sorts of errors in x86 > > > > builds now: > > > > > > > > https://patchwork.hopto.org/static/nipa/667471/12942993/build_allmodconfig_warn/stderr > > > > > > > > Snippet from there: > > > > > > > > /home/nipa/nipa/tests/patch/build_32bit/build_32bit.sh: line 21: ccache gcc: command not found > > > > ../drivers/mfd/ocelot-spi.c: note: in included file (through ../include/linux/bitops.h, ../include/linux/kernel.h, ../arch/x86/include/asm/percpu.h, ../arch/x86/include/asm/current.h, ../include/linux/sched.h, ...): > > > > ../arch/x86/include/asm/bitops.h:66:1: warning: unreplaced symbol 'return' > > > > ../drivers/mfd/ocelot-spi.c: note: in included file (through ../include/linux/bitops.h, ../include/linux/kernel.h, ../arch/x86/include/asm/percpu.h, ../arch/x86/include/asm/current.h, ../include/linux/sched.h, ...): > > > > ../include/asm-generic/bitops/generic-non-atomic.h:29:9: warning: unreplaced symbol 'mask' > > > > ../include/asm-generic/bitops/generic-non-atomic.h:30:9: warning: unreplaced symbol 'p' > > > > ../include/asm-generic/bitops/generic-non-atomic.h:32:10: warning: unreplaced symbol 'p' > > > > ../include/asm-generic/bitops/generic-non-atomic.h:32:16: warning: unreplaced symbol 'mask' > > > > ../include/asm-generic/bitops/generic-non-atomic.h:27:1: warning: unreplaced symbol 'return' > > > > ../drivers/mfd/ocelot-spi.c: note: in included file (through ../arch/x86/include/asm/bitops.h, ../include/linux/bitops.h, ../include/linux/kernel.h, ../arch/x86/include/asm/percpu.h, ../arch/x86/include/asm/current.h, ...): > > > > ../include/asm-generic/bitops/instrumented-non-atomic.h:26:1: warning: unreplaced symbol 'return' > > > > > > > > > > > > <asm/byteorder.h> was included in both drivers/mfd/ocelot-spi.c and > > > > drivers/mfd/ocelot.h previously, though Andy pointed out there didn't > > > > seem to be any users... and I didn't either. I'm sure there's something > > > > I must be missing. > > > > > > I got similar errors in our internal CI yesterday. Fixed by compiling > > > sparse from git: > > > https://git.kernel.org/pub/scm/devel/sparse/sparse.git/commit/?id=0e1aae55e49cad7ea43848af5b58ff0f57e7af99 > > > > > > The update is also available in the "testing" repo in case you are > > > running Fedora 35 / 36: > > > https://bodhi.fedoraproject.org/updates/FEDORA-2022-c58b53730f > > > https://bodhi.fedoraproject.org/updates/FEDORA-2022-2bc333ccac > > > > Debian still produces the same errors which makes sparse useless. > > I haven't jumped into this one yet. But everything seems to be compiling > and running in ARM. > > Do you think this is a false positive / unrelated to this patch? Or do > you think this is a true error that I did wrong? I haven't been around > for too many releases, so I'm not sure if this is common after an -rc1. It's a sparse issue and Debian maintainer for sparse is not updating it for some reasons...
On Thu, Aug 18, 2022 at 10:26:12PM +0300, Andy Shevchenko wrote: > On Tue, Aug 16, 2022 at 6:20 PM Colin Foster > <colin.foster@in-advantage.com> wrote: > > > > Do you think this is a false positive / unrelated to this patch? Or do > > you think this is a true error that I did wrong? I haven't been around > > for too many releases, so I'm not sure if this is common after an -rc1. > > It's a sparse issue and Debian maintainer for sparse is not updating > it for some reasons... K. I'll ignore for now and plan to re-submit next week (with Lee's correct email address) unless I hear otherwise. Thanks! > > -- > With Best Regards, > Andy Shevchenko
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