diff mbox

[V2,2/3] net-next: dsa: add multi cpu port support

Message ID 979a011e-0f41-a919-9d46-1f8258b645af@gmail.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Florian Fainelli May 30, 2017, 7:15 p.m. UTC 
Hi John,

On 05/30/2017 11:37 AM, John Crispin wrote:
> Hi,
> 
> the patch series is based on net-next from 12 hours ago and works fine
> on that tree. I compile and runtime tested it quite intensively on
> various boards

The warning is legit though:

    572            if (dsa_port_is_cpu(port))
    573                err = dsa_cpu_parse(port, index, dst, ds);
  > 574            else if (dsa_is_normal_port(port))
    575                err = dsa_user_parse(port->dn, index,  ds);

and after applying your patches I also met it:

net/dsa/dsa2.c: In function 'dsa_ds_parse':
net/dsa/dsa2.c:574:3: warning: passing argument 1 of
'dsa_is_normal_port' from incompatible pointer type [enabled by default]
   else if (dsa_is_normal_port(port))
   ^
In file included from net/dsa/dsa_priv.h:17:0,
                 from net/dsa/dsa2.c:22:
./include/net/dsa.h:264:20: note: expected 'struct dsa_switch *' but
argument is of type 'struct dsa_port *'
 static inline bool dsa_is_normal_port(struct dsa_switch *ds, int p)
                    ^
net/dsa/dsa2.c:574:3: error: too few arguments to function
'dsa_is_normal_port'
   else if (dsa_is_normal_port(port))
   ^
In file included from net/dsa/dsa_priv.h:17:0,
                 from net/dsa/dsa2.c:22:
./include/net/dsa.h:264:20: note: declared here
 static inline bool dsa_is_normal_port(struct dsa_switch *ds, int p)
                    ^
  CC      net/bridge/br_stp.o
scripts/Makefile.build:302: recipe for target 'net/dsa/dsa2.o' failed
make[4]: *** [net/dsa/dsa2.o] Error 1
scripts/Makefile.build:561: recipe for target 'net/dsa' failed
make[3]: *** [net/dsa] Error 2
make[3]: *** Waiting for unfinished jobs....

We need something like this, I have some comments on your patches that I
will send shortly. Thanks!

                if (!cpu_port_reg)
@@ -572,7 +572,7 @@ static int dsa_ds_parse(struct dsa_switch_tree *dst,
struct dsa_switch *ds)
                if (dsa_port_is_cpu(port))
                        err = dsa_cpu_parse(port, index, dst, ds);
                else if (dsa_is_normal_port(port))
-                       err = dsa_user_parse(port->dn, index,  ds);
+                       err = dsa_user_parse(port, index,  ds);

                        if (err)
                                return err;


