Syscall cmake deps not correctly set when modifying existing syscall

[mark-inderhees]

Describe the bug

The current cmake logic for syscalls makes an incorrect assumption, in CMakeLists.txt

  # On other OS'es, modifying a file is reflected on the folder timestamp and hence detected
  # when using depend on directory level.

This is not correct. If I modify an existing file, the parent directory timestamp is not updated. The parent directory is only updated on file adds and removes. This is tricky to reproduce, as git checkouts and patch applies end up doing file adds even when just modifying a few lines. To reproduce, have to do a "true" file edit.

Regression

• This is a regression.

Steps to reproduce

1. Apply this patch
   1a. save to file repo.patch

diff --git a/drivers/gpio/gpio_nrfx.c b/drivers/gpio/gpio_nrfx.c
index 6ccb378e161..fb4828674a8 100644
--- a/drivers/gpio/gpio_nrfx.c
+++ b/drivers/gpio/gpio_nrfx.c
@@ -361,8 +361,9 @@ static int gpio_nrfx_port_clear_bits_raw(const struct device *port,
 }
 
 static int gpio_nrfx_port_toggle_bits(const struct device *port,
-                                     gpio_port_pins_t mask)
+                                     gpio_port_pins_t mask, uint32_t foo)
 {
+       (void)foo;
        NRF_GPIO_Type *reg = get_port_cfg(port)->port;
        const uint32_t value = nrf_gpio_port_out_read(reg) ^ mask;
        const uint32_t set_mask = value & mask;
diff --git a/include/zephyr/drivers/gpio.h b/include/zephyr/drivers/gpio.h
index 33962528136..d12bc1e8812 100644
--- a/include/zephyr/drivers/gpio.h
+++ b/include/zephyr/drivers/gpio.h
@@ -824,7 +824,7 @@ __subsystem struct gpio_driver_api {
        int (*port_clear_bits_raw)(const struct device *port,
                                   gpio_port_pins_t pins);
        int (*port_toggle_bits)(const struct device *port,
-                               gpio_port_pins_t pins);
+                               gpio_port_pins_t pins, uint32_t foo);
        int (*pin_interrupt_configure)(const struct device *port,
                                       gpio_pin_t pin,
                                       enum gpio_int_mode mode,
@@ -1491,10 +1491,10 @@ static inline int gpio_port_clear_bits(const struct device *port,
  * @retval -EWOULDBLOCK if operation would block.
  */
 __syscall int gpio_port_toggle_bits(const struct device *port,
-                                   gpio_port_pins_t pins);
+                                   gpio_port_pins_t pins, uint32_t foo);
 
 static inline int z_impl_gpio_port_toggle_bits(const struct device *port,
-                                              gpio_port_pins_t pins)
+                                              gpio_port_pins_t pins, uint32_t foo)
 {
        const struct gpio_driver_api *api =
                (const struct gpio_driver_api *)port->api;
@@ -1502,7 +1502,7 @@ static inline int z_impl_gpio_port_toggle_bits(const struct device *port,
 
        SYS_PORT_TRACING_FUNC_ENTER(gpio_port, toggle_bits, port, pins);
 
-       ret = api->port_toggle_bits(port, pins);
+       ret = api->port_toggle_bits(port, pins, foo);
        SYS_PORT_TRACING_FUNC_EXIT(gpio_port, toggle_bits, port, ret);
        return ret;
 }
@@ -1739,7 +1739,7 @@ static inline int gpio_pin_toggle(const struct device *port, gpio_pin_t pin)
        __ASSERT((cfg->port_pin_mask & (gpio_port_pins_t)BIT(pin)) != 0U,
                 "Unsupported pin");
 
-       return gpio_port_toggle_bits(port, (gpio_port_pins_t)BIT(pin));
+       return gpio_port_toggle_bits(port, (gpio_port_pins_t)BIT(pin), 1);
 }
 
 /**

1b. Apply the patch git apply repo.patch
2. Cache the files to tmp

cp drivers/gpio/gpio_nrfx.c /tmp/gpio_nrfx.c
cp include/zephyr/drivers/gpio.h /tmp/gpio.h

3. Restore working directory

git restore drivers/gpio/gpio_nrfx.c
git restore include/zephyr/drivers/gpio.h

4. Do pristine build of blinky west build -b nrf5340dk/nrf5340/cpuapp samples/basic/blinky -p always
5. Copy in changes for "true" edit

cp /tmp/gpio_nrfx.c drivers/gpio/gpio_nrfx.c
cp /tmp/gpio.h include/zephyr/drivers/gpio.h

6. Do incremental build of blinky, see build failure west build -b nrf5340dk/nrf5340/cpuapp samples/basic/blinky

error: conflicting types for 'z_impl_gpio_port_toggle_bits'

7. "fix" the error by touching the parent directory touch include/zephyr/drivers
8. See that fix works by successfully doing an incremental build west build -b nrf5340dk/nrf5340/cpuapp samples/basic/blinky

Relevant log output

Impact

Annoyance – Minor irritation; no significant impact on usability or functionality.

Environment

Linux
Hash ec72295 (recent main)

Additional Context

No response

[github-actions]

Hi @mark-inderhees! We appreciate you submitting your first issue for our open-source project. 🌟

Even though I'm a bot, I can assure you that the whole community is genuinely grateful for your time and effort. 🤖💙

[mark-inderhees]

After struggling with this all morning, I was able to get a hacky solution. I'll work on putting up a clearer PR.

$ git diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abe74033e62..bc13ce31f93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -808,6 +808,7 @@ execute_process(
   --directory        ${ZEPHYR_BASE}/include      # Walk this directory
   --out-file         ${syscalls_subdirs_txt}     # Write file with discovered folder
   --trigger-file     ${syscalls_subdirs_trigger} # Trigger file that is used for json generation
+  --all-files
   ${syscalls_links}                              # If defined, create symlinks for dependencies
 )
 file(STRINGS ${syscalls_subdirs_txt} PARSE_SYSCALLS_PATHS_DEPENDS ENCODING UTF-8)
@@ -841,6 +842,7 @@ else()
     --directory        ${ZEPHYR_BASE}/include      # Walk this directory
     --out-file         ${syscalls_subdirs_txt}     # Write file with discovered folder
     --trigger-file     ${syscalls_subdirs_trigger} # Trigger file that is used for json generation
+    --all-files
     ${syscalls_links}                              # If defined, create symlinks for dependencies
     DEPENDS ${PARSE_SYSCALLS_PATHS_DEPENDS}
   )
diff --git a/scripts/build/subfolder_list.py b/scripts/build/subfolder_list.py
index 2570ebe8534..6ad672dc449 100755
--- a/scripts/build/subfolder_list.py
+++ b/scripts/build/subfolder_list.py
@@ -31,14 +31,16 @@ def parse_args():
                               directories found')
     parser.add_argument('-t', '--trigger-file', required=False,
                         help='Trigger file to be touched to re-run CMake')
+    parser.add_argument('--all-files', action='store_true',
+                        help='Include all files in addition to directories')
 
     args = parser.parse_args()
 
     return args
 
 
-def get_subfolder_list(directory, create_links=None):
-    """Return subfolder list of a directory"""
+def get_subfolder_list(directory, create_links=None, include_files=False):
+    """Return subfolder list of a directory and optionally all files"""
     dirlist = []
 
     if create_links is not None:
@@ -52,7 +54,7 @@ def get_subfolder_list(directory, create_links=None):
     else:
         dirlist.append(directory)
 
-    for root, dirs, _ in os.walk(directory, topdown=True):
+    for root, dirs, files in os.walk(directory, topdown=True):
         dirs.sort()
         for subdir in dirs:
             if create_links is not None:
@@ -66,6 +68,13 @@ def get_subfolder_list(directory, create_links=None):
             else:
                 dirlist.append(os.path.join(root, subdir))
 
+        # Add files if requested
+        if include_files:
+            files.sort()
+            for file in files:
+                filepath = os.path.join(root, file)
+                dirlist.append(filepath)
+
     return dirlist
 
 
@@ -108,7 +117,7 @@ def main():
     """Parse command line arguments and take respective actions"""
     args = parse_args()
 
-    dirs = get_subfolder_list(args.directory, args.create_links)
+    dirs = get_subfolder_list(args.directory, args.create_links, args.all_files)
     gen_out_file(args.out_file, dirs)
 
     # Always touch trigger file to ensure json files are updated

[mark-inderhees]

Heres a PR: #96892