Skip to content

Commit 13e8744

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 80bc821 + 70c2cf2 commit 13e8744

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/firmware/raspberrypi.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ rpi_firmware_transaction(struct rpi_firmware *fw, u32 chan, u32 data)
6262
ret = 0;
6363
} else {
6464
ret = -ETIMEDOUT;
65-
WARN_ONCE(1, "Firmware transaction timeout");
6665
}
6766
} else {
6867
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,
125124
dev_err(fw->cl.dev, "Request 0x%08x returned status 0x%08x\n",
126125
buf[2], buf[1]);
127126
ret = -EINVAL;
127+
} else if (ret == -ETIMEDOUT) {
128+
WARN_ONCE(1, "Firmware transaction 0x%08x timeout", buf[2]);
128129
}
129130

130131
dma_free_coherent(fw->chan->mbox->dev, PAGE_ALIGN(size), buf, bus_addr);

0 commit comments

Comments
 (0)