| Message ID | 20230224155235.512695-4-vladimir.oltean@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Regressions in Ocelot switch drivers | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net |
| netdev/fixes_present | success | Fixes tag present in non-next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Series has a cover letter |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/cc_maintainers | success | CCed 13 of 13 maintainers |
| netdev/build_clang | success | Errors and warnings before: 0 this patch: 0 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | Fixes tag looks correct |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 16 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
On Fri, Feb 24, 2023 at 05:52:35PM +0200, Vladimir Oltean wrote: > When compiling a kernel which has both CONFIG_NET_DSA_MSCC_OCELOT_EXT > and CONFIG_MSCC_OCELOT_SWITCH enabled, the following error message will > be printed: > > [ 5.266588] Error: Driver 'ocelot-switch' is already registered, aborting... > > Rename the ocelot_ext.c driver to "ocelot-ext-switch" to avoid the name > duplication, and update the mfd_cell entry for its resources. > > Fixes: 3d7316ac81ac ("net: dsa: ocelot: add external ocelot switch control") > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> I'll also send another patch to delete linux/phylink.h from ocelot_ext.c - seems that wasn't removed when the phylink instance was removed during review.
On Fri, Feb 24, 2023 at 03:58:15PM +0000, Russell King (Oracle) wrote: > I'll also send another patch to delete linux/phylink.h from > ocelot_ext.c - seems that wasn't removed when the phylink instance > was removed during review. Good point. I suppose that would be on net-next, after the 6th of March? I just hope we'll remember by then.
On Fri, Feb 24, 2023 at 06:09:20PM +0200, Vladimir Oltean wrote: > On Fri, Feb 24, 2023 at 03:58:15PM +0000, Russell King (Oracle) wrote: > > I'll also send another patch to delete linux/phylink.h from > > ocelot_ext.c - seems that wasn't removed when the phylink instance > > was removed during review. > > Good point. I suppose that would be on net-next, after the 6th of March? > I just hope we'll remember by then. Yep - however, I'm facing challenges to build-testing it at the moment as net-next is broken: kernel/bpf/core.c: In function '___bpf_prog_run': kernel/bpf/core.c:1914:3: error: implicit declaration of function 'barrier_nospec' [-Werror=implicit-function-declaration] 1914 | barrier_nospec(); | ^~~~~~~~~~~~~~ cc1: some warnings being treated as errors ... so I'm going to send the patch as untested.
On Fri, Feb 24, 2023 at 04:14:25PM +0000, Russell King (Oracle) wrote: > On Fri, Feb 24, 2023 at 06:09:20PM +0200, Vladimir Oltean wrote: > > On Fri, Feb 24, 2023 at 03:58:15PM +0000, Russell King (Oracle) wrote: > > > I'll also send another patch to delete linux/phylink.h from > > > ocelot_ext.c - seems that wasn't removed when the phylink instance > > > was removed during review. > > > > Good point. I suppose that would be on net-next, after the 6th of March? > > I just hope we'll remember by then. > > Yep - however, I'm facing challenges to build-testing it at the moment > as net-next is broken: > > kernel/bpf/core.c: In function '___bpf_prog_run': > kernel/bpf/core.c:1914:3: error: implicit declaration of function 'barrier_nospec' [-Werror=implicit-function-declaration] > 1914 | barrier_nospec(); > | ^~~~~~~~~~~~~~ > cc1: some warnings being treated as errors > > ... so I'm going to send the patch as untested. > > -- > RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ > FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last! https://github.com/torvalds/linux/commit/f3dd0c53370e70c0f9b7e931bbec12916f3bb8cc Can't deny it would be great to have this on net.git ASAP :)
On Fri, Feb 24, 2023 at 06:16:29PM +0200, Vladimir Oltean wrote: > On Fri, Feb 24, 2023 at 04:14:25PM +0000, Russell King (Oracle) wrote: > > On Fri, Feb 24, 2023 at 06:09:20PM +0200, Vladimir Oltean wrote: > > > On Fri, Feb 24, 2023 at 03:58:15PM +0000, Russell King (Oracle) wrote: > > > > I'll also send another patch to delete linux/phylink.h from > > > > ocelot_ext.c - seems that wasn't removed when the phylink instance > > > > was removed during review. > > > > > > Good point. I suppose that would be on net-next, after the 6th of March? > > > I just hope we'll remember by then. > > > > Yep - however, I'm facing challenges to build-testing it at the moment > > as net-next is broken: > > > > kernel/bpf/core.c: In function '___bpf_prog_run': > > kernel/bpf/core.c:1914:3: error: implicit declaration of function 'barrier_nospec' [-Werror=implicit-function-declaration] > > 1914 | barrier_nospec(); > > | ^~~~~~~~~~~~~~ > > cc1: some warnings being treated as errors > > > > ... so I'm going to send the patch as untested. > > > > -- > > RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ > > FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last! > > https://github.com/torvalds/linux/commit/f3dd0c53370e70c0f9b7e931bbec12916f3bb8cc > > Can't deny it would be great to have this on net.git ASAP :) Agreed, and thanks for the patch, my build-test on net.git succeeded with that.
On 2/24/23 07:52, Vladimir Oltean wrote: > When compiling a kernel which has both CONFIG_NET_DSA_MSCC_OCELOT_EXT > and CONFIG_MSCC_OCELOT_SWITCH enabled, the following error message will > be printed: > > [ 5.266588] Error: Driver 'ocelot-switch' is already registered, aborting... > > Rename the ocelot_ext.c driver to "ocelot-ext-switch" to avoid the name > duplication, and update the mfd_cell entry for its resources. > > Fixes: 3d7316ac81ac ("net: dsa: ocelot: add external ocelot switch control") > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
On Fri, 24 Feb 2023, Vladimir Oltean wrote: > When compiling a kernel which has both CONFIG_NET_DSA_MSCC_OCELOT_EXT > and CONFIG_MSCC_OCELOT_SWITCH enabled, the following error message will > be printed: > > [ 5.266588] Error: Driver 'ocelot-switch' is already registered, aborting... > > Rename the ocelot_ext.c driver to "ocelot-ext-switch" to avoid the name > duplication, and update the mfd_cell entry for its resources. > > Fixes: 3d7316ac81ac ("net: dsa: ocelot: add external ocelot switch control") > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> > --- > drivers/mfd/ocelot-core.c | 2 +- Acked-by: Lee Jones <lee@kernel.org> > drivers/net/dsa/ocelot/ocelot_ext.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mfd/ocelot-core.c b/drivers/mfd/ocelot-core.c > index b0ff05c1759f..e1772ff00cad 100644 > --- a/drivers/mfd/ocelot-core.c > +++ b/drivers/mfd/ocelot-core.c > @@ -177,7 +177,7 @@ static const struct mfd_cell vsc7512_devs[] = { > .num_resources = ARRAY_SIZE(vsc7512_miim1_resources), > .resources = vsc7512_miim1_resources, > }, { > - .name = "ocelot-switch", > + .name = "ocelot-ext-switch", > .of_compatible = "mscc,vsc7512-switch", > .num_resources = ARRAY_SIZE(vsc7512_switch_resources), > .resources = vsc7512_switch_resources, > diff --git a/drivers/net/dsa/ocelot/ocelot_ext.c b/drivers/net/dsa/ocelot/ocelot_ext.c > index 14efa6387bd7..52b41db63a28 100644 > --- a/drivers/net/dsa/ocelot/ocelot_ext.c > +++ b/drivers/net/dsa/ocelot/ocelot_ext.c > @@ -149,7 +149,7 @@ MODULE_DEVICE_TABLE(of, ocelot_ext_switch_of_match); > > static struct platform_driver ocelot_ext_switch_driver = { > .driver = { > - .name = "ocelot-switch", > + .name = "ocelot-ext-switch", > .of_match_table = of_match_ptr(ocelot_ext_switch_of_match), > }, > .probe = ocelot_ext_probe, > -- > 2.34.1 >
diff --git a/drivers/mfd/ocelot-core.c b/drivers/mfd/ocelot-core.c index b0ff05c1759f..e1772ff00cad 100644 --- a/drivers/mfd/ocelot-core.c +++ b/drivers/mfd/ocelot-core.c @@ -177,7 +177,7 @@ static const struct mfd_cell vsc7512_devs[] = { .num_resources = ARRAY_SIZE(vsc7512_miim1_resources), .resources = vsc7512_miim1_resources, }, { - .name = "ocelot-switch", + .name = "ocelot-ext-switch", .of_compatible = "mscc,vsc7512-switch", .num_resources = ARRAY_SIZE(vsc7512_switch_resources), .resources = vsc7512_switch_resources, diff --git a/drivers/net/dsa/ocelot/ocelot_ext.c b/drivers/net/dsa/ocelot/ocelot_ext.c index 14efa6387bd7..52b41db63a28 100644 --- a/drivers/net/dsa/ocelot/ocelot_ext.c +++ b/drivers/net/dsa/ocelot/ocelot_ext.c @@ -149,7 +149,7 @@ MODULE_DEVICE_TABLE(of, ocelot_ext_switch_of_match); static struct platform_driver ocelot_ext_switch_driver = { .driver = { - .name = "ocelot-switch", + .name = "ocelot-ext-switch", .of_match_table = of_match_ptr(ocelot_ext_switch_of_match), }, .probe = ocelot_ext_probe,
When compiling a kernel which has both CONFIG_NET_DSA_MSCC_OCELOT_EXT and CONFIG_MSCC_OCELOT_SWITCH enabled, the following error message will be printed: [ 5.266588] Error: Driver 'ocelot-switch' is already registered, aborting... Rename the ocelot_ext.c driver to "ocelot-ext-switch" to avoid the name duplication, and update the mfd_cell entry for its resources. Fixes: 3d7316ac81ac ("net: dsa: ocelot: add external ocelot switch control") Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> --- drivers/mfd/ocelot-core.c | 2 +- drivers/net/dsa/ocelot/ocelot_ext.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)