> 
>     John
> 
> 
> On 30/05/17 17:38, kbuild test robot wrote:
>> Hi John,
>>
>> [auto build test ERROR on net-next/master]
>> [also build test ERROR on next-20170530]
>> [cannot apply to v4.12-rc3]
>> [if your patch is applied to the wrong git tree, please drop us a note
>> to help improve the system]
>>
>> url:   
>> https://github.com/0day-ci/linux/commits/John-Crispin/Documentation-devicetree-add-multiple-cpu-port-DSA-binding/20170530-224954
>>
>> config: x86_64-randconfig-x014-201722 (attached as .config)
>> compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
>> reproduce:
>>          # save the attached .config to linux build tree
>>          make ARCH=x86_64
>>
>> All error/warnings (new ones prefixed by >>):
>>
>>     In file included from include/linux/ioport.h:12:0,
>>                      from include/linux/device.h:16,
>>                      from net//dsa/dsa2.c:13:
>>     net//dsa/dsa2.c: In function 'dsa_ds_parse':
>>>> net//dsa/dsa2.c:574:31: error: passing argument 1 of
>>>> 'dsa_is_normal_port' from incompatible pointer type
>>>> [-Werror=incompatible-pointer-types]
>>        else if (dsa_is_normal_port(port))
>>                                    ^
>>     include/linux/compiler.h:160:30: note: in definition of macro
>> '__trace_if'
>>       if (__builtin_constant_p(!!(cond)) ? !!(cond) :   \
>>                                   ^~~~
>>>> net//dsa/dsa2.c:574:8: note: in expansion of macro 'if'
>>        else if (dsa_is_normal_port(port))
>>             ^~
>>     In file included from net//dsa/dsa_priv.h:17:0,
>>                      from net//dsa/dsa2.c:22:
>>     include/net/dsa.h:264:20: note: expected 'struct dsa_switch *' but
>> argument is of type 'struct dsa_port *'
>>      static inline bool dsa_is_normal_port(struct dsa_switch *ds, int p)
>>                         ^~~~~~~~~~~~~~~~~~
>>     In file included from include/linux/ioport.h:12:0,
>>                      from include/linux/device.h:16,
>>                      from net//dsa/dsa2.c:13:
>>>> net//dsa/dsa2.c:574:12: error: too few arguments to function
>>>> 'dsa_is_normal_port'
>>        else if (dsa_is_normal_port(port))
>>                 ^
>>     include/linux/compiler.h:160:30: note: in definition of macro
>> '__trace_if'
>>       if (__builtin_constant_p(!!(cond)) ? !!(cond) :   \
>>                                   ^~~~
>>>> net//dsa/dsa2.c:574:8: note: in expansion of macro 'if'
>>        else if (dsa_is_normal_port(port))
>>             ^~
>>     In file included from net//dsa/dsa_priv.h:17:0,
>>                      from net//dsa/dsa2.c:22:
>>     include/net/dsa.h:264:20: note: declared here
>>      static inline bool dsa_is_normal_port(struct dsa_switch *ds, int p)
>>                         ^~~~~~~~~~~~~~~~~~
>>     In file included from include/linux/ioport.h:12:0,
>>                      from include/linux/device.h:16,
>>                      from net//dsa/dsa2.c:13:
>>>> net//dsa/dsa2.c:574:31: error: passing argument 1 of
>>>> 'dsa_is_normal_port' from incompatible pointer type
>>>> [-Werror=incompatible-pointer-types]
>>        else if (dsa_is_normal_port(port))
>>                                    ^
>>     include/linux/compiler.h:160:42: note: in definition of macro
>> '__trace_if'
>>       if (__builtin_constant_p(!!(cond)) ? !!(cond) :   \
>>                                               ^~~~
>>>> net//dsa/dsa2.c:574:8: note: in expansion of macro 'if'
>>        else if (dsa_is_normal_port(port))
>>             ^~
>>     In file included from net//dsa/dsa_priv.h:17:0,
>>                      from net//dsa/dsa2.c:22:
>>     include/net/dsa.h:264:20: note: expected 'struct dsa_switch *' but
>> argument is of type 'struct dsa_port *'
>>      static inline bool dsa_is_normal_port(struct dsa_switch *ds, int p)
>>                         ^~~~~~~~~~~~~~~~~~
>>     In file included from include/linux/ioport.h:12:0,
>>                      from include/linux/device.h:16,
>>                      from net//dsa/dsa2.c:13:
>>>> net//dsa/dsa2.c:574:12: error: too few arguments to function
>>>> 'dsa_is_normal_port'
>>        else if (dsa_is_normal_port(port))
>>                 ^
>>     include/linux/compiler.h:160:42: note: in definition of macro
>> '__trace_if'
>>       if (__builtin_constant_p(!!(cond)) ? !!(cond) :   \
>>                                               ^~~~
>>>> net//dsa/dsa2.c:574:8: note: in expansion of macro 'if'
>>        else if (dsa_is_normal_port(port))
>>             ^~
>>     In file included from net//dsa/dsa_priv.h:17:0,
>>                      from net//dsa/dsa2.c:22:
>>     include/net/dsa.h:264:20: note: declared here
>>      static inline bool dsa_is_normal_port(struct dsa_switch *ds, int p)
>>                         ^~~~~~~~~~~~~~~~~~
>>     In file included from include/linux/ioport.h:12:0,
>>                      from include/linux/device.h:16,
>>                      from net//dsa/dsa2.c:13:
>>>> net//dsa/dsa2.c:574:31: error: passing argument 1 of
>>>> 'dsa_is_normal_port' from incompatible pointer type
>>>> [-Werror=incompatible-pointer-types]
>>        else if (dsa_is_normal_port(port))
>>                                    ^
>>     include/linux/compiler.h:171:16: note: in definition of macro
>> '__trace_if'
>>        ______r = !!(cond);     \
>>                     ^~~~
>>>> net//dsa/dsa2.c:574:8: note: in expansion of macro 'if'
>>        else if (dsa_is_normal_port(port))
>>             ^~
>>     In file included from net//dsa/dsa_priv.h:17:0,
>>                      from net//dsa/dsa2.c:22:
>>     include/net/dsa.h:264:20: note: expected 'struct dsa_switch *' but
>> argument is of type 'struct dsa_port *'
>>      static inline bool dsa_is_normal_port(struct dsa_switch *ds, int p)
>>                         ^~~~~~~~~~~~~~~~~~
>>     In file included from include/linux/ioport.h:12:0,
>>                      from include/linux/device.h:16,
>>                      from net//dsa/dsa2.c:13:
>>>> net//dsa/dsa2.c:574:12: error: too few arguments to function
>>>> 'dsa_is_normal_port'
>>        else if (dsa_is_normal_port(port))
>>                 ^
>>     include/linux/compiler.h:171:16: note: in definition of macro
>> '__trace_if'
>>        ______r = !!(cond);     \
>>                     ^~~~
>>>> net//dsa/dsa2.c:574:8: note: in expansion of macro 'if'
>>        else if (dsa_is_normal_port(port))
>>             ^~
>>     In file included from net//dsa/dsa_priv.h:17:0,
>>                      from net//dsa/dsa2.c:22:
>>     include/net/dsa.h:264:20: note: declared here
>>      static inline bool dsa_is_normal_port(struct dsa_switch *ds, int p)
>>                         ^~~~~~~~~~~~~~~~~~
>>     cc1: some warnings being treated as errors
>>
>> vim +/dsa_is_normal_port +574 net//dsa/dsa2.c
>>
>>     568            port = &ds->ports[index];
>>     569            if (!dsa_port_is_valid(port))
>>     570                continue;
>>     571   
>>     572            if (dsa_port_is_cpu(port))
>>     573                err = dsa_cpu_parse(port, index, dst, ds);
>>   > 574            else if (dsa_is_normal_port(port))
>>     575                err = dsa_user_parse(port->dn, index,  ds);
>>     576   
>>     577                if (err)
>>
>> ---
>> 0-DAY kernel test infrastructure                Open Source Technology
>> Center
>> https://lists.01.org/pipermail/kbuild-all                   Intel
>> Corporation
>
diff mbox

Patch

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 8b13aa735c40..124c5acfa123 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -539,14 +539,14 @@  static int dsa_cpu_parse(struct dsa_port *port,
u32 index,
        return 0;
 }

-static int dsa_user_parse(struct device_node *port, u32 index,
+static int dsa_user_parse(struct dsa_port *port, u32 index,
                          struct dsa_switch *ds)
 {
        struct device_node *cpu_port;
        const unsigned int *cpu_port_reg;
        int cpu_port_index;

-       cpu_port = of_parse_phandle(port, "cpu", 0);
+       cpu_port = of_parse_phandle(port->dn, "cpu", 0);
        if (cpu_port) {
                cpu_port_reg = of_get_property(cpu_port, "reg", NULL);