diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-09-11 11:01:03 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-09-11 11:01:03 +0200 |
| commit | 13e87440bf0fd8a45c939bfbb355f0b792113789 (patch) | |
| tree | 517ce80160e3b634a338c8213dcbbd5b5c876f70 /drivers/firmware | |
| parent | Merge tag 'v6.12-rockchip-drivers-2' of https://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | firmware: raspberrypi: Improve timeout warning (diff) | |
| download | linux-13e87440bf0fd8a45c939bfbb355f0b792113789.tar.xz linux-13e87440bf0fd8a45c939bfbb355f0b792113789.zip | |
Merge tag 'arm-soc/for-6.12/drivers' of https://github.com/Broadcom/stblinux into soc/drivers
This pull request contains Broadcom SoC driver updates for 6.12, please
pull the following:
- Stefan improves the timeout warning within the Raspberry Pi firmware
driver
* tag 'arm-soc/for-6.12/drivers' of https://github.com/Broadcom/stblinux:
firmware: raspberrypi: Improve timeout warning
Link: https://lore.kernel.org/r/20240906180643.2275460-3-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/raspberrypi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c index ac34876a97f8..18cc34987108 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -62,7 +62,6 @@ rpi_firmware_transaction(struct rpi_firmware *fw, u32 chan, u32 data) ret = 0; } else { ret = -ETIMEDOUT; - WARN_ONCE(1, "Firmware transaction timeout"); } } else { dev_err(fw->cl.dev, "mbox_send_message returned %d\n", ret); @@ -125,6 +124,8 @@ int rpi_firmware_property_list(struct rpi_firmware *fw, dev_err(fw->cl.dev, "Request 0x%08x returned status 0x%08x\n", buf[2], buf[1]); ret = -EINVAL; + } else if (ret == -ETIMEDOUT) { + WARN_ONCE(1, "Firmware transaction 0x%08x timeout", buf[2]); } dma_free_coherent(fw->chan->mbox->dev, PAGE_ALIGN(size), buf, bus_addr); |