[dts] [PATCH] Domain value is required because the PCI domain values are expected in ports.cfg.

[dts] [PATCH] Domain value is required because the PCI domain values are expected in ports.cfg.

[Herbert Guan]

Signed-off-by: Herbert Guan <herbert.guan@arm.com>
---
 tools/setup.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/setup.py b/tools/setup.py
index cc51ec5..9fcd70e 100755
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -402,7 +402,7 @@ def config_ports():
     global dut_ports
     dut_ports = []
     add_more = True
-    pci_regex = "([\da-f]{2}:[\da-f]{2}.\d{1})$"
+    pci_regex = "([\da-f]{4}:[\da-f]{2}:[\da-f]{2}.\d{1})$"
     ixia_regex = r'(\d).(\d)'
 
     print ('============================================================')
@@ -414,13 +414,13 @@ def config_ports():
     while add_more:
         pci_option = {'prompt': 'DUT port pci address',
                       'type': 'string',
-                      'help': 'Please input DUT pci address xx:xx.x',
+                      'help': 'Please input DUT pci address xxxx:xx:xx.x',
                       'default': ''}
         opt = Option(**pci_option)
         dut_addr = opt.parse_input()
         m = re.match(pci_regex, dut_addr)
         if not m:
-            print RED("Pci address should follow BDF format!!!")
+            print RED("Pci address should follow Domain+BDF format!!!")
             continue
 
         if ixia and ixia != '':
@@ -436,13 +436,13 @@ def config_ports():
         else:
             pci_option = {'prompt': 'Tester port pci address',
                           'type': 'string',
-                          'help': 'Please input tester pci address xx:xx.x',
+                          'help': 'Please input tester pci address xxxx:xx:xx.x',
                           'default': ''}
             opt = Option(**pci_option)
             test_addr = opt.parse_input()
             m = re.match(pci_regex, test_addr)
             if not m:
-                print RED("Pci address should follow BDF format!!!")
+                print RED("Pci address should follow Domain+BDF format!!!")
                 continue
 
         dut_port = {}
-- 
1.8.3.1

Re: [dts] [PATCH] Domain value is required because the PCI domain values are expected in ports.cfg.

[Jianbo Liu]

On 5 July 2017 at 16:32, Herbert Guan <herbert.guan@arm.com> wrote:
> Signed-off-by: Herbert Guan <herbert.guan@arm.com>
> ---
>  tools/setup.py | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tools/setup.py b/tools/setup.py
> index cc51ec5..9fcd70e 100755
> --- a/tools/setup.py
> +++ b/tools/setup.py
> @@ -402,7 +402,7 @@ def config_ports():
>      global dut_ports
>      dut_ports = []
>      add_more = True
> -    pci_regex = "([\da-f]{2}:[\da-f]{2}.\d{1})$"
> +    pci_regex = "([\da-f]{4}:[\da-f]{2}:[\da-f]{2}.\d{1})$"
>      ixia_regex = r'(\d).(\d)'
>
>      print ('============================================================')
> @@ -414,13 +414,13 @@ def config_ports():
>      while add_more:
>          pci_option = {'prompt': 'DUT port pci address',
>                        'type': 'string',
> -                      'help': 'Please input DUT pci address xx:xx.x',
> +                      'help': 'Please input DUT pci address xxxx:xx:xx.x',
>                        'default': ''}
>          opt = Option(**pci_option)
>          dut_addr = opt.parse_input()
>          m = re.match(pci_regex, dut_addr)
>          if not m:
> -            print RED("Pci address should follow BDF format!!!")
> +            print RED("Pci address should follow Domain+BDF format!!!")
>              continue
>
>          if ixia and ixia != '':
> @@ -436,13 +436,13 @@ def config_ports():
>          else:
>              pci_option = {'prompt': 'Tester port pci address',
>                            'type': 'string',
> -                          'help': 'Please input tester pci address xx:xx.x',
> +                          'help': 'Please input tester pci address xxxx:xx:xx.x',
>                            'default': ''}
>              opt = Option(**pci_option)
>              test_addr = opt.parse_input()
>              m = re.match(pci_regex, test_addr)
>              if not m:
> -                print RED("Pci address should follow BDF format!!!")
> +                print RED("Pci address should follow Domain+BDF format!!!")
>                  continue
>
>          dut_port = {}
> --
> 1.8.3.1
>

Acked-by: Jianbo Liu <jianbo.liu@linaro.org>

Re: [dts] [PATCH] Domain value is required because the PCI domain values are expected in ports.cfg.

[Liu, Yong]

Thanks a lot, Herbert. Applied.

On 07/05/2017 04:32 PM, Herbert Guan wrote:
> Signed-off-by: Herbert Guan<herbert.guan@arm.com>
> ---
>   tools/setup.py | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)