| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220129220221.2823127-1-colin.foster@in-advantage.com>
Date: Sat, 29 Jan 2022 14:02:12 -0800
From: Colin Foster <colin.foster@...advantage.com>
To: linux-arm-kernel@...ts.infradead.org, linux-gpio@...r.kernel.org,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: Steen Hegelund <Steen.Hegelund@...rochip.com>,
Lars Povlsen <lars.povlsen@...rochip.com>,
Linus Walleij <linus.walleij@...aro.org>,
Russell King <linux@...linux.org.uk>,
Heiner Kallweit <hkallweit1@...il.com>,
Jakub Kicinski <kuba@...nel.org>,
"David S. Miller" <davem@...emloft.net>,
Florian Fainelli <f.fainelli@...il.com>,
Vivien Didelot <vivien.didelot@...il.com>,
Andrew Lunn <andrew@...n.ch>, UNGLinuxDriver@...rochip.com,
Alexandre Belloni <alexandre.belloni@...tlin.com>,
Claudiu Manoil <claudiu.manoil@....com>,
Vladimir Oltean <vladimir.oltean@....com>,
Lee Jones <lee.jones@...aro.org>, katie.morris@...advantage.com
Subject: [RFC v6 net-next 0/9] add support for VSC7512 control over SPI
The patch set in general is to add support for the VSC7512, and
eventually the VSC7511, VSC7513 and VSC7514 devices controlled over
SPI. The driver is believed to be fully functional for the internal
phy ports (0-3) on the VSC7512. It is not yet functional for SGMII,
QSGMII, and SerDes ports.
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.
The relevant sections of the device tree I'm using for the VSC7512 is
below. Notably the SGPIO LEDs follow link status and speed from network
triggers.
In order to make this work, I have modified the cpsw driver, and now the
cpsw_new driver, to allow for frames over 1500 bytes. Otherwise the
tagging protocol will not work between the beaglebone and the VSC7512. I
plan to eventually try to get those changes in mainline, but I don't
want to get distracted from my initial goal. I also had to change
bonecommon.dtsi to avoid using VLAN 0.
Lastly, there are things that I have not changed. v6 still uses
device_is_mfd to reason about whether it should use
devm_ioremap_resource or ocelot_get_regmap_from_resource. If necessary,
a different compatible string could be used. That would create some code
duplication, but if device_is_mfd is not desired I completely
understand.
I also still use ocelot_get_regmap_from_resource, and it has been
squashed into the main MFD addition commit. My initial thoughts of it
being able to be done through dev / MFD were probably over-complicating
things.
/ {
model = "TI AM335x BeagleBone Black";
compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
// 125 MHz clock on dev board
ocelot_clock: ocelot-clock {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <125000000>;
};
vscleds {
compatible = "gpio-leds";
vscled@0 {
label = "port0led";
gpios = <&sgpio_out1 0 0 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-ext-switch-mii:00:link";
};
vscled@1 {
label = "port0led1";
gpios = <&sgpio_out1 0 1 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-ext-switch-mii:00:1Gbps";
};
vscled@10 {
label = "port1led";
gpios = <&sgpio_out1 1 0 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-ext-switch-mii:01:link";
};
vscled@11 {
label = "port1led1";
gpios = <&sgpio_out1 1 1 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-ext-switch-mii:01:1Gbps";
};
vscled@20 {
label = "port2led";
gpios = <&sgpio_out1 2 0 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-ext-switch-mii:02:link";
};
vscled@21 {
label = "port2led1";
gpios = <&sgpio_out1 2 1 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-ext-switch-mii:02:1Gbps";
};
vscled@30 {
label = "port3led";
gpios = <&sgpio_out1 3 0 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-ext-switch-mii:03:link";
};
vscled@31 {
label = "port3led1";
gpios = <&sgpio_out1 3 1 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-ext-switch-mii:03:1Gbps";
};
vscled@40 {
label = "port4led";
gpios = <&sgpio_out1 4 0 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-miim1-mii:04:link";
};
vscled@41 {
label = "port4led1";
gpios = <&sgpio_out1 4 1 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-miim1-mii:04:1Gbps";
};
vscled@50 {
label = "port5led";
gpios = <&sgpio_out1 5 0 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-miim1-mii:05:link";
};
vscled@51 {
label = "port5led1";
gpios = <&sgpio_out1 5 1 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-miim1-mii:05:1Gbps";
};
vscled@60 {
label = "port6led";
gpios = <&sgpio_out1 6 0 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-miim1-mii:06:link";
};
vscled@61 {
label = "port6led1";
gpios = <&sgpio_out1 6 1 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-miim1-mii:06:1Gbps";
};
vscled@70 {
label = "port7led";
gpios = <&sgpio_out1 7 0 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-miim1-mii:07:link";
};
vscled@71 {
label = "port7led1";
gpios = <&sgpio_out1 7 1 GPIO_ACTIVE_LOW>;
default-state = "off";
linux,default-trigger = "ocelot-miim1-mii:07:1Gbps";
};
};
};
&spi0 {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
ocelot-chip@0 {
compatible = "mscc,vsc7512_mfd_spi";
spi-max-frequency = <2500000>;
reg = <0>;
ethernet-switch@0 {
compatible = "mscc,vsc7512-ext-switch";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "cpu";
status = "okay";
ethernet = <&mac_sw>;
phy-handle = <&sw_phy0>;
phy-mode = "internal";
};
port@1 {
reg = <1>;
label = "swp1";
status = "okay";
phy-handle = <&sw_phy1>;
phy-mode = "internal";
};
port@2 {
reg = <2>;
label = "swp2";
status = "okay";
phy-handle = <&sw_phy2>;
phy-mode = "internal";
};
port@3 {
reg = <3>;
label = "swp3";
status = "okay";
phy-handle = <&sw_phy3>;
phy-mode = "internal";
};
port@4 {
reg = <4>;
label = "swp4";
status = "okay";
phy-handle = <&sw_phy4>;
phy-mode = "qsgmii";
phys = <&serdes 4 SERDES6G(0)>;
};
port@5 {
reg = <5>;
label = "swp5";
status = "okay";
phy-handle = <&sw_phy5>;
phy-mode = "qsgmii";
phys = <&serdes 5 SERDES6G(0)>;
};
port@6 {
reg = <6>;
label = "swp6";
status = "okay";
phy-handle = <&sw_phy6>;
phy-mode = "qsgmii";
phys = <&serdes 6 SERDES6G(0)>;
};
port@7 {
reg = <7>;
label = "swp7";
status = "okay";
phy-handle = <&sw_phy7>;
phy-mode = "qsgmii";
phys = <&serdes 7 SERDES6G(0)>;
};
};
mdio {
#address-cells = <1>;
#size-cells = <0>;
sw_phy0: ethernet-phy@0 {
reg = <0x0>;
};
sw_phy1: ethernet-phy@1 {
reg = <0x1>;
};
sw_phy2: ethernet-phy@2 {
reg = <0x2>;
};
sw_phy3: ethernet-phy@3 {
reg = <0x3>;
};
};
};
mdio1: mdio1 {
compatible = "mscc,ocelot-miim";
pinctrl-names = "default";
pinctrl-0 = <&miim1>;
#address-cells = <1>;
#size-cells = <0>;
sw_phy4: ethernet-phy@4 {
reg = <0x4>;
};
sw_phy5: ethernet-phy@5 {
reg = <0x5>;
};
sw_phy6: ethernet-phy@6 {
reg = <0x6>;
};
sw_phy7: ethernet-phy@7 {
reg = <0x7>;
};
};
gpio: pinctrl@0 {
compatible = "mscc,ocelot-pinctrl";
gpio-controller;
#gpio_cells = <2>;
gpio-ranges = <&gpio 0 0 22>;
led_shift_reg_pins: led-shift-reg-pins {
pins = "GPIO_0", "GPIO_1", "GPIO_2", "GPIO_3";
function = "sg0";
};
miim1: miim1 {
pins = "GPIO_14", "GPIO_15";
function = "miim";
};
};
sgpio: sgpio {
compatible = "mscc,ocelot-sgpio";
#address-cells = <1>;
#size-cells = <0>;
bus-frequency=<12500000>;
clocks = <&ocelot_clock>;
microchip,sgpio-port-ranges = <0 15>;
pinctrl-names = "default";
pinctrl-0 = <&led_shift_reg_pins>;
sgpio_in0: sgpio@0 {
compatible = "microchip,sparx5-sgpio-bank";
reg = <0>;
gpio-controller;
#gpio-cells = <3>;
ngpios = <64>;
};
sgpio_out1: sgpio@1 {
compatible = "microchip,sparx5-sgpio-bank";
reg = <1>;
gpio-controller;
#gpio-cells = <3>;
ngpios = <64>;
};
};
};
};
RFC history:
v1 (accidentally named vN)
* Initial architecture. Not functional
* General concepts laid out
v2
* Near functional. No CPU port communication, but control over all
external ports
* Cleaned up regmap implementation from v1
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
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.
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
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.
Colin Foster (9):
pinctrl: ocelot: allow pinctrl-ocelot to be loaded as a module
pinctrl: microchip-sgpio: allow sgpio driver to be used as a module
net: mdio: mscc-miim: add local dev variable to cleanup probe function
net: mdio: mscc-miim: add ability to externally register phy reset
control
mfd: add interface to check whether a device is mfd
mfd: ocelot: add support for external mfd control over SPI for the
VSC7512
net: mscc: ocelot: expose ocelot wm functions
net: dsa: felix: add configurable device quirks
net: dsa: ocelot: add external ocelot switch control
drivers/mfd/Kconfig | 19 +
drivers/mfd/Makefile | 3 +
drivers/mfd/mfd-core.c | 6 +
drivers/mfd/ocelot-core.c | 169 +++++
drivers/mfd/ocelot-spi.c | 325 ++++++++++
drivers/mfd/ocelot.h | 36 ++
drivers/net/dsa/ocelot/Kconfig | 14 +
drivers/net/dsa/ocelot/Makefile | 5 +
drivers/net/dsa/ocelot/felix.c | 7 +-
drivers/net/dsa/ocelot/felix.h | 1 +
drivers/net/dsa/ocelot/felix_vsc9959.c | 1 +
drivers/net/dsa/ocelot/ocelot_ext.c | 681 +++++++++++++++++++++
drivers/net/dsa/ocelot/seville_vsc9953.c | 4 +-
drivers/net/ethernet/mscc/ocelot_devlink.c | 31 +
drivers/net/ethernet/mscc/ocelot_vsc7514.c | 28 -
drivers/net/mdio/mdio-mscc-miim.c | 49 +-
drivers/pinctrl/Kconfig | 4 +-
drivers/pinctrl/pinctrl-microchip-sgpio.c | 26 +-
drivers/pinctrl/pinctrl-ocelot.c | 33 +-
include/linux/mdio/mdio-mscc-miim.h | 3 +-
include/linux/mfd/core.h | 10 +
include/soc/mscc/ocelot.h | 18 +
22 files changed, 1409 insertions(+), 64 deletions(-)
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 drivers/net/dsa/ocelot/ocelot_ext.c
--
2.25.1
Powered by blists - more mailing lists