greybus-dev March 2025

greybus-dev@lists.linaro.org

9 participants
7 discussions

[PATCH] staging: greybus: Remove unnecessary NUL-termination checks

by Thorsten Blum

Commit 18f44de63f88 ("staging: greybus: change strncpy() to strscpy_pad()") didn't remove the now unnecessary NUL-termination checks. Unlike strncpy(), strscpy_pad() guarantees that the destination buffer is NUL-terminated, making the checks obsolete. Remove them. Signed-off-by: Thorsten Blum <thorsten.blum(a)linux.dev> --- drivers/staging/greybus/fw-management.c | 39 +------------------------ 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/drivers/staging/greybus/fw-management.c b/drivers/staging/greybus/fw-management.c index a47385175582..852c0830261f 100644 --- a/drivers/staging/greybus/fw-management.c +++ b/drivers/staging/greybus/fw-management.c @@ -125,16 +125,6 @@ static int fw_mgmt_interface_fw_version_operation(struct fw_mgmt *fw_mgmt, strscpy_pad(fw_info->firmware_tag, response.firmware_tag); - /* - * The firmware-tag should be NULL terminated, otherwise throw error but - * don't fail. - */ - if (fw_info->firmware_tag[GB_FIRMWARE_TAG_MAX_SIZE - 1] != '\0') { - dev_err(fw_mgmt->parent, - "fw-version: firmware-tag is not NULL terminated\n"); - fw_info->firmware_tag[GB_FIRMWARE_TAG_MAX_SIZE - 1] = '\0'; - } - return 0; } @@ -154,15 +144,6 @@ static int fw_mgmt_load_and_validate_operation(struct fw_mgmt *fw_mgmt, request.load_method = load_method; strscpy_pad(request.firmware_tag, tag); - /* - * The firmware-tag should be NULL terminated, otherwise throw error and - * fail. - */ - if (request.firmware_tag[GB_FIRMWARE_TAG_MAX_SIZE - 1] != '\0') { - dev_err(fw_mgmt->parent, "load-and-validate: firmware-tag is not NULL terminated\n"); - return -EINVAL; - } - /* Allocate ids from 1 to 255 (u8-max), 0 is an invalid id */ ret = ida_alloc_range(&fw_mgmt->id_map, 1, 255, GFP_KERNEL); if (ret < 0) { @@ -250,15 +231,6 @@ static int fw_mgmt_backend_fw_version_operation(struct fw_mgmt *fw_mgmt, strscpy_pad(request.firmware_tag, fw_info->firmware_tag); - /* - * The firmware-tag should be NULL terminated, otherwise throw error and - * fail. - */ - if (request.firmware_tag[GB_FIRMWARE_TAG_MAX_SIZE - 1] != '\0') { - dev_err(fw_mgmt->parent, "backend-version: firmware-tag is not NULL terminated\n"); - return -EINVAL; - } - ret = gb_operation_sync(connection, GB_FW_MGMT_TYPE_BACKEND_FW_VERSION, &request, sizeof(request), &response, sizeof(response)); @@ -301,16 +273,7 @@ static int fw_mgmt_backend_fw_update_operation(struct fw_mgmt *fw_mgmt, struct gb_fw_mgmt_backend_fw_update_request request; int ret; - ret = strscpy_pad(request.firmware_tag, tag); - - /* - * The firmware-tag should be NULL terminated, otherwise throw error and - * fail. - */ - if (ret == -E2BIG) { - dev_err(fw_mgmt->parent, "backend-update: firmware-tag is not NULL terminated\n"); - return -EINVAL; - } + strscpy_pad(request.firmware_tag, tag); /* Allocate ids from 1 to 255 (u8-max), 0 is an invalid id */ ret = ida_alloc_range(&fw_mgmt->id_map, 1, 255, GFP_KERNEL);

2 months

[PATCH] staging: greybus: Multiple cleanups and refactors

by gpittala

This patch includes multiple meaningful cleanups for the Greybus staging driver: 1. firmware.c: Replaced deprecated 'strncpy()' with 'strscpy()' 2. sysfs show functions: Replaced 'sprintf()' with 'sysfs_emit()' 3. loopback.c: Refactored a large function (gp_loopback_fn) to improve readability 4. audio_gb.c: Split logic in get_topology() into separate calls as per TODO All changes are tested and pass checkpatch.pl Signed-off-by: gpittala <ganeshkpittala(a)gmail.com> --- .../greybus/Documentation/firmware/firmware.c | 32 ++-- drivers/staging/greybus/arche-apb-ctrl.c | 11 +- drivers/staging/greybus/arche-platform.c | 11 +- drivers/staging/greybus/audio_gb.c | 37 +++- .../staging/greybus/audio_manager_module.c | 13 +- drivers/staging/greybus/gbphy.c | 3 +- drivers/staging/greybus/light.c | 5 +- drivers/staging/greybus/loopback.c | 170 ++++++++++-------- 8 files changed, 159 insertions(+), 123 deletions(-) diff --git a/drivers/staging/greybus/Documentation/firmware/firmware.c b/drivers/staging/greybus/Documentation/firmware/firmware.c index 765d69faa9cc..8e375c88c881 100644 --- a/drivers/staging/greybus/Documentation/firmware/firmware.c +++ b/drivers/staging/greybus/Documentation/firmware/firmware.c @@ -47,12 +47,12 @@ static int update_intf_firmware(int fd) ret = ioctl(fd, FW_MGMT_IOC_GET_INTF_FW, &intf_fw_info); if (ret < 0) { printf("Failed to get interface firmware version: %s (%d)\n", - fwdev, ret); + fwdev, ret); return -1; } printf("Interface Firmware tag (%s), major (%d), minor (%d)\n", - intf_fw_info.firmware_tag, intf_fw_info.major, + intf_fw_info.firmware_tag, intf_fw_info.major, intf_fw_info.minor); /* Try Interface Firmware load over Unipro */ @@ -63,25 +63,25 @@ static int update_intf_firmware(int fd) intf_load.major = 0; intf_load.minor = 0; - strncpy((char *)&intf_load.firmware_tag, firmware_tag, + strscpy((char *)&intf_load.firmware_tag, firmware_tag, GB_FIRMWARE_U_TAG_MAX_SIZE); ret = ioctl(fd, FW_MGMT_IOC_INTF_LOAD_AND_VALIDATE, &intf_load); if (ret < 0) { printf("Failed to load interface firmware: %s (%d)\n", fwdev, - ret); + ret); return -1; } if (intf_load.status != GB_FW_U_LOAD_STATUS_VALIDATED && intf_load.status != GB_FW_U_LOAD_STATUS_UNVALIDATED) { printf("Load status says loading failed: %d\n", - intf_load.status); + intf_load.status); return -1; } printf("Interface Firmware (%s) Load done: major: %d, minor: %d, status: %d\n", - firmware_tag, intf_load.major, intf_load.minor, + firmware_tag, intf_load.major, intf_load.minor, intf_load.status); /* Initiate Mode-switch to the newly loaded firmware */ @@ -101,35 +101,35 @@ static int update_backend_firmware(int fd) /* Get Backend Firmware Version */ printf("Getting Backend Firmware Version\n"); - strncpy((char *)&backend_fw_info.firmware_tag, firmware_tag, + strscpy((char *)&backend_fw_info.firmware_tag, firmware_tag, GB_FIRMWARE_U_TAG_MAX_SIZE); retry_fw_version: ret = ioctl(fd, FW_MGMT_IOC_GET_BACKEND_FW, &backend_fw_info); if (ret < 0) { printf("Failed to get backend firmware version: %s (%d)\n", - fwdev, ret); + fwdev, ret); return -1; } printf("Backend Firmware tag (%s), major (%d), minor (%d), status (%d)\n", - backend_fw_info.firmware_tag, backend_fw_info.major, + backend_fw_info.firmware_tag, backend_fw_info.major, backend_fw_info.minor, backend_fw_info.status); if (backend_fw_info.status == GB_FW_U_BACKEND_VERSION_STATUS_RETRY) goto retry_fw_version; - if ((backend_fw_info.status != GB_FW_U_BACKEND_VERSION_STATUS_SUCCESS) - && (backend_fw_info.status != GB_FW_U_BACKEND_VERSION_STATUS_NOT_AVAILABLE)) { + if ((backend_fw_info.status != GB_FW_U_BACKEND_VERSION_STATUS_SUCCESS) && + (backend_fw_info.status != GB_FW_U_BACKEND_VERSION_STATUS_NOT_AVAILABLE)) { printf("Failed to get backend firmware version: %s (%d)\n", - fwdev, backend_fw_info.status); + fwdev, backend_fw_info.status); return -1; } /* Try Backend Firmware Update over Unipro */ printf("Updating Backend Firmware\n"); - strncpy((char *)&backend_update.firmware_tag, firmware_tag, + strscpy((char *)&backend_update.firmware_tag, firmware_tag, GB_FIRMWARE_U_TAG_MAX_SIZE); retry_fw_update: @@ -148,10 +148,10 @@ static int update_backend_firmware(int fd) if (backend_update.status != GB_FW_U_BACKEND_FW_STATUS_SUCCESS) { printf("Load status says loading failed: %d\n", - backend_update.status); + backend_update.status); } else { printf("Backend Firmware (%s) Load done: status: %d\n", - firmware_tag, backend_update.status); + firmware_tag, backend_update.status); } return 0; @@ -185,7 +185,7 @@ int main(int argc, char *argv[]) fw_timeout = strtoul(argv[4], &endptr, 10); printf("Trying Firmware update: fwdev: %s, type: %s, tag: %s, timeout: %u\n", - fwdev, fw_update_type == 0 ? "interface" : "backend", + fwdev, fw_update_type == 0 ? "interface" : "backend", firmware_tag, fw_timeout); printf("Opening %s firmware management device\n", fwdev); diff --git a/drivers/staging/greybus/arche-apb-ctrl.c b/drivers/staging/greybus/arche-apb-ctrl.c index 90ab32638d3f..9862188e8367 100644 --- a/drivers/staging/greybus/arche-apb-ctrl.c +++ b/drivers/staging/greybus/arche-apb-ctrl.c @@ -17,6 +17,7 @@ #include <linux/pm.h> #include <linux/regulator/consumer.h> #include <linux/spinlock.h> +#include <linux/sysfs.h> #include "arche_platform.h" static void apb_bootret_deassert(struct device *dev); @@ -299,16 +300,16 @@ static ssize_t state_show(struct device *dev, switch (apb->state) { case ARCHE_PLATFORM_STATE_OFF: - return sprintf(buf, "off%s\n", + return sysfs_emit(buf, "off%s\n", apb->init_disabled ? ",disabled" : ""); case ARCHE_PLATFORM_STATE_ACTIVE: - return sprintf(buf, "active\n"); + return sysfs_emit(buf, "active\n"); case ARCHE_PLATFORM_STATE_STANDBY: - return sprintf(buf, "standby\n"); + return sysfs_emit(buf, "standby\n"); case ARCHE_PLATFORM_STATE_FW_FLASHING: - return sprintf(buf, "fw_flashing\n"); + return sysfs_emit(buf, "fw_flashing\n"); default: - return sprintf(buf, "unknown state\n"); + return sysfs_emit(buf, "unknown state\n"); } } diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c index d48464390f58..2e706c1169d5 100644 --- a/drivers/staging/greybus/arche-platform.c +++ b/drivers/staging/greybus/arche-platform.c @@ -21,6 +21,7 @@ #include <linux/time.h> #include <linux/greybus.h> #include <linux/of.h> +#include <linux/sysfs.h> #include "arche_platform.h" #if IS_ENABLED(CONFIG_USB_HSIC_USB3613) @@ -374,15 +375,15 @@ static ssize_t state_show(struct device *dev, switch (arche_pdata->state) { case ARCHE_PLATFORM_STATE_OFF: - return sprintf(buf, "off\n"); + return sysfs_emit(buf, "off\n"); case ARCHE_PLATFORM_STATE_ACTIVE: - return sprintf(buf, "active\n"); + return sysfs_emit(buf, "active\n"); case ARCHE_PLATFORM_STATE_STANDBY: - return sprintf(buf, "standby\n"); + return sysfs_emit(buf, "standby\n"); case ARCHE_PLATFORM_STATE_FW_FLASHING: - return sprintf(buf, "fw_flashing\n"); + return sysfs_emit(buf, "fw_flashing\n"); default: - return sprintf(buf, "unknown state\n"); + return sysfs_emit(buf, "unknown state\n"); } } diff --git a/drivers/staging/greybus/audio_gb.c b/drivers/staging/greybus/audio_gb.c index 9d8994fdb41a..c7f8df7b4cbe 100644 --- a/drivers/staging/greybus/audio_gb.c +++ b/drivers/staging/greybus/audio_gb.c @@ -8,21 +8,28 @@ #include <linux/greybus.h> #include "audio_codec.h" -/* TODO: Split into separate calls */ -int gb_audio_gb_get_topology(struct gb_connection *connection, - struct gb_audio_topology **topology) +static int gb_audio_gb_get_topology_size(struct gb_connection *connection, + u16 *size) { - struct gb_audio_get_topology_size_response size_resp; - struct gb_audio_topology *topo; - u16 size; + struct gb_audio_get_topology_size_response resp; int ret; ret = gb_operation_sync(connection, GB_AUDIO_TYPE_GET_TOPOLOGY_SIZE, - NULL, 0, &size_resp, sizeof(size_resp)); + NULL, 0, &resp, sizeof(resp)); if (ret) return ret; - size = le16_to_cpu(size_resp.size); + *size = le16_to_cpu(resp.size); + return 0; +} + +static int gb_audio_gb_read_topology(struct gb_connection *connection, + struct gb_audio_topology **topology, + u16 size) +{ + struct gb_audio_topology *topo; + int ret; + if (size < sizeof(*topo)) return -ENODATA; @@ -38,9 +45,21 @@ int gb_audio_gb_get_topology(struct gb_connection *connection, } *topology = topo; - return 0; } + +int gb_audio_gb_get_topology(struct gb_connection *connection, + struct gb_audio_topology **topology) +{ + u16 size; + int ret; + + ret = gb_audio_gb_get_topology_size(connection, &size); + if (ret) + return ret; + + return gb_audio_gb_read_topology(connection, topology, size); +} EXPORT_SYMBOL_GPL(gb_audio_gb_get_topology); int gb_audio_gb_get_control(struct gb_connection *connection, diff --git a/drivers/staging/greybus/audio_manager_module.c b/drivers/staging/greybus/audio_manager_module.c index 4a4dfb42f50f..781144be4eec 100644 --- a/drivers/staging/greybus/audio_manager_module.c +++ b/drivers/staging/greybus/audio_manager_module.c @@ -6,6 +6,7 @@ */ #include <linux/slab.h> +#include <linux/sysfs.h> #include "audio_manager.h" #include "audio_manager_private.h" @@ -76,7 +77,7 @@ static void gb_audio_module_release(struct kobject *kobj) static ssize_t gb_audio_module_name_show(struct gb_audio_manager_module *module, struct gb_audio_manager_module_attribute *attr, char *buf) { - return sprintf(buf, "%s", module->desc.name); + return sysfs_emit(buf, "%s\n", module->desc.name); } static struct gb_audio_manager_module_attribute gb_audio_module_name_attribute = @@ -85,7 +86,7 @@ static struct gb_audio_manager_module_attribute gb_audio_module_name_attribute = static ssize_t gb_audio_module_vid_show(struct gb_audio_manager_module *module, struct gb_audio_manager_module_attribute *attr, char *buf) { - return sprintf(buf, "%d", module->desc.vid); + return sysfs_emit(buf, "%d\n", module->desc.vid); } static struct gb_audio_manager_module_attribute gb_audio_module_vid_attribute = @@ -94,7 +95,7 @@ static struct gb_audio_manager_module_attribute gb_audio_module_vid_attribute = static ssize_t gb_audio_module_pid_show(struct gb_audio_manager_module *module, struct gb_audio_manager_module_attribute *attr, char *buf) { - return sprintf(buf, "%d", module->desc.pid); + return sysfs_emit(buf, "%d\n", module->desc.pid); } static struct gb_audio_manager_module_attribute gb_audio_module_pid_attribute = @@ -104,7 +105,7 @@ static ssize_t gb_audio_module_intf_id_show(struct gb_audio_manager_module *modu struct gb_audio_manager_module_attribute *attr, char *buf) { - return sprintf(buf, "%d", module->desc.intf_id); + return sysfs_emit(buf, "%d\n", module->desc.intf_id); } static struct gb_audio_manager_module_attribute @@ -115,7 +116,7 @@ static ssize_t gb_audio_module_ip_devices_show(struct gb_audio_manager_module *m struct gb_audio_manager_module_attribute *attr, char *buf) { - return sprintf(buf, "0x%X", module->desc.ip_devices); + return sysfs_emit(buf, "0x%X\n", module->desc.ip_devices); } static struct gb_audio_manager_module_attribute @@ -126,7 +127,7 @@ static ssize_t gb_audio_module_op_devices_show(struct gb_audio_manager_module *m struct gb_audio_manager_module_attribute *attr, char *buf) { - return sprintf(buf, "0x%X", module->desc.op_devices); + return sysfs_emit(buf, "0x%X\n", module->desc.op_devices); } static struct gb_audio_manager_module_attribute diff --git a/drivers/staging/greybus/gbphy.c b/drivers/staging/greybus/gbphy.c index 6adcad286633..72d72aa7cb0f 100644 --- a/drivers/staging/greybus/gbphy.c +++ b/drivers/staging/greybus/gbphy.c @@ -14,6 +14,7 @@ #include <linux/slab.h> #include <linux/device.h> #include <linux/greybus.h> +#include <linux/sysfs.h> #include "gbphy.h" @@ -31,7 +32,7 @@ static ssize_t protocol_id_show(struct device *dev, { struct gbphy_device *gbphy_dev = to_gbphy_dev(dev); - return sprintf(buf, "0x%02x\n", gbphy_dev->cport_desc->protocol_id); + return sysfs_emit(buf, "0x%02x\n", gbphy_dev->cport_desc->protocol_id); } static DEVICE_ATTR_RO(protocol_id); diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c index e509fdc715db..db0e98faec08 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c @@ -12,6 +12,7 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/greybus.h> +#include <linux/sysfs.h> #include <media/v4l2-flash-led-class.h> #define NAMES_MAX 32 @@ -173,7 +174,7 @@ static ssize_t fade_##__dir##_show(struct device *dev, \ struct led_classdev *cdev = dev_get_drvdata(dev); \ struct gb_channel *channel = get_channel_from_cdev(cdev); \ \ - return sprintf(buf, "%u\n", channel->fade_##__dir); \ + return sysfs_emit(buf, "%u\n", channel->fade_##__dir); \ } \ \ static ssize_t fade_##__dir##_store(struct device *dev, \ @@ -220,7 +221,7 @@ static ssize_t color_show(struct device *dev, struct device_attribute *attr, struct led_classdev *cdev = dev_get_drvdata(dev); struct gb_channel *channel = get_channel_from_cdev(cdev); - return sprintf(buf, "0x%08x\n", channel->color); + return sysfs_emit(buf, "0x%08x\n", channel->color); } static ssize_t color_store(struct device *dev, struct device_attribute *attr, diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index 1f19323b0e1a..0c1b45aa8b7b 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -26,6 +26,7 @@ #include <linux/atomic.h> #include <linux/pm_runtime.h> #include <linux/greybus.h> +#include <linux/sysfs.h> #include <asm/div64.h> #define NSEC_PER_DAY 86400000000000ULL @@ -125,7 +126,7 @@ static ssize_t field##_show(struct device *dev, \ char *buf) \ { \ struct gb_loopback *gb = dev_get_drvdata(dev); \ - return sprintf(buf, "%u\n", gb->field); \ + return sysfs_emit(buf, "%u\n", gb->field); \ } \ static DEVICE_ATTR_RO(field) @@ -137,8 +138,8 @@ static ssize_t name##_##field##_show(struct device *dev, \ struct gb_loopback *gb = dev_get_drvdata(dev); \ /* Report 0 for min and max if no transfer succeeded */ \ if (!gb->requests_completed) \ - return sprintf(buf, "0\n"); \ - return sprintf(buf, "%" #type "\n", gb->name.field); \ + return sysfs_emit(buf, "0\n"); \ + return sysfs_emit(buf, "%\n" #type "\n", gb->name.field); \ } \ static DEVICE_ATTR_RO(name##_##field) @@ -158,7 +159,7 @@ static ssize_t name##_avg_show(struct device *dev, \ rem = do_div(avg, count); \ rem *= 1000000; \ do_div(rem, count); \ - return sprintf(buf, "%llu.%06u\n", avg, (u32)rem); \ + return sysfs_emit(buf, "%llu.%06u\n", avg, (u32)rem); \ } \ static DEVICE_ATTR_RO(name##_avg) @@ -173,7 +174,7 @@ static ssize_t field##_show(struct device *dev, \ char *buf) \ { \ struct gb_loopback *gb = dev_get_drvdata(dev); \ - return sprintf(buf, "%" #type "\n", gb->field); \ + return sysfs_emit(buf, "%\n" #type "\n", gb->field); \ } \ static ssize_t field##_store(struct device *dev, \ struct device_attribute *attr, \ @@ -199,7 +200,7 @@ static ssize_t field##_show(struct device *dev, \ char *buf) \ { \ struct gb_loopback *gb = dev_get_drvdata(dev); \ - return sprintf(buf, "%u\n", gb->field); \ + return sysfs_emit(buf, "%u\n", gb->field); \ } \ static DEVICE_ATTR_RO(field) @@ -209,7 +210,7 @@ static ssize_t field##_show(struct device *dev, \ char *buf) \ { \ struct gb_loopback *gb = dev_get_drvdata(dev); \ - return sprintf(buf, "%" #type "\n", gb->field); \ + return sysfs_emit(buf, "%\n" #type "\n", gb->field); \ } \ static ssize_t field##_store(struct device *dev, \ struct device_attribute *attr, \ @@ -679,7 +680,7 @@ static int gb_loopback_request_handler(struct gb_operation *operation) } if (!gb_operation_response_alloc(operation, - len + sizeof(*response), GFP_KERNEL)) { + len + sizeof(*response), GFP_KERNEL)) { dev_err(dev, "error allocating response\n"); return -ENOMEM; } @@ -831,109 +832,120 @@ static void gb_loopback_async_wait_to_send(struct gb_loopback *gb) kthread_should_stop()); } -static int gb_loopback_fn(void *data) +static bool gb_loopback_should_stop(struct gb_loopback *gb, + struct gb_bundle *bundle) +{ + if (!gb->type) { + gb_pm_runtime_put_autosuspend(bundle); + wait_event_interruptible(gb->wq, + gb->type || kthread_should_stop()); + if (kthread_should_stop()) + return true; + gb_pm_runtime_get_sync(bundle); + } + return kthread_should_stop(); +} + +static void gb_loopback_handle_completion(struct gb_loopback *gb, + struct gb_bundle *bundle) +{ + gb_loopback_async_wait_all(gb); + + mutex_lock(&gb->mutex); + if (gb->iteration_count == gb->iteration_max) { + gb->type = 0; + gb->send_count = 0; + sysfs_notify(&gb->dev->kobj, NULL, "iteration_count"); + dev_dbg(&bundle->dev, "load test complete\n"); + } else { + dev_dbg(&bundle->dev, "continuing on with new test set\n"); + } + mutex_unlock(&gb->mutex); +} + +static void gb_loopback_dispatch_operation(struct gb_loopback *gb, int type, + u32 size) { int error = 0; - int us_wait = 0; - int type; - int ret; - u32 size; + if (gb->async) { + if (type == GB_LOOPBACK_TYPE_PING) + error = gb_loopback_async_ping(gb); + else if (type == GB_LOOPBACK_TYPE_TRANSFER) + error = gb_loopback_async_transfer(gb, size); + else if (type == GB_LOOPBACK_TYPE_SINK) + error = gb_loopback_async_sink(gb, size); + + if (error) { + gb->error++; + gb->iteration_count++; + } + } else { + if (type == GB_LOOPBACK_TYPE_PING) + error = gb_loopback_sync_ping(gb); + else if (type == GB_LOOPBACK_TYPE_TRANSFER) + error = gb_loopback_sync_transfer(gb, size); + else if (type == GB_LOOPBACK_TYPE_SINK) + error = gb_loopback_sync_sink(gb, size); + + if (error) + gb->error++; + gb->iteration_count++; + gb_loopback_calculate_stats(gb, !!error); + } +} + +static void gb_loopback_delay_if_needed(int us_wait) +{ + if (us_wait) { + if (us_wait < 20000) + usleep_range(us_wait, us_wait + 100); + else + msleep(us_wait / 1000); + } +} + +static int gb_loopback_fn(void *data) +{ + int us_wait = 0, type; + u32 size; struct gb_loopback *gb = data; struct gb_bundle *bundle = gb->connection->bundle; - ret = gb_pm_runtime_get_sync(bundle); - if (ret) - return ret; + if (gb_pm_runtime_get_sync(bundle)) + return -EIO; while (1) { - if (!gb->type) { - gb_pm_runtime_put_autosuspend(bundle); - wait_event_interruptible(gb->wq, gb->type || - kthread_should_stop()); - ret = gb_pm_runtime_get_sync(bundle); - if (ret) - return ret; - } - - if (kthread_should_stop()) + if (gb_loopback_should_stop(gb, bundle)) break; - /* Limit the maximum number of in-flight async operations */ gb_loopback_async_wait_to_send(gb); if (kthread_should_stop()) break; mutex_lock(&gb->mutex); - /* Optionally terminate */ if (gb->send_count == gb->iteration_max) { mutex_unlock(&gb->mutex); - - /* Wait for synchronous and asynchronous completion */ - gb_loopback_async_wait_all(gb); - - /* Mark complete unless user-space has poked us */ - mutex_lock(&gb->mutex); - if (gb->iteration_count == gb->iteration_max) { - gb->type = 0; - gb->send_count = 0; - sysfs_notify(&gb->dev->kobj, NULL, - "iteration_count"); - dev_dbg(&bundle->dev, "load test complete\n"); - } else { - dev_dbg(&bundle->dev, - "continuing on with new test set\n"); - } - mutex_unlock(&gb->mutex); + gb_loopback_handle_completion(gb, bundle); continue; } + size = gb->size; us_wait = gb->us_wait; type = gb->type; if (ktime_to_ns(gb->ts) == 0) gb->ts = ktime_get(); - /* Else operations to perform */ - if (gb->async) { - if (type == GB_LOOPBACK_TYPE_PING) - error = gb_loopback_async_ping(gb); - else if (type == GB_LOOPBACK_TYPE_TRANSFER) - error = gb_loopback_async_transfer(gb, size); - else if (type == GB_LOOPBACK_TYPE_SINK) - error = gb_loopback_async_sink(gb, size); - - if (error) { - gb->error++; - gb->iteration_count++; - } - } else { - /* We are effectively single threaded here */ - if (type == GB_LOOPBACK_TYPE_PING) - error = gb_loopback_sync_ping(gb); - else if (type == GB_LOOPBACK_TYPE_TRANSFER) - error = gb_loopback_sync_transfer(gb, size); - else if (type == GB_LOOPBACK_TYPE_SINK) - error = gb_loopback_sync_sink(gb, size); - - if (error) - gb->error++; - gb->iteration_count++; - gb_loopback_calculate_stats(gb, !!error); - } + gb_loopback_dispatch_operation(gb, type, size); + gb->send_count++; mutex_unlock(&gb->mutex); - if (us_wait) { - if (us_wait < 20000) - usleep_range(us_wait, us_wait + 100); - else - msleep(us_wait / 1000); - } + gb_loopback_delay_if_needed(us_wait); } gb_pm_runtime_put_autosuspend(bundle); - return 0; } -- 2.43.0

2 months

[PATCH] staging: greybus: Alignment warning

by Erick Karanja

Correct the alignment of the parameters to match the open parenthesis. Reported by checkpatch: CHECK: Alignment should match open parenthesis Signed-off-by: Erick Karanja <karanja99erick(a)gmail.com> --- drivers/staging/greybus/camera.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/camera.c index 5d80ace41d8e..ec9fddfc0b14 100644 --- a/drivers/staging/greybus/camera.c +++ b/drivers/staging/greybus/camera.c @@ -1165,8 +1165,8 @@ static int gb_camera_debugfs_init(struct gb_camera *gcam) gcam->debugfs.buffers[i].length = 0; debugfs_create_file_aux(entry->name, entry->mask, - gcam->debugfs.root, gcam, entry, - &gb_camera_debugfs_ops); + gcam->debugfs.root, gcam, entry, + &gb_camera_debugfs_ops); } return 0; -- 2.43.0

2 months, 1 week

[PATCH] staging: greybus: fix line length issue

by ErickKaranja

Fix line length exceeding 100 columns in arche-platform.c. The code now follows Linux kernel coding style guidelines by keeping lines under the maximum allowed length of 100 characters. Reported by checkpatch: CHECK: line length of 101 exceeds 100 columns Signed-off-by: ErickKaranja <karanja99erick(a)gmail.com> --- drivers/staging/greybus/arche-platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c index d48464390f58..1a82a7a3991c 100644 --- a/drivers/staging/greybus/arche-platform.c +++ b/drivers/staging/greybus/arche-platform.c @@ -179,8 +179,8 @@ static irqreturn_t arche_platform_wd_irq(int irq, void *devid) */ if (arche_pdata->wake_detect_state != WD_STATE_COLDBOOT_START) { - arche_platform_set_wake_detect_state(arche_pdata, - WD_STATE_COLDBOOT_TRIG); + arche_platform_set_wake_detect_state + (arche_pdata, WD_STATE_COLDBOOT_TRIG); spin_unlock_irqrestore(&arche_pdata->wake_lock, flags); return IRQ_WAKE_THREAD; -- 2.43.0

2 months, 2 weeks

[PATCH v2 22/31] tty: staging/greybus: pass tty_driver flags to tty_alloc_driver()

by Jiri Slaby (SUSE)

tty_alloc_driver() is supposed to receive tty driver flags. Signed-off-by: Jiri Slaby (SUSE) <jirislaby(a)kernel.org> Acked-by: Johan Hovold <johan(a)kernel.org> Cc: David Lin <dtwlin(a)gmail.com> Cc: Alex Elder <elder(a)kernel.org> Cc: greybus-dev(a)lists.linaro.org Cc: linux-staging(a)lists.linux.dev --- drivers/staging/greybus/uart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c index 8eab94cb06fa..308ed1ca9947 100644 --- a/drivers/staging/greybus/uart.c +++ b/drivers/staging/greybus/uart.c @@ -948,7 +948,8 @@ static int gb_tty_init(void) { int retval = 0; - gb_tty_driver = tty_alloc_driver(GB_NUM_MINORS, 0); + gb_tty_driver = tty_alloc_driver(GB_NUM_MINORS, TTY_DRIVER_REAL_RAW | + TTY_DRIVER_DYNAMIC_DEV); if (IS_ERR(gb_tty_driver)) { pr_err("Can not allocate tty driver\n"); retval = -ENOMEM; @@ -961,7 +962,6 @@ static int gb_tty_init(void) gb_tty_driver->minor_start = 0; gb_tty_driver->type = TTY_DRIVER_TYPE_SERIAL; gb_tty_driver->subtype = SERIAL_TYPE_NORMAL; - gb_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; gb_tty_driver->init_termios = tty_std_termios; gb_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; -- 2.49.0

2 months, 3 weeks

Re: [PATCH v2 00/31] tty: cleanup no. 99

by Jiri Slaby

Cc (sorry): Alex Elder <elder(a)kernel.org> Andrew Lunn <andrew+netdev(a)lunn.ch> Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> David Lin <dtwlin(a)gmail.com> "David S. Miller" <davem(a)davemloft.net> Eric Dumazet <edumazet(a)google.com> greybus-dev(a)lists.linaro.org "Ilpo Järvinen" <ilpo.jarvinen(a)linux.intel.com> Jakub Kicinski <kuba(a)kernel.org> Johan Hovold <johan(a)kernel.org> linux-alpha(a)vger.kernel.org linux-mmc(a)vger.kernel.org linux-staging(a)lists.linux.dev Matt Turner <mattst88(a)gmail.com> netdev(a)vger.kernel.org Paolo Abeni <pabeni(a)redhat.com> Richard Henderson <richard.henderson(a)linaro.org> Rob Herring <robh(a)kernel.org> sparclinux(a)vger.kernel.org Ulf Hansson <ulf.hansson(a)linaro.org> On 17. 03. 25, 8:00, Jiri Slaby (SUSE) wrote: > Hi, > > this is (again) a series of cleanup in tty. I am trying to rework > tty+serial to avoid limitations of devices (so called NR_UART or > tty_alloc_driver()'s first parameter). And the below popped up while > crawling through the code. So this is only a prep cleanup. > > * many tty flags are now enums > * many functions were improved for readability > * quite a few unused or old code dropped > > In particular, the runtime behaviour of the kernel before and after the > changes is supposed to be bug to bug compatible (except moxa's ioctl > and ISA evils dropped). That is, noone should notice. > > [v2] > * use serial_port_in/out() helpers in 26/30 (and not use serial_in/out()) > * the last patch is new > > Jiri Slaby (SUSE) (31): > tty: convert "TTY Struct Flags" to an enum > tty: audit: do not use N_TTY_BUF_SIZE > tty: caif: do not use N_TTY_BUF_SIZE > tty: move N_TTY_BUF_SIZE to n_tty > tty: n_tty: use uint for space returned by tty_write_room() > tty: n_tty: simplify process_output() > tty: n_tty: clean up process_output_block() > tty: n_tty: drop n_tty_trace() > tty: n_tty: extract n_tty_continue_cookie() from n_tty_read() > tty: n_tty: extract n_tty_wait_for_input() > tty: n_tty: move more_to_be_read to the end of n_tty_read() > tty: tty_driver: move TTY macros to the top > tty: tty_driver: convert "TTY Driver Flags" to an enum > tty: tty_driver: document both {,__}tty_alloc_driver() properly > tty: tty_driver: introduce TTY driver sub/types enums > tty: serdev: drop serdev_controller_ops::write_room() > tty: mmc: sdio: use bool for cts and remove parentheses > tty: moxa: drop version dump to logs > tty: moxa: drop ISA support > tty: moxa: carve out special ioctls and extra tty_port > tty: srmcons: fix retval from srmcons_init() > tty: staging/greybus: pass tty_driver flags to tty_alloc_driver() > tty: sunsu: drop serial_{in,out}p() > tty: sunsu: remove unused serial_icr_read() > serial: remove redundant tty_port_link_device() > serial: pass struct uart_state to uart_line_info() > serial: 8250: use serial_port_in/out() helpers > serial: 8250_rsa: simplify rsa8250_{request/release}_resource() > serial: 8250_port: do not use goto for UPQ_NO_TXEN_TEST code flow > serial: 8250_port: simplify serial8250_request_std_resource() > serial: switch change_irq and change_port to bool in uart_set_info() > > Documentation/driver-api/tty/tty_driver.rst | 4 +- > Documentation/driver-api/tty/tty_struct.rst | 2 +- > arch/alpha/kernel/srmcons.c | 62 ++--- > drivers/mmc/core/sdio_uart.c | 2 +- > drivers/net/caif/caif_serial.c | 2 +- > drivers/staging/greybus/uart.c | 4 +- > drivers/tty/Kconfig | 2 +- > drivers/tty/moxa.c | 251 +------------------- > drivers/tty/n_tty.c | 212 ++++++++--------- > drivers/tty/serdev/core.c | 11 - > drivers/tty/serdev/serdev-ttyport.c | 9 - > drivers/tty/serial/8250/8250_dw.c | 16 +- > drivers/tty/serial/8250/8250_fsl.c | 8 +- > drivers/tty/serial/8250/8250_omap.c | 2 +- > drivers/tty/serial/8250/8250_port.c | 59 ++--- > drivers/tty/serial/8250/8250_rsa.c | 21 +- > drivers/tty/serial/serial_core.c | 10 +- > drivers/tty/serial/sunsu.c | 178 ++++++-------- > drivers/tty/tty_audit.c | 10 +- > drivers/tty/tty_io.c | 8 +- > include/linux/serdev.h | 6 - > include/linux/tty.h | 53 +++-- > include/linux/tty_driver.h | 180 +++++++------- > 23 files changed, 412 insertions(+), 700 deletions(-) > -- js suse labs

2 months, 3 weeks

[PATCH 00/29] tty: cleanup no. 99

by Jiri Slaby (SUSE)

Hi, this is (again) a series of cleanup in tty. I am trying to rework tty+serial to avoid limitations of devices (so called NR_UART or tty_alloc_driver()'s first parameter). And the below popped up while crawling through the code. So this is only a prep cleanup. * many tty flags are now enums * many functions were improved for readability * quite a few unused or old code dropped In particular, the runtime behaviour of the kernel before and after the changes is supposed to be bug to bug compatible (except moxa's ioctl and ISA evils dropped). That is, noone should notice. Cc: Alex Elder <elder(a)kernel.org> Cc: Andrew Lunn <andrew+netdev(a)lunn.ch> Cc: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Cc: David Lin <dtwlin(a)gmail.com> Cc: "David S. Miller" <davem(a)davemloft.net> Cc: Eric Dumazet <edumazet(a)google.com> Cc: greybus-dev(a)lists.linaro.org Cc: "Ilpo Järvinen" <ilpo.jarvinen(a)linux.intel.com> Cc: Jakub Kicinski <kuba(a)kernel.org> Cc: Johan Hovold <johan(a)kernel.org> Cc: linux-alpha(a)vger.kernel.org Cc: linux-staging(a)lists.linux.dev Cc: Matt Turner <mattst88(a)gmail.com> Cc: netdev(a)vger.kernel.org Cc: Paolo Abeni <pabeni(a)redhat.com> Cc: Richard Henderson <richard.henderson(a)linaro.org> Cc: Rob Herring <robh(a)kernel.org> Cc: sparclinux(a)vger.kernel.org Jiri Slaby (SUSE) (29): tty: convert "TTY Struct Flags" to an enum tty: audit: do not use N_TTY_BUF_SIZE tty: caif: do not use N_TTY_BUF_SIZE tty: move N_TTY_BUF_SIZE to n_tty tty: n_tty: use uint for space returned by tty_write_room() tty: n_tty: simplify process_output() tty: n_tty: clean up process_output_block() tty: n_tty: drop n_tty_trace() tty: n_tty: extract n_tty_continue_cookie() from n_tty_read() tty: n_tty: extract n_tty_wait_for_input() tty: n_tty: move more_to_be_read to the end of n_tty_read() tty: tty_driver: move TTY macros to the top tty: tty_driver: convert "TTY Driver Flags" to an enum tty: tty_driver: document both {,__}tty_alloc_driver() properly tty: tty_driver: introduce TTY driver sub/types enums tty: serdev: drop serdev_controller_ops::write_room() tty: moxa: drop version dump to logs tty: moxa: drop ISA support tty: moxa: carve out special ioctls and extra tty_port tty: srmcons: fix retval from srmcons_init() tty: staging/greybus: pass tty_driver flags to tty_alloc_driver() tty: sunsu: drop serial_{in,out}p() tty: sunsu: remove unused serial_icr_read() serial: remove redundant tty_port_link_device() serial: pass struct uart_state to uart_line_info() serial: 8250: use serial_in/out() helpers serial: 8250_rsa: simplify rsa8250_{request/release}_resource() serial: 8250_port: do not use goto for UPQ_NO_TXEN_TEST code flow serial: 8250_port: simplify serial8250_request_std_resource() Documentation/driver-api/tty/tty_driver.rst | 4 +- Documentation/driver-api/tty/tty_struct.rst | 2 +- arch/alpha/kernel/srmcons.c | 62 ++--- drivers/net/caif/caif_serial.c | 2 +- drivers/staging/greybus/uart.c | 4 +- drivers/tty/Kconfig | 2 +- drivers/tty/moxa.c | 251 +------------------- drivers/tty/n_tty.c | 212 ++++++++--------- drivers/tty/serdev/core.c | 11 - drivers/tty/serdev/serdev-ttyport.c | 9 - drivers/tty/serial/8250/8250_dw.c | 17 +- drivers/tty/serial/8250/8250_fsl.c | 8 +- drivers/tty/serial/8250/8250_omap.c | 2 +- drivers/tty/serial/8250/8250_port.c | 59 ++--- drivers/tty/serial/8250/8250_rsa.c | 21 +- drivers/tty/serial/serial_core.c | 6 +- drivers/tty/serial/sunsu.c | 178 ++++++-------- drivers/tty/tty_audit.c | 10 +- drivers/tty/tty_io.c | 8 +- include/linux/serdev.h | 6 - include/linux/tty.h | 53 +++-- include/linux/tty_driver.h | 180 +++++++------- 22 files changed, 410 insertions(+), 697 deletions(-) -- 2.48.1

2 months, 3 weeks

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

greybus-dev March 2025