greybus-dev September 2024

greybus-dev@lists.linaro.org

10 participants
6 discussions

[PATCH] staging: Fix atomicity violation in get_serial_info()

by Qiu-ji Chen

Atomicity violation occurs during consecutive reads of the members of gb_tty. Consider a scenario where, because the consecutive reads of gb_tty members are not protected by a lock, the value of gb_tty may still be changing during the read process. gb_tty->port.close_delay and gb_tty->port.closing_wait are updated together, such as in the set_serial_info() function. If during the read process, gb_tty->port.close_delay and gb_tty->port.closing_wait are still being updated, it is possible that gb_tty->port.close_delay is updated while gb_tty->port.closing_wait is not. In this case, the code first reads gb_tty->port.close_delay and then gb_tty->port.closing_wait. A new gb_tty->port.close_delay and an old gb_tty->port.closing_wait could be read. Such values, whether before or after the update, should not coexist as they represent an intermediate state. This could result in a mismatch of the values read for gb_tty->minor, gb_tty->port.close_delay, and gb_tty->port.closing_wait, which in turn could cause ss->close_delay and ss->closing_wait to be mismatched. To address this issue, we have enclosed all sequential read operations of the gb_tty variable within a lock. This ensures that the value of gb_tty remains unchanged throughout the process, guaranteeing its validity. This possible bug is found by an experimental static analysis tool developed by our team. This tool analyzes the locking APIs to extract function pairs that can be concurrently executed, and then analyzes the instructions in the paired functions to identify possible concurrency bugs including data races and atomicity violations. Fixes: b71e571adaa5 ("staging: greybus: uart: fix TIOCSSERIAL jiffies conversions") Cc: stable(a)vger.kernel.org Signed-off-by: Qiu-ji Chen <chenqiuji666(a)gmail.com> --- drivers/staging/greybus/uart.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c index cdf4ebb93b10..8cc18590d97b 100644 --- a/drivers/staging/greybus/uart.c +++ b/drivers/staging/greybus/uart.c @@ -595,12 +595,14 @@ static int get_serial_info(struct tty_struct *tty, { struct gb_tty *gb_tty = tty->driver_data; + mutex_lock(&gb_tty->port.mutex); ss->line = gb_tty->minor; ss->close_delay = jiffies_to_msecs(gb_tty->port.close_delay) / 10; ss->closing_wait = gb_tty->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ? ASYNC_CLOSING_WAIT_NONE : jiffies_to_msecs(gb_tty->port.closing_wait) / 10; + mutex_unlock(&gb_tty->port.mutex); return 0; } -- 2.34.1

1 month

[PATCH] staging: greybus: Fix capitalization and punctuation inconsistencies

by Steven Davis

There were a lot of inconsistencies in outputs and comments, some were properly formatted and capitalized, and some weren't. This patch resolves this by properly formatting the inconsistent comments and outputs. Signed-off-by: Steven Davis <goldside000(a)outlook.com> --- drivers/staging/greybus/arche-platform.c | 38 ++++++++++++------------ drivers/staging/greybus/authentication.c | 6 ++-- drivers/staging/greybus/bootrom.c | 16 +++++----- drivers/staging/greybus/light.c | 26 ++++++++-------- drivers/staging/greybus/log.c | 10 +++---- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c index b33977ccd527..45c1737817d0 100644 --- a/drivers/staging/greybus/arche-platform.c +++ b/drivers/staging/greybus/arche-platform.c @@ -95,7 +95,7 @@ static int apb_cold_boot(struct device *dev, void *data) ret = apb_ctrl_coldboot(dev); if (ret) - dev_warn(dev, "failed to coldboot\n"); + dev_warn(dev, "Failed to coldboot\n"); /*Child nodes are independent, so do not exit coldboot operation */ return 0; @@ -107,7 +107,7 @@ static int apb_poweroff(struct device *dev, void *data) /* Enable HUB3613 into HUB mode. */ if (usb3613_hub_mode_ctrl(false)) - dev_warn(dev, "failed to control hub device\n"); + dev_warn(dev, "Failed to control hub device\n"); return 0; } @@ -142,7 +142,7 @@ static irqreturn_t arche_platform_wd_irq_thread(int irq, void *devid) /* Enable HUB3613 into HUB mode. */ if (usb3613_hub_mode_ctrl(true)) - dev_warn(arche_pdata->dev, "failed to control hub device\n"); + dev_warn(arche_pdata->dev, "Failed to control hub device\n"); spin_lock_irqsave(&arche_pdata->wake_lock, flags); arche_platform_set_wake_detect_state(arche_pdata, WD_STATE_IDLE); @@ -228,12 +228,12 @@ arche_platform_coldboot_seq(struct arche_platform_drvdata *arche_pdata) ret = clk_prepare_enable(arche_pdata->svc_ref_clk); if (ret) { - dev_err(arche_pdata->dev, "failed to enable svc_ref_clk: %d\n", + dev_err(arche_pdata->dev, "Failed to enable svc_ref_clk: %d\n", ret); return ret; } - /* bring SVC out of reset */ + /* Bring SVC out of reset */ svc_reset_onoff(arche_pdata->svc_reset, !arche_pdata->is_reset_act_hi); arche_platform_set_state(arche_pdata, ARCHE_PLATFORM_STATE_ACTIVE); @@ -262,7 +262,7 @@ arche_platform_fw_flashing_seq(struct arche_platform_drvdata *arche_pdata) ret = clk_prepare_enable(arche_pdata->svc_ref_clk); if (ret) { - dev_err(arche_pdata->dev, "failed to enable svc_ref_clk: %d\n", + dev_err(arche_pdata->dev, "Failed to enable svc_ref_clk: %d\n", ret); return ret; } @@ -340,7 +340,7 @@ static ssize_t state_store(struct device *dev, if (arche_pdata->state == ARCHE_PLATFORM_STATE_STANDBY) goto exit; - dev_warn(arche_pdata->dev, "standby state not supported\n"); + dev_warn(arche_pdata->dev, "Standby state not supported\n"); } else if (sysfs_streq(buf, "fw_flashing")) { if (arche_pdata->state == ARCHE_PLATFORM_STATE_FW_FLASHING) goto exit; @@ -358,7 +358,7 @@ static ssize_t state_store(struct device *dev, if (ret) goto exit; } else { - dev_err(arche_pdata->dev, "unknown state\n"); + dev_err(arche_pdata->dev, "Unknown state\n"); ret = -EINVAL; } @@ -434,7 +434,7 @@ static int arche_platform_probe(struct platform_device *pdev) if (!arche_pdata) return -ENOMEM; - /* setup svc reset gpio */ + /* Setup svc reset gpio */ arche_pdata->is_reset_act_hi = of_property_read_bool(np, "svc,reset-active-high"); if (arche_pdata->is_reset_act_hi) @@ -445,7 +445,7 @@ static int arche_platform_probe(struct platform_device *pdev) arche_pdata->svc_reset = devm_gpiod_get(dev, "svc,reset", flags); if (IS_ERR(arche_pdata->svc_reset)) { ret = PTR_ERR(arche_pdata->svc_reset); - dev_err(dev, "failed to request svc-reset GPIO: %d\n", ret); + dev_err(dev, "Failed to request svc-reset GPIO: %d\n", ret); return ret; } arche_platform_set_state(arche_pdata, ARCHE_PLATFORM_STATE_OFF); @@ -454,16 +454,16 @@ static int arche_platform_probe(struct platform_device *pdev) GPIOD_OUT_LOW); if (IS_ERR(arche_pdata->svc_sysboot)) { ret = PTR_ERR(arche_pdata->svc_sysboot); - dev_err(dev, "failed to request sysboot0 GPIO: %d\n", ret); + dev_err(dev, "Failed to request sysboot0 GPIO: %d\n", ret); return ret; } - /* setup the clock request gpio first */ + /* Setup the clock request gpio first */ arche_pdata->svc_refclk_req = devm_gpiod_get(dev, "svc,refclk-req", GPIOD_IN); if (IS_ERR(arche_pdata->svc_refclk_req)) { ret = PTR_ERR(arche_pdata->svc_refclk_req); - dev_err(dev, "failed to request svc-clk-req GPIO: %d\n", ret); + dev_err(dev, "Failed to request svc-clk-req GPIO: %d\n", ret); return ret; } @@ -471,7 +471,7 @@ static int arche_platform_probe(struct platform_device *pdev) arche_pdata->svc_ref_clk = devm_clk_get(dev, "svc_ref_clk"); if (IS_ERR(arche_pdata->svc_ref_clk)) { ret = PTR_ERR(arche_pdata->svc_ref_clk); - dev_err(dev, "failed to get svc_ref_clk: %d\n", ret); + dev_err(dev, "Failed to get svc_ref_clk: %d\n", ret); return ret; } @@ -504,20 +504,20 @@ static int arche_platform_probe(struct platform_device *pdev) IRQF_TRIGGER_RISING | IRQF_ONESHOT, dev_name(dev), arche_pdata); if (ret) { - dev_err(dev, "failed to request wake detect IRQ %d\n", ret); + dev_err(dev, "Failed to request wake detect IRQ %d\n", ret); return ret; } disable_irq(arche_pdata->wake_detect_irq); ret = device_create_file(dev, &dev_attr_state); if (ret) { - dev_err(dev, "failed to create state file in sysfs\n"); + dev_err(dev, "Failed to create state file in sysfs\n"); return ret; } ret = of_platform_populate(np, NULL, NULL, dev); if (ret) { - dev_err(dev, "failed to populate child nodes %d\n", ret); + dev_err(dev, "Failed to populate child nodes %d\n", ret); goto err_device_remove; } @@ -525,7 +525,7 @@ static int arche_platform_probe(struct platform_device *pdev) ret = register_pm_notifier(&arche_pdata->pm_notifier); if (ret) { - dev_err(dev, "failed to register pm notifier %d\n", ret); + dev_err(dev, "Failed to register pm notifier %d\n", ret); goto err_device_remove; } @@ -570,7 +570,7 @@ static void arche_platform_remove(struct platform_device *pdev) arche_platform_poweroff_seq(arche_pdata); if (usb3613_hub_mode_ctrl(false)) - dev_warn(arche_pdata->dev, "failed to control hub device\n"); + dev_warn(arche_pdata->dev, "Failed to control hub device\n"); } static __maybe_unused int arche_platform_suspend(struct device *dev) diff --git a/drivers/staging/greybus/authentication.c b/drivers/staging/greybus/authentication.c index d53e58f92e81..e1a819d1b1c8 100644 --- a/drivers/staging/greybus/authentication.c +++ b/drivers/staging/greybus/authentication.c @@ -93,7 +93,7 @@ static int cap_get_endpoint_uid(struct gb_cap *cap, u8 *euid) ret = gb_operation_sync(connection, GB_CAP_TYPE_GET_ENDPOINT_UID, NULL, 0, &response, sizeof(response)); if (ret) { - dev_err(cap->parent, "failed to get endpoint uid (%d)\n", ret); + dev_err(cap->parent, "Failed to get endpoint uid (%d)\n", ret); return ret; } @@ -126,7 +126,7 @@ static int cap_get_ims_certificate(struct gb_cap *cap, u32 class, u32 id, ret = gb_operation_request_send_sync(op); if (ret) { - dev_err(cap->parent, "failed to get certificate (%d)\n", ret); + dev_err(cap->parent, "Failed to get certificate (%d)\n", ret); goto done; } @@ -165,7 +165,7 @@ static int cap_authenticate(struct gb_cap *cap, u32 auth_type, u8 *uid, ret = gb_operation_request_send_sync(op); if (ret) { - dev_err(cap->parent, "failed to authenticate (%d)\n", ret); + dev_err(cap->parent, "Failed to authenticate (%d)\n", ret); goto done; } diff --git a/drivers/staging/greybus/bootrom.c b/drivers/staging/greybus/bootrom.c index d4d86b3898de..8ad763026dea 100644 --- a/drivers/staging/greybus/bootrom.c +++ b/drivers/staging/greybus/bootrom.c @@ -179,7 +179,7 @@ static int find_firmware(struct gb_bootrom *bootrom, u8 stage) &connection->bundle->dev); if (rc) { dev_err(&connection->bundle->dev, - "failed to find %s firmware (%d)\n", firmware_name, rc); + "Failed to find %s firmware (%d)\n", firmware_name, rc); } return rc; @@ -274,7 +274,7 @@ static int gb_bootrom_get_firmware(struct gb_operation *op) size = le32_to_cpu(firmware_request->size); if (offset >= fw->size || size > fw->size - offset) { - dev_warn(dev, "bad firmware request (offs = %u, size = %u)\n", + dev_warn(dev, "Bad firmware request (offs = %u, size = %u)\n", offset, size); ret = -EINVAL; goto unlock; @@ -290,7 +290,7 @@ static int gb_bootrom_get_firmware(struct gb_operation *op) firmware_response = op->response->payload; memcpy(firmware_response, fw->data + offset, size); - dev_dbg(dev, "responding with firmware (offs = %u, size = %u)\n", + dev_dbg(dev, "Responding with firmware (offs = %u, size = %u)\n", offset, size); unlock: @@ -340,7 +340,7 @@ static int gb_bootrom_ready_to_boot(struct gb_operation *op) /* * XXX Should we return error for insecure firmware? */ - dev_dbg(dev, "ready to boot: 0x%x, 0\n", status); + dev_dbg(dev, "Ready to boot: 0x%x, 0\n", status); queue_work: /* @@ -367,7 +367,7 @@ static int gb_bootrom_request_handler(struct gb_operation *op) return gb_bootrom_ready_to_boot(op); default: dev_err(&op->connection->bundle->dev, - "unsupported request: %u\n", type); + "Unsupported request: %u\n", type); return -EINVAL; } } @@ -388,14 +388,14 @@ static int gb_bootrom_get_version(struct gb_bootrom *bootrom) sizeof(response)); if (ret) { dev_err(&bundle->dev, - "failed to get protocol version: %d\n", + "Failed to get protocol version: %d\n", ret); return ret; } if (response.major > request.major) { dev_err(&bundle->dev, - "unsupported major protocol version (%u > %u)\n", + "Unsupported major protocol version (%u > %u)\n", response.major, request.major); return -ENOTSUPP; } @@ -467,7 +467,7 @@ static int gb_bootrom_probe(struct gb_bundle *bundle, NULL, 0); if (ret) { dev_err(&connection->bundle->dev, - "failed to send AP READY: %d\n", ret); + "Failed to send AP READY: %d\n", ret); goto err_cancel_timeout; } diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c index e509fdc715db..8ee08389d801 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c @@ -193,7 +193,7 @@ static ssize_t fade_##__dir##_store(struct device *dev, \ \ ret = kstrtou8(buf, 0, &fade); \ if (ret < 0) { \ - dev_err(dev, "could not parse fade value %d\n", ret); \ + dev_err(dev, "Could not parse fade value %d\n", ret); \ goto unlock; \ } \ if (channel->fade_##__dir == fade) \ @@ -238,7 +238,7 @@ static ssize_t color_store(struct device *dev, struct device_attribute *attr, } ret = kstrtou32(buf, 0, &color); if (ret < 0) { - dev_err(dev, "could not parse color value %d\n", ret); + dev_err(dev, "Could not parse color value %d\n", ret); goto unlock; } @@ -376,12 +376,12 @@ static int __gb_lights_led_brightness_set(struct gb_channel *channel) else channel->active = false; - /* we need to keep module alive when turning to active state */ + /* We need to keep module alive when turning to active state */ if (!old_active && channel->active) goto out_unlock; /* - * on the other hand if going to inactive we still hold a reference and + * On the other hand if going to inactive we still hold a reference and * need to put it, so we could go to suspend. */ if (old_active && !channel->active) @@ -466,12 +466,12 @@ static int gb_blink_set(struct led_classdev *cdev, unsigned long *delay_on, else channel->active = false; - /* we need to keep module alive when turning to active state */ + /* We need to keep module alive when turning to active state. */ if (!old_active && channel->active) goto out_unlock; /* - * on the other hand if going to inactive we still hold a reference and + * On the other hand if going to inactive we still hold a reference and * need to put it, so we could go to suspend. */ if (old_active && !channel->active) @@ -532,7 +532,7 @@ static int gb_lights_light_v4l2_register(struct gb_light *light) channel_flash = get_channel_from_mode(light, GB_CHANNEL_MODE_FLASH); if (!channel_flash) { - dev_err(dev, "failed to get flash channel from mode\n"); + dev_err(dev, "Failed to get flash channel from mode\n"); return -EINVAL; } @@ -576,7 +576,7 @@ static int gb_lights_light_v4l2_register(struct gb_light *light) { struct gb_connection *connection = get_conn_from_light(light); - dev_err(&connection->bundle->dev, "no support for v4l2 subdevices\n"); + dev_err(&connection->bundle->dev, "No support for v4l2 subdevices\n"); return 0; } @@ -728,14 +728,14 @@ static int __gb_lights_channel_torch_attach(struct gb_channel *channel, { char *name; - /* we can only attach torch to a flash channel */ + /* We can only attach torch to a flash channel */ if (!(channel->mode & GB_CHANNEL_MODE_FLASH)) return 0; /* Move torch brightness to the destination */ channel->led->max_brightness = channel_torch->led->max_brightness; - /* append mode name to flash name */ + /* Append mode name to flash name */ name = kasprintf(GFP_KERNEL, "%s_%s", channel->led->name, channel_torch->mode_name); if (!name) @@ -777,7 +777,7 @@ static int __gb_lights_flash_led_register(struct gb_channel *channel) /* * If light have torch mode channel, this channel will be the led - * classdev of the registered above flash classdev + * classdev of the registered above flash classdev. */ channel_torch = get_channel_from_mode(channel->light, GB_CHANNEL_MODE_TORCH); @@ -838,7 +838,7 @@ static int gb_lights_channel_flash_config(struct gb_channel *channel) */ channel->led->max_brightness = (fset->max - fset->min) / fset->step; - /* Only the flash mode have the timeout constraints settings */ + /* Only the flash mode have the timeout constraints settings. */ if (channel->mode & GB_CHANNEL_MODE_FLASH) { fset = &channel->timeout_us; fset->min = le32_to_cpu(conf.timeout_min_us); @@ -853,7 +853,7 @@ static int gb_lights_channel_flash_config(struct gb_channel *channel) { struct gb_connection *connection = get_conn_from_channel(channel); - dev_err(&connection->bundle->dev, "no support for flash devices\n"); + dev_err(&connection->bundle->dev, "No support for flash devices\n"); return 0; } diff --git a/drivers/staging/greybus/log.c b/drivers/staging/greybus/log.c index 57dcf9453bf1..ce47f16a0c5b 100644 --- a/drivers/staging/greybus/log.c +++ b/drivers/staging/greybus/log.c @@ -23,30 +23,30 @@ static int gb_log_request_handler(struct gb_operation *op) u16 len; if (op->type != GB_LOG_TYPE_SEND_LOG) { - dev_err(dev, "unknown request type 0x%02x\n", op->type); + dev_err(dev, "Unknown request type 0x%02x\n", op->type); return -EINVAL; } /* Verify size of payload */ if (op->request->payload_size < sizeof(*receive)) { - dev_err(dev, "log request too small (%zu < %zu)\n", + dev_err(dev, "Log request too small (%zu < %zu)\n", op->request->payload_size, sizeof(*receive)); return -EINVAL; } receive = op->request->payload; len = le16_to_cpu(receive->len); if (len != (op->request->payload_size - sizeof(*receive))) { - dev_err(dev, "log request wrong size %d vs %zu\n", len, + dev_err(dev, "Log request wrong size %d vs %zu\n", len, (op->request->payload_size - sizeof(*receive))); return -EINVAL; } if (len == 0) { - dev_err(dev, "log request of 0 bytes?\n"); + dev_err(dev, "Log request of 0 bytes?\n"); return -EINVAL; } if (len > GB_LOG_MAX_LEN) { - dev_err(dev, "log request too big: %d\n", len); + dev_err(dev, "Log request too big: %d\n", len); return -EINVAL; } -- 2.39.2

1 month, 3 weeks

[PATCH v4 0/3] Add Firmware Upload support for beagleplay cc1352

by Ayush Singh

Adds support for beagleplay cc1352 co-processor firmware upgrade using kernel Firmware Upload API. Uses ROM based bootloader present in cc13x2x7 and cc26x2x7 platforms for flashing over UART. Communication with the bootloader can be moved out of gb-beagleplay driver if required, but I am keeping it here since there are no immediate plans to use the on-board cc1352p7 for anything other than greybus (BeagleConnect Technology). Additionally, there do not seem to any other devices using cc1352p7 or its cousins as a co-processor. Bootloader backdoor and reset GPIOs are used to enable cc1352p7 bootloader backdoor for flashing. Flashing is skipped in case we are trying to flash the same image as the one that is currently present. This is determined by CRC32 calculation of the supplied firmware and flash data. We also do a CRC32 check after flashing to ensure that the firmware was flashed properly. Link: https://www.ti.com/lit/ug/swcu192/swcu192.pdf Ti CC1352P7 Technical Specification Changes in v4: - Add acks properly - Fix Kconfig warning by adding select FW_LOADER - Link to v3: https://lore.kernel.org/r/20240825-beagleplay_fw_upgrade-v3-0-8f424a9de9f6@… Changes in v3: - Spelling fixes in cover letter - Add Ack by Rob Herring on Patch 1 - Link to v2: https://lore.kernel.org/r/20240801-beagleplay_fw_upgrade-v2-0-e36928b792db@… Changes in v2: - Spelling fixes - Rename boot-gpios to bootloader-backdoor-gpios - Add doc comments - Add check to ensure firmware size is 704 KB - Link to v1: https://lore.kernel.org/all/20240719-beagleplay_fw_upgrade-v1-0-8664d451325… Signed-off-by: Ayush Singh <ayush(a)beagleboard.org> --- Ayush Singh (3): dt-bindings: net: ti,cc1352p7: Add bootloader-backdoor-gpios arm64: dts: ti: k3-am625-beagleplay: Add bootloader-backdoor-gpios to cc1352p7 greybus: gb-beagleplay: Add firmware upload API .../devicetree/bindings/net/ti,cc1352p7.yaml | 7 + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 3 +- drivers/greybus/Kconfig | 2 + drivers/greybus/gb-beagleplay.c | 658 ++++++++++++++++++++- 4 files changed, 656 insertions(+), 14 deletions(-) --- base-commit: f76698bd9a8ca01d3581236082d786e9a6b72bb7 change-id: 20240715-beagleplay_fw_upgrade-43e6cceb0d3d Best regards, -- Ayush Singh <ayush(a)beagleboard.org>

1 month, 3 weeks

[PATCH] Revert "staging: greybus: Fix capitalization and punctuation inconsistencies"

by Johan Hovold

This reverts commit 30db8460f984a7f5299b6e07ea8a57cd09fc9557. The offending commit tried to make the error messages of a few Greybus drivers in staging more consistent by capitalising messages, but the rest of the Greybus code do not follow this style so the change ended up introducing an inconsistency instead. Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/staging/greybus/arche-platform.c | 38 ++++++++++++------------ drivers/staging/greybus/authentication.c | 6 ++-- drivers/staging/greybus/bootrom.c | 16 +++++----- drivers/staging/greybus/light.c | 26 ++++++++-------- drivers/staging/greybus/log.c | 10 +++---- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c index 45c1737817d0..b33977ccd527 100644 --- a/drivers/staging/greybus/arche-platform.c +++ b/drivers/staging/greybus/arche-platform.c @@ -95,7 +95,7 @@ static int apb_cold_boot(struct device *dev, void *data) ret = apb_ctrl_coldboot(dev); if (ret) - dev_warn(dev, "Failed to coldboot\n"); + dev_warn(dev, "failed to coldboot\n"); /*Child nodes are independent, so do not exit coldboot operation */ return 0; @@ -107,7 +107,7 @@ static int apb_poweroff(struct device *dev, void *data) /* Enable HUB3613 into HUB mode. */ if (usb3613_hub_mode_ctrl(false)) - dev_warn(dev, "Failed to control hub device\n"); + dev_warn(dev, "failed to control hub device\n"); return 0; } @@ -142,7 +142,7 @@ static irqreturn_t arche_platform_wd_irq_thread(int irq, void *devid) /* Enable HUB3613 into HUB mode. */ if (usb3613_hub_mode_ctrl(true)) - dev_warn(arche_pdata->dev, "Failed to control hub device\n"); + dev_warn(arche_pdata->dev, "failed to control hub device\n"); spin_lock_irqsave(&arche_pdata->wake_lock, flags); arche_platform_set_wake_detect_state(arche_pdata, WD_STATE_IDLE); @@ -228,12 +228,12 @@ arche_platform_coldboot_seq(struct arche_platform_drvdata *arche_pdata) ret = clk_prepare_enable(arche_pdata->svc_ref_clk); if (ret) { - dev_err(arche_pdata->dev, "Failed to enable svc_ref_clk: %d\n", + dev_err(arche_pdata->dev, "failed to enable svc_ref_clk: %d\n", ret); return ret; } - /* Bring SVC out of reset */ + /* bring SVC out of reset */ svc_reset_onoff(arche_pdata->svc_reset, !arche_pdata->is_reset_act_hi); arche_platform_set_state(arche_pdata, ARCHE_PLATFORM_STATE_ACTIVE); @@ -262,7 +262,7 @@ arche_platform_fw_flashing_seq(struct arche_platform_drvdata *arche_pdata) ret = clk_prepare_enable(arche_pdata->svc_ref_clk); if (ret) { - dev_err(arche_pdata->dev, "Failed to enable svc_ref_clk: %d\n", + dev_err(arche_pdata->dev, "failed to enable svc_ref_clk: %d\n", ret); return ret; } @@ -340,7 +340,7 @@ static ssize_t state_store(struct device *dev, if (arche_pdata->state == ARCHE_PLATFORM_STATE_STANDBY) goto exit; - dev_warn(arche_pdata->dev, "Standby state not supported\n"); + dev_warn(arche_pdata->dev, "standby state not supported\n"); } else if (sysfs_streq(buf, "fw_flashing")) { if (arche_pdata->state == ARCHE_PLATFORM_STATE_FW_FLASHING) goto exit; @@ -358,7 +358,7 @@ static ssize_t state_store(struct device *dev, if (ret) goto exit; } else { - dev_err(arche_pdata->dev, "Unknown state\n"); + dev_err(arche_pdata->dev, "unknown state\n"); ret = -EINVAL; } @@ -434,7 +434,7 @@ static int arche_platform_probe(struct platform_device *pdev) if (!arche_pdata) return -ENOMEM; - /* Setup svc reset gpio */ + /* setup svc reset gpio */ arche_pdata->is_reset_act_hi = of_property_read_bool(np, "svc,reset-active-high"); if (arche_pdata->is_reset_act_hi) @@ -445,7 +445,7 @@ static int arche_platform_probe(struct platform_device *pdev) arche_pdata->svc_reset = devm_gpiod_get(dev, "svc,reset", flags); if (IS_ERR(arche_pdata->svc_reset)) { ret = PTR_ERR(arche_pdata->svc_reset); - dev_err(dev, "Failed to request svc-reset GPIO: %d\n", ret); + dev_err(dev, "failed to request svc-reset GPIO: %d\n", ret); return ret; } arche_platform_set_state(arche_pdata, ARCHE_PLATFORM_STATE_OFF); @@ -454,16 +454,16 @@ static int arche_platform_probe(struct platform_device *pdev) GPIOD_OUT_LOW); if (IS_ERR(arche_pdata->svc_sysboot)) { ret = PTR_ERR(arche_pdata->svc_sysboot); - dev_err(dev, "Failed to request sysboot0 GPIO: %d\n", ret); + dev_err(dev, "failed to request sysboot0 GPIO: %d\n", ret); return ret; } - /* Setup the clock request gpio first */ + /* setup the clock request gpio first */ arche_pdata->svc_refclk_req = devm_gpiod_get(dev, "svc,refclk-req", GPIOD_IN); if (IS_ERR(arche_pdata->svc_refclk_req)) { ret = PTR_ERR(arche_pdata->svc_refclk_req); - dev_err(dev, "Failed to request svc-clk-req GPIO: %d\n", ret); + dev_err(dev, "failed to request svc-clk-req GPIO: %d\n", ret); return ret; } @@ -471,7 +471,7 @@ static int arche_platform_probe(struct platform_device *pdev) arche_pdata->svc_ref_clk = devm_clk_get(dev, "svc_ref_clk"); if (IS_ERR(arche_pdata->svc_ref_clk)) { ret = PTR_ERR(arche_pdata->svc_ref_clk); - dev_err(dev, "Failed to get svc_ref_clk: %d\n", ret); + dev_err(dev, "failed to get svc_ref_clk: %d\n", ret); return ret; } @@ -504,20 +504,20 @@ static int arche_platform_probe(struct platform_device *pdev) IRQF_TRIGGER_RISING | IRQF_ONESHOT, dev_name(dev), arche_pdata); if (ret) { - dev_err(dev, "Failed to request wake detect IRQ %d\n", ret); + dev_err(dev, "failed to request wake detect IRQ %d\n", ret); return ret; } disable_irq(arche_pdata->wake_detect_irq); ret = device_create_file(dev, &dev_attr_state); if (ret) { - dev_err(dev, "Failed to create state file in sysfs\n"); + dev_err(dev, "failed to create state file in sysfs\n"); return ret; } ret = of_platform_populate(np, NULL, NULL, dev); if (ret) { - dev_err(dev, "Failed to populate child nodes %d\n", ret); + dev_err(dev, "failed to populate child nodes %d\n", ret); goto err_device_remove; } @@ -525,7 +525,7 @@ static int arche_platform_probe(struct platform_device *pdev) ret = register_pm_notifier(&arche_pdata->pm_notifier); if (ret) { - dev_err(dev, "Failed to register pm notifier %d\n", ret); + dev_err(dev, "failed to register pm notifier %d\n", ret); goto err_device_remove; } @@ -570,7 +570,7 @@ static void arche_platform_remove(struct platform_device *pdev) arche_platform_poweroff_seq(arche_pdata); if (usb3613_hub_mode_ctrl(false)) - dev_warn(arche_pdata->dev, "Failed to control hub device\n"); + dev_warn(arche_pdata->dev, "failed to control hub device\n"); } static __maybe_unused int arche_platform_suspend(struct device *dev) diff --git a/drivers/staging/greybus/authentication.c b/drivers/staging/greybus/authentication.c index e1a819d1b1c8..d53e58f92e81 100644 --- a/drivers/staging/greybus/authentication.c +++ b/drivers/staging/greybus/authentication.c @@ -93,7 +93,7 @@ static int cap_get_endpoint_uid(struct gb_cap *cap, u8 *euid) ret = gb_operation_sync(connection, GB_CAP_TYPE_GET_ENDPOINT_UID, NULL, 0, &response, sizeof(response)); if (ret) { - dev_err(cap->parent, "Failed to get endpoint uid (%d)\n", ret); + dev_err(cap->parent, "failed to get endpoint uid (%d)\n", ret); return ret; } @@ -126,7 +126,7 @@ static int cap_get_ims_certificate(struct gb_cap *cap, u32 class, u32 id, ret = gb_operation_request_send_sync(op); if (ret) { - dev_err(cap->parent, "Failed to get certificate (%d)\n", ret); + dev_err(cap->parent, "failed to get certificate (%d)\n", ret); goto done; } @@ -165,7 +165,7 @@ static int cap_authenticate(struct gb_cap *cap, u32 auth_type, u8 *uid, ret = gb_operation_request_send_sync(op); if (ret) { - dev_err(cap->parent, "Failed to authenticate (%d)\n", ret); + dev_err(cap->parent, "failed to authenticate (%d)\n", ret); goto done; } diff --git a/drivers/staging/greybus/bootrom.c b/drivers/staging/greybus/bootrom.c index 8ad763026dea..d4d86b3898de 100644 --- a/drivers/staging/greybus/bootrom.c +++ b/drivers/staging/greybus/bootrom.c @@ -179,7 +179,7 @@ static int find_firmware(struct gb_bootrom *bootrom, u8 stage) &connection->bundle->dev); if (rc) { dev_err(&connection->bundle->dev, - "Failed to find %s firmware (%d)\n", firmware_name, rc); + "failed to find %s firmware (%d)\n", firmware_name, rc); } return rc; @@ -274,7 +274,7 @@ static int gb_bootrom_get_firmware(struct gb_operation *op) size = le32_to_cpu(firmware_request->size); if (offset >= fw->size || size > fw->size - offset) { - dev_warn(dev, "Bad firmware request (offs = %u, size = %u)\n", + dev_warn(dev, "bad firmware request (offs = %u, size = %u)\n", offset, size); ret = -EINVAL; goto unlock; @@ -290,7 +290,7 @@ static int gb_bootrom_get_firmware(struct gb_operation *op) firmware_response = op->response->payload; memcpy(firmware_response, fw->data + offset, size); - dev_dbg(dev, "Responding with firmware (offs = %u, size = %u)\n", + dev_dbg(dev, "responding with firmware (offs = %u, size = %u)\n", offset, size); unlock: @@ -340,7 +340,7 @@ static int gb_bootrom_ready_to_boot(struct gb_operation *op) /* * XXX Should we return error for insecure firmware? */ - dev_dbg(dev, "Ready to boot: 0x%x, 0\n", status); + dev_dbg(dev, "ready to boot: 0x%x, 0\n", status); queue_work: /* @@ -367,7 +367,7 @@ static int gb_bootrom_request_handler(struct gb_operation *op) return gb_bootrom_ready_to_boot(op); default: dev_err(&op->connection->bundle->dev, - "Unsupported request: %u\n", type); + "unsupported request: %u\n", type); return -EINVAL; } } @@ -388,14 +388,14 @@ static int gb_bootrom_get_version(struct gb_bootrom *bootrom) sizeof(response)); if (ret) { dev_err(&bundle->dev, - "Failed to get protocol version: %d\n", + "failed to get protocol version: %d\n", ret); return ret; } if (response.major > request.major) { dev_err(&bundle->dev, - "Unsupported major protocol version (%u > %u)\n", + "unsupported major protocol version (%u > %u)\n", response.major, request.major); return -ENOTSUPP; } @@ -467,7 +467,7 @@ static int gb_bootrom_probe(struct gb_bundle *bundle, NULL, 0); if (ret) { dev_err(&connection->bundle->dev, - "Failed to send AP READY: %d\n", ret); + "failed to send AP READY: %d\n", ret); goto err_cancel_timeout; } diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c index 8ee08389d801..e509fdc715db 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c @@ -193,7 +193,7 @@ static ssize_t fade_##__dir##_store(struct device *dev, \ \ ret = kstrtou8(buf, 0, &fade); \ if (ret < 0) { \ - dev_err(dev, "Could not parse fade value %d\n", ret); \ + dev_err(dev, "could not parse fade value %d\n", ret); \ goto unlock; \ } \ if (channel->fade_##__dir == fade) \ @@ -238,7 +238,7 @@ static ssize_t color_store(struct device *dev, struct device_attribute *attr, } ret = kstrtou32(buf, 0, &color); if (ret < 0) { - dev_err(dev, "Could not parse color value %d\n", ret); + dev_err(dev, "could not parse color value %d\n", ret); goto unlock; } @@ -376,12 +376,12 @@ static int __gb_lights_led_brightness_set(struct gb_channel *channel) else channel->active = false; - /* We need to keep module alive when turning to active state */ + /* we need to keep module alive when turning to active state */ if (!old_active && channel->active) goto out_unlock; /* - * On the other hand if going to inactive we still hold a reference and + * on the other hand if going to inactive we still hold a reference and * need to put it, so we could go to suspend. */ if (old_active && !channel->active) @@ -466,12 +466,12 @@ static int gb_blink_set(struct led_classdev *cdev, unsigned long *delay_on, else channel->active = false; - /* We need to keep module alive when turning to active state. */ + /* we need to keep module alive when turning to active state */ if (!old_active && channel->active) goto out_unlock; /* - * On the other hand if going to inactive we still hold a reference and + * on the other hand if going to inactive we still hold a reference and * need to put it, so we could go to suspend. */ if (old_active && !channel->active) @@ -532,7 +532,7 @@ static int gb_lights_light_v4l2_register(struct gb_light *light) channel_flash = get_channel_from_mode(light, GB_CHANNEL_MODE_FLASH); if (!channel_flash) { - dev_err(dev, "Failed to get flash channel from mode\n"); + dev_err(dev, "failed to get flash channel from mode\n"); return -EINVAL; } @@ -576,7 +576,7 @@ static int gb_lights_light_v4l2_register(struct gb_light *light) { struct gb_connection *connection = get_conn_from_light(light); - dev_err(&connection->bundle->dev, "No support for v4l2 subdevices\n"); + dev_err(&connection->bundle->dev, "no support for v4l2 subdevices\n"); return 0; } @@ -728,14 +728,14 @@ static int __gb_lights_channel_torch_attach(struct gb_channel *channel, { char *name; - /* We can only attach torch to a flash channel */ + /* we can only attach torch to a flash channel */ if (!(channel->mode & GB_CHANNEL_MODE_FLASH)) return 0; /* Move torch brightness to the destination */ channel->led->max_brightness = channel_torch->led->max_brightness; - /* Append mode name to flash name */ + /* append mode name to flash name */ name = kasprintf(GFP_KERNEL, "%s_%s", channel->led->name, channel_torch->mode_name); if (!name) @@ -777,7 +777,7 @@ static int __gb_lights_flash_led_register(struct gb_channel *channel) /* * If light have torch mode channel, this channel will be the led - * classdev of the registered above flash classdev. + * classdev of the registered above flash classdev */ channel_torch = get_channel_from_mode(channel->light, GB_CHANNEL_MODE_TORCH); @@ -838,7 +838,7 @@ static int gb_lights_channel_flash_config(struct gb_channel *channel) */ channel->led->max_brightness = (fset->max - fset->min) / fset->step; - /* Only the flash mode have the timeout constraints settings. */ + /* Only the flash mode have the timeout constraints settings */ if (channel->mode & GB_CHANNEL_MODE_FLASH) { fset = &channel->timeout_us; fset->min = le32_to_cpu(conf.timeout_min_us); @@ -853,7 +853,7 @@ static int gb_lights_channel_flash_config(struct gb_channel *channel) { struct gb_connection *connection = get_conn_from_channel(channel); - dev_err(&connection->bundle->dev, "No support for flash devices\n"); + dev_err(&connection->bundle->dev, "no support for flash devices\n"); return 0; } diff --git a/drivers/staging/greybus/log.c b/drivers/staging/greybus/log.c index ce47f16a0c5b..57dcf9453bf1 100644 --- a/drivers/staging/greybus/log.c +++ b/drivers/staging/greybus/log.c @@ -23,30 +23,30 @@ static int gb_log_request_handler(struct gb_operation *op) u16 len; if (op->type != GB_LOG_TYPE_SEND_LOG) { - dev_err(dev, "Unknown request type 0x%02x\n", op->type); + dev_err(dev, "unknown request type 0x%02x\n", op->type); return -EINVAL; } /* Verify size of payload */ if (op->request->payload_size < sizeof(*receive)) { - dev_err(dev, "Log request too small (%zu < %zu)\n", + dev_err(dev, "log request too small (%zu < %zu)\n", op->request->payload_size, sizeof(*receive)); return -EINVAL; } receive = op->request->payload; len = le16_to_cpu(receive->len); if (len != (op->request->payload_size - sizeof(*receive))) { - dev_err(dev, "Log request wrong size %d vs %zu\n", len, + dev_err(dev, "log request wrong size %d vs %zu\n", len, (op->request->payload_size - sizeof(*receive))); return -EINVAL; } if (len == 0) { - dev_err(dev, "Log request of 0 bytes?\n"); + dev_err(dev, "log request of 0 bytes?\n"); return -EINVAL; } if (len > GB_LOG_MAX_LEN) { - dev_err(dev, "Log request too big: %d\n", len); + dev_err(dev, "log request too big: %d\n", len); return -EINVAL; } -- 2.44.2

1 month, 3 weeks

[PATCH] staging: greybus: Fix coding style and syntax issues

by Sayyad Abid

fix errors from running scripts/checkpatch.pl, including: - Added spaces before open braces and parentheses where required. - Resolved macro argument precedence issues by adding parentheses. - Corrected trailing whitespace and improper indentation. No functional changes introduced, just cleanups for better code quality. Signed-off-by: Sayyad Abid <sayyad.abid16(a)gmail.com> --- drivers/staging/greybus/loopback.c | 58 ++++++++++++++++-------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index 1f19323b0e1a..3e39a90cf86c 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -163,35 +163,39 @@ static ssize_t name##_avg_show(struct device *dev, \ static DEVICE_ATTR_RO(name##_avg) #define gb_loopback_stats_attrs(field) \ - gb_loopback_ro_stats_attr(field, min, u); \ - gb_loopback_ro_stats_attr(field, max, u); \ - gb_loopback_ro_avg_attr(field) + do { \ + gb_loopback_ro_stats_attr(field, min, u); \ + gb_loopback_ro_stats_attr(field, max, u); \ + gb_loopback_ro_avg_attr(field) \ + } while (0) #define gb_loopback_attr(field, type) \ -static ssize_t field##_show(struct device *dev, \ - struct device_attribute *attr, \ - char *buf) \ -{ \ - struct gb_loopback *gb = dev_get_drvdata(dev); \ - return sprintf(buf, "%" #type "\n", gb->field); \ -} \ -static ssize_t field##_store(struct device *dev, \ - struct device_attribute *attr, \ - const char *buf, \ - size_t len) \ -{ \ - int ret; \ - struct gb_loopback *gb = dev_get_drvdata(dev); \ - mutex_lock(&gb->mutex); \ - ret = sscanf(buf, "%"#type, &gb->field); \ - if (ret != 1) \ - len = -EINVAL; \ - else \ - gb_loopback_check_attr(gb, bundle); \ - mutex_unlock(&gb->mutex); \ - return len; \ -} \ -static DEVICE_ATTR_RW(field) +do { \ + static ssize_t field##_show(struct device *dev \ + struct device_attribute *attr, \ + char *buf) \ + { \ + struct gb_loopback *gb = dev_get_drvdata(dev); \ + return sprintf(buf, "%" #type "\n", gb->field); \ + } \ + static ssize_t field##_store(struct device *dev, \ + struct device_attribute *attr, \ + const char *buf, \ + size_t len) \ + { \ + int ret; \ + struct gb_loopback *gb = dev_get_drvdata(dev); \ + mutex_lock(&gb->mutex); \ + ret = sscanf(buf, "%"#type, &gb->field); \ + if (ret != 1) \ + len = -EINVAL; \ + else \ + gb_loopback_check_attr(gb, bundle); \ + mutex_unlock(&gb->mutex); \ + return len; \ + } \ + static DEVICE_ATTR_RW(field \ +} while (0) #define gb_dev_loopback_ro_attr(field, conn) \ static ssize_t field##_show(struct device *dev, \ -- 2.39.2

1 month, 4 weeks

[PATCH -next] greybus: Remove redundant null pointer checks in gb_svc_pwrmon_debugfs_init()

by Li Zetao

Since the debugfs_create_dir() never returns a null pointer, checking the return value for a null pointer is redundant, and using IS_ERR is safe enough. Signed-off-by: Li Zetao <lizetao1(a)huawei.com> --- drivers/greybus/svc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/greybus/svc.c b/drivers/greybus/svc.c index 4256467fcd35..906ea61cba30 100644 --- a/drivers/greybus/svc.c +++ b/drivers/greybus/svc.c @@ -765,7 +765,7 @@ static void gb_svc_pwrmon_debugfs_init(struct gb_svc *svc) u8 rail_count; dent = debugfs_create_dir("pwrmon", svc->debugfs_dentry); - if (IS_ERR_OR_NULL(dent)) + if (IS_ERR(dent)) return; if (gb_svc_pwrmon_rail_count_get(svc, &rail_count)) -- 2.34.1

2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

greybus-dev September 2024