netdev - Re: [PATCH] net: mscc: ocelot: hide MSCC_OCELOT_SWITCH and move outside NET_VENDOR

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

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAK8P3a0EM0MOsgdCVHS7gPxLk2nvP4Xqs4_tmtPM4Da=M5ZUQA@mail.gmail.com>
Date:   Sat, 14 Dec 2019 21:49:25 +0100
From:   Arnd Bergmann <arnd@...db.de>
To:     Vladimir Oltean <olteanv@...il.com>
Cc:     David Miller <davem@...emloft.net>,
        Mao Wenan <maowenan@...wei.com>, Andrew Lunn <andrew@...n.ch>,
        Florian Fainelli <f.fainelli@...il.com>,
        Vivien Didelot <vivien.didelot@...il.com>,
        Claudiu Manoil <claudiu.manoil@....com>,
        alexandru.marginean@....com, xiaoliang.yang_1@....com,
        yangbo lu <yangbo.lu@....com>,
        Networking <netdev@...r.kernel.org>,
        Alexandre Belloni <alexandre.belloni@...tlin.com>,
        UNGLinuxDriver@...rochip.com,
        Vladimir Oltean <vladimir.oltean@....com>
Subject: Re: [PATCH] net: mscc: ocelot: hide MSCC_OCELOT_SWITCH and move
 outside NET_VENDOR_MICROSEMI

On Sat, Dec 14, 2019 at 4:16 PM Arnd Bergmann <arnd@...db.de> wrote:
>
> On Thu, Dec 12, 2019 at 6:11 PM Vladimir Oltean <olteanv@...il.com> wrote:
> >
> > From: Vladimir Oltean <vladimir.oltean@....com>
> >
> > NET_DSA_MSCC_FELIX and MSCC_OCELOT_SWITCH_OCELOT are 2 different drivers
> > that use the same core operations, compiled under MSCC_OCELOT_SWITCH.
>
> > Fixes: 56051948773e ("net: dsa: ocelot: add driver for Felix switch family")
> > Reported-by: Arnd Bergmann <arnd@...db.de>
> > Reported-by: Mao Wenan <maowenan@...wei.com>
> > Signed-off-by: Vladimir Oltean <vladimir.oltean@....com>
>
> I did some more build testing and ran into another issue now that
> MSCC_OCELOT_SWITCH_OCELOT can be built without
> CONFIG_SWITCHDEV:

And another one when CONFIG_NET_VENDOR_MICROSEMI is disabled:

ERROR: "ocelot_fdb_dump" [drivers/net/dsa/ocelot/mscc_felix.ko] undefined!
ERROR: "ocelot_regfields_init" [drivers/net/dsa/ocelot/mscc_felix.ko] undefined!
ERROR: "ocelot_regmap_init" [drivers/net/dsa/ocelot/mscc_felix.ko] undefined!
ERROR: "ocelot_init" [drivers/net/dsa/ocelot/mscc_felix.ko] undefined!
ERROR: "ocelot_fdb_del" [drivers/net/dsa/ocelot/mscc_felix.ko] undefined!
ERROR: "__ocelot_write_ix" [drivers/net/dsa/ocelot/mscc_felix.ko] undefined!
ERROR: "ocelot_bridge_stp_state_set"
[drivers/net/dsa/ocelot/mscc_felix.ko] undefined!
ERROR: "ocelot_port_vlan_filtering"
[drivers/net/dsa/ocelot/mscc_felix.ko] undefined!
ERROR: "ocelot_get_ethtool_stats"
[drivers/net/dsa/ocelot/mscc_felix.ko] undefined!
ERROR: "ocelot_port_enable" [drivers/net/dsa/ocelot/mscc_felix.ko] undefined!
ERROR: "ocelot_vlan_del" [drivers/net/dsa/ocelot/mscc_felix.ko] undefined!
ERROR: "ocelot_deinit" [drivers/net/dsa/ocelot/mscc_felix.ko] undefined!
ERROR: "ocelot_init_port" [drivers/net/dsa/ocelot/mscc_felix.ko] undefined!
ERROR: "ocelot_fdb_add" [drivers/net/dsa/ocelot/mscc_felix.ko] undefined!

This fixes it:

diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index f8f38dcb5f8a..83351228734a 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -55,7 +55,7 @@ obj-$(CONFIG_NET_VENDOR_MEDIATEK) += mediatek/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
 obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
 obj-$(CONFIG_NET_VENDOR_MICROCHIP) += microchip/
-obj-$(CONFIG_NET_VENDOR_MICROSEMI) += mscc/
+obj-y += mscc/
 obj-$(CONFIG_NET_VENDOR_MOXART) += moxa/
 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_FEALNX) += fealnx.o

        Arnd