remove clients from sddf pinctrl

Signed-off-by: Bill Nguyen <[email protected]>

Author: dreamliner787-9

src/c/c.zig

@@ -705,20 +705,6 @@ export fn sdfgen_sddf_pinctrl_destroy(system: *align(8) anyopaque) void {
     allocator.destroy(pinctrl);
 }
 
-export fn sdfgen_sddf_pinctrl_add_client(system: *align(8) anyopaque, client: *align(8) anyopaque) bindings.sdfgen_sddf_status_t {
-    const pinctrl: *sddf.Pinctrl = @ptrCast(system);
-    pinctrl.addClient(@ptrCast(client)) catch |e| {
-        switch (e) {
-            sddf.Pinctrl.Error.DuplicateClient => return 1,
-            sddf.Pinctrl.Error.InvalidClient => return 2,
-            // Should never happen when adding a client
-            sddf.Pinctrl.Error.NotConnected => @panic("internal error"),
-        }
-    };
-
-    return 0;
-}
-
 export fn sdfgen_sddf_pinctrl_connect(system: *align(8) anyopaque) bool {
     const pinctrl: *sddf.Pinctrl = @ptrCast(system);
     pinctrl.connect() catch return false;

src/c/sdfgen.h

@@ -132,7 +132,6 @@ bool sdfgen_sddf_gpu_serialise_config(void *system, char *output_dir);
 
 void *sdfgen_sddf_pinctrl(void *sdf, void *device, void *driver);
 void sdfgen_sddf_pinctrl_destroy(void *system);
-sdfgen_sddf_status_t sdfgen_sddf_pinctrl_add_client(void *system, void *client);
 bool sdfgen_sddf_pinctrl_connect(void *system);
 bool sdfgen_sddf_pinctrl_serialise_config(void *system, char *output_dir);
 

src/data.zig

@@ -339,15 +339,6 @@ pub const Resources = struct {
         };
     };
 
-    pub const Pinctrl = struct {
-        const MAGIC: [5]u8 = MAGIC_START ++ .{0x8};
-
-        pub const Client = extern struct {
-            magic: [5]u8 = MAGIC,
-            driver_id: u8,
-        };
-    };
-
     pub const Fs = extern struct {
         const MAGIC: [8]u8 = LIONS_MAGIC_START ++ .{0x1};
 

src/python/module.py

@@ -146,9 +146,6 @@ class SddfStatus(IntEnum):
 libsdfgen.sdfgen_sddf_pinctrl_destroy.restype = None
 libsdfgen.sdfgen_sddf_pinctrl_destroy.argtypes = [c_void_p]
 
-libsdfgen.sdfgen_sddf_pinctrl_add_client.restype = c_uint32
-libsdfgen.sdfgen_sddf_pinctrl_add_client.argtypes = [c_void_p, c_void_p]
-
 libsdfgen.sdfgen_sddf_pinctrl_connect.restype = c_bool
 libsdfgen.sdfgen_sddf_pinctrl_connect.argtypes = [c_void_p]
 libsdfgen.sdfgen_sddf_pinctrl_serialise_config.restype = c_bool
@@ -1029,17 +1026,6 @@ def __init__(
 
             self._obj: c_void_p = libsdfgen.sdfgen_sddf_pinctrl(sdf._obj, device_obj, driver._obj)
 
-        def add_client(self, client: SystemDescription.ProtectionDomain):
-            ret = libsdfgen.sdfgen_sddf_pinctrl_add_client(self._obj, client._obj)
-            if ret == SddfStatus.OK:
-                return
-            elif ret == SddfStatus.DUPLICATE_CLIENT:
-                raise Exception(f"duplicate client given '{client}'")
-            elif ret == SddfStatus.INVALID_CLIENT:
-                raise Exception(f"invalid client given '{client}'")
-            else:
-                raise Exception(f"internal error: {ret}")
-
         def connect(self) -> bool:
             return libsdfgen.sdfgen_sddf_pinctrl_connect(self._obj)
 

src/sddf.zig

@@ -1633,11 +1633,8 @@ pub const Pinctrl = struct {
     /// Device Tree node for the pinctrl device
     device: *dtb.Node,
     device_res: ConfigResources.Device,
-    /// Client PDs serviced by the pinctrl driver
-    clients: std.ArrayList(*Pd),
-    client_configs: std.ArrayList(ConfigResources.Pinctrl.Client),
-    connected: bool = false,
     serialised: bool = false,
+    connected: bool = false,
 
     pub const Error = SystemError;
 
@@ -1652,53 +1649,20 @@ pub const Pinctrl = struct {
             .driver = driver,
             .device = device,
             .device_res = std.mem.zeroInit(ConfigResources.Device, .{}),
-            .clients = std.ArrayList(*Pd).init(allocator),
-            .client_configs = std.ArrayList(ConfigResources.Pinctrl.Client).init(allocator),
         };
     }
 
     pub fn deinit(system: *Pinctrl) void {
-        system.clients.deinit();
-        system.client_configs.deinit();
-    }
-
-    pub fn addClient(system: *Pinctrl, client: *Pd) Error!void {
-        // Check that the client does not already exist
-        for (system.clients.items) |existing_client| {
-            if (std.mem.eql(u8, existing_client.name, client.name)) {
-                return Error.DuplicateClient;
-            }
-        }
-        if (std.mem.eql(u8, client.name, system.driver.name)) {
-            log.err("invalid pinctrl client, same name as driver '{s}", .{client.name});
-            return Error.InvalidClient;
-        }
-        const client_priority = if (client.priority) |priority| priority else Pd.DEFAULT_PRIORITY;
-        const driver_priority = if (system.driver.priority) |priority| priority else Pd.DEFAULT_PRIORITY;
-        if (client_priority >= driver_priority) {
-            log.err("invalid pinctrl client '{s}', driver '{s}' must have greater priority than client", .{ client.name, system.driver.name });
-            return Error.InvalidClient;
-        }
-        system.clients.append(client) catch @panic("Could not add client to Pinctrl");
-        system.client_configs.append(std.mem.zeroInit(ConfigResources.Pinctrl.Client, .{})) catch @panic("Could not add client to Timer");
+        // In the future when we add clients we would need to free associated resources here
+        _ = system;
+        return;
     }
 
     pub fn connect(system: *Pinctrl) !void {
         // The driver must be passive
         assert(system.driver.passive.?);
 
         try createDriver(system.sdf, system.driver, system.device, .pinctrl, &system.device_res);
-        for (system.clients.items, 0..) |client, i| {
-            const ch = Channel.create(system.driver, client, .{
-                // Client needs to be able to PPC into driver
-                .pp = .b,
-                // Client does not need to notify driver
-                .pd_b_notify = false,
-            }) catch unreachable;
-            system.sdf.addChannel(ch);
-            system.client_configs.items[i].driver_id = ch.pd_b_id;
-        }
-
         system.connected = true;
     }
 
@@ -1710,11 +1674,6 @@ pub const Pinctrl = struct {
         const device_res_data_name = fmt(allocator, "{s}_device_resources", .{system.driver.name});
         try data.serialize(allocator, system.device_res, prefix, device_res_data_name);
 
-        for (system.clients.items, 0..) |client, i| {
-            const data_name = fmt(allocator, "pinctrl_client_{s}", .{client.name});
-            try data.serialize(allocator, system.client_configs.items[i], prefix, data_name);
-        }
-
         system.serialised = true;
     }
 };