Re: [PATCH] usb: host: xhci: remove renesas rom wiping
From: René Treffer
Date: Tue Jun 27 2023 - 07:26:52 EST
On 27.06.23 09:48, Vinod Koul wrote:
On 26-06-23, 20:49, Anne Macedo wrote:
Cards based on Renesas uPD72020x currently have their ROM wiped on
module start if they have an external ROM. This means that every time
you start up the module, the ROM gets cleaned up and the firmware
redownloaded.
Nak, that is not the correct understanding of the code!
In function renesas_xhci_check_request_fw(), we check ROM status first
and if it is already programmed, we skip.. Not sure why you are assuming
it is wiped every time!
/* Check if device has ROM and loaded, if so skip everything */
has_rom = renesas_check_rom(pdev);
if (has_rom) {
err = renesas_check_rom_state(pdev);
if (!err)
return 0;
else if (err != -ENOENT)
has_rom = false;
}
Erasing ROM is part of ROM programming sequence and is also required to
if we ever have to recover, so this patch is NAKed by me
As far as I know the upload to ROM needs to follow the ROM layout as
noted in the "uPD720201/uPD720202 User's Manual: Hardware", and it
differs from the FW by having a vendor specific configuration (page
127). The vendor specific configuration is equivalent to configuring the
PCI registers.
I have successfully uploaded firmware to the ROM of a card with the
upd72020x-load tool and documented this in the github issue at [1]. It
needed a vendor specific configuration and the firmware to work, even
though the manual seems to indicate that the firmware is enough.
[1] https://github.com/markusj/upd72020x-load/issues/15 and
https://github.com/geerlingguy/raspberry-pi-pcie-devices/issues/103 for
out-of-band flashing.
Wiping the ROM all the time is not necessary and can lead to situations
where, for example, people with stable firmwares might have their card fail
due to incomplete flashes (due to timeouts, for example).
Another case is when PCI configs are set up after the ROM is flashed
(e.g. disabling hotplugging). The ROM wipe and reflash process will
overwrite these configs.
Why would ROM programming overwrite PCI config, does your device update
that. In case you are programming config space you should redo that
after ROM load (which should be done once)
The vendor specific configuration is responsible for describing the PCI
setup, and wiping the ROM should wipe that.
Also, the current ROM setup can't work: the flash layout contains more
than the firmware – for uploading, it needs to be prefixed with ~40
bytes that differ by card vendor. This config is documented on the
"uPD720201/uPD720202 User's Manual", section 6.3 (Data Format).
I assure you it works for me on a publicly available Qualcomm Robotics
RB3 board and many people who have tested. It may not work for you, but
you need to investigate better on what might be the cause. Btw what are
you testing this on..
I highly doubt that the ROM download works as intended. However the ROM
has 2 areas (copies) as described in the manual on page 129 The flow
chart on page 130 makes it clear that the first ROM section is used as a
fallback.
But if the ROM is completely empty or the first section is corrupted and
if the download to ROM fails then there is no firmware to load. Which is
what I am assuming here. I want to test this at some point with the card
I have lying around (use the external SOIC8 to wipe the whole flash). In
all other cases the download should just fail and the card should come
up normally.
According to the manual the regular fw download is always available,
does not change the PCI configuration and should just work no matter the
ROM setup.
That's why I suggested to remove the download to ROM and see if it helps.
And it made Anne's card work.
Regards,
René
This patch, if applied, removes the cleanup and the setup of the Renesas
ROM as to not make it wipe and reset the ROM.
It also reduces load time, especially during boot, as problems with the
EEPROM chip or CRC checks might take some time during reflashing and
possibly lead to timeouts. Since the ROM is already flashed (either
manually by a tool such as uPD72020x-load or by the kernel module) it
where is this tool, I have not heard of it, is it publicly available,
where can I find the source of this tool?
just needs to be loaded during module startup.
Suggested-by: Rene Treffer <treffer@xxxxxxxxxx>
Signed-off-by: Anne Macedo <retpolanne@xxxxxxxxxx>
---
drivers/usb/host/xhci-pci-renesas.c | 188 ----------------------------
1 file changed, 188 deletions(-)
diff --git a/drivers/usb/host/xhci-pci-renesas.c b/drivers/usb/host/xhci-pci-renesas.c
index 93f8b355bc70..28656beb808d 100644
--- a/drivers/usb/host/xhci-pci-renesas.c
+++ b/drivers/usb/host/xhci-pci-renesas.c
@@ -375,199 +375,11 @@ static int renesas_fw_download(struct pci_dev *pdev,
return 0;
}
-static void renesas_rom_erase(struct pci_dev *pdev)
-{
- int retval, i;
- u8 status;
-
- dev_dbg(&pdev->dev, "Performing ROM Erase...\n");
- retval = pci_write_config_dword(pdev, RENESAS_DATA0,
- RENESAS_ROM_ERASE_MAGIC);
- if (retval) {
- dev_err(&pdev->dev, "ROM erase, magic word write failed: %d\n",
- pcibios_err_to_errno(retval));
- return;
- }
-
- retval = pci_read_config_byte(pdev, RENESAS_ROM_STATUS, &status);
- if (retval) {
- dev_err(&pdev->dev, "ROM status read failed: %d\n",
- pcibios_err_to_errno(retval));
- return;
- }
- status |= RENESAS_ROM_STATUS_ERASE;
- retval = pci_write_config_byte(pdev, RENESAS_ROM_STATUS, status);
- if (retval) {
- dev_err(&pdev->dev, "ROM erase set word write failed\n");
- return;
- }
-
- /* sleep a bit while ROM is erased */
- msleep(20);
-
- for (i = 0; i < RENESAS_RETRY; i++) {
- retval = pci_read_config_byte(pdev, RENESAS_ROM_STATUS,
- &status);
- status &= RENESAS_ROM_STATUS_ERASE;
- if (!status)
- break;
-
- mdelay(RENESAS_DELAY);
- }
-
- if (i == RENESAS_RETRY)
- dev_dbg(&pdev->dev, "Chip erase timedout: %x\n", status);
-
- dev_dbg(&pdev->dev, "ROM Erase... Done success\n");
-}
-
-static bool renesas_setup_rom(struct pci_dev *pdev, const struct firmware *fw)
-{
- const u32 *fw_data = (const u32 *)fw->data;
- int err, i;
- u8 status;
-
- /* 2. Write magic word to Data0 */
- err = pci_write_config_dword(pdev, RENESAS_DATA0,
- RENESAS_ROM_WRITE_MAGIC);
- if (err)
- return false;
-
- /* 3. Set External ROM access */
- err = pci_write_config_byte(pdev, RENESAS_ROM_STATUS,
- RENESAS_ROM_STATUS_ACCESS);
- if (err)
- goto remove_bypass;
-
- /* 4. Check the result */
- err = pci_read_config_byte(pdev, RENESAS_ROM_STATUS, &status);
- if (err)
- goto remove_bypass;
- status &= GENMASK(6, 4);
- if (status) {
- dev_err(&pdev->dev,
- "setting external rom failed: %x\n", status);
- goto remove_bypass;
- }
-
- /* 5 to 16 Write FW to DATA0/1 while checking SetData0/1 */
- for (i = 0; i < fw->size / 4; i++) {
- err = renesas_fw_download_image(pdev, fw_data, i, true);
- if (err) {
- dev_err(&pdev->dev,
- "ROM Download Step %d failed at position %d bytes with (%d)\n",
- i, i * 4, err);
- goto remove_bypass;
- }
- }
-
- /*
- * wait till DATA0/1 is cleared
- */
- for (i = 0; i < RENESAS_RETRY; i++) {
- err = pci_read_config_byte(pdev, RENESAS_ROM_STATUS_MSB,
- &status);
- if (err)
- goto remove_bypass;
- if (!(status & (BIT(0) | BIT(1))))
- break;
-
- udelay(RENESAS_DELAY);
- }
- if (i == RENESAS_RETRY) {
- dev_err(&pdev->dev, "Final Firmware ROM Download step timed out\n");
- goto remove_bypass;
- }
-
- /* 17. Remove bypass */
- err = pci_write_config_byte(pdev, RENESAS_ROM_STATUS, 0);
- if (err)
- return false;
-
- udelay(10);
-
- /* 18. check result */
- for (i = 0; i < RENESAS_RETRY; i++) {
- err = pci_read_config_byte(pdev, RENESAS_ROM_STATUS, &status);
- if (err) {
- dev_err(&pdev->dev, "Read ROM status failed:%d\n",
- pcibios_err_to_errno(err));
- return false;
- }
- status &= RENESAS_ROM_STATUS_RESULT;
- if (status == RENESAS_ROM_STATUS_SUCCESS) {
- dev_dbg(&pdev->dev, "Download ROM success\n");
- break;
- }
- udelay(RENESAS_DELAY);
- }
- if (i == RENESAS_RETRY) { /* Timed out */
- dev_err(&pdev->dev,
- "Download to external ROM TO: %x\n", status);
- return false;
- }
-
- dev_dbg(&pdev->dev, "Download to external ROM succeeded\n");
-
- /* Last step set Reload */
- err = pci_write_config_byte(pdev, RENESAS_ROM_STATUS,
- RENESAS_ROM_STATUS_RELOAD);
- if (err) {
- dev_err(&pdev->dev, "Set ROM execute failed: %d\n",
- pcibios_err_to_errno(err));
- return false;
- }
-
- /*
- * wait till Reload is cleared
- */
- for (i = 0; i < RENESAS_RETRY; i++) {
- err = pci_read_config_byte(pdev, RENESAS_ROM_STATUS, &status);
- if (err)
- return false;
- if (!(status & RENESAS_ROM_STATUS_RELOAD))
- break;
-
- udelay(RENESAS_DELAY);
- }
- if (i == RENESAS_RETRY) {
- dev_err(&pdev->dev, "ROM Exec timed out: %x\n", status);
- return false;
- }
-
- return true;
-
-remove_bypass:
- pci_write_config_byte(pdev, RENESAS_ROM_STATUS, 0);
- return false;
-}
-
static int renesas_load_fw(struct pci_dev *pdev, const struct firmware *fw)
{
int err = 0;
- bool rom;
-
- /* Check if the device has external ROM */
- rom = renesas_check_rom(pdev);
- if (rom) {
- /* perform chip erase first */
- renesas_rom_erase(pdev);
-
- /* lets try loading fw on ROM first */
- rom = renesas_setup_rom(pdev, fw);
- if (!rom) {
- dev_dbg(&pdev->dev,
- "ROM load failed, falling back on FW load\n");
- } else {
- dev_dbg(&pdev->dev,
- "ROM load success\n");
- goto exit;
- }
- }
err = renesas_fw_download(pdev, fw);
-
-exit:
if (err)
dev_err(&pdev->dev, "firmware failed to download (%d).", err);
return err;
--
2.41.0