Ambarella upstream #73
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| 2025-05-17 09:50:45,266 [DEBUG] Searching for USB device paths matching 4255:0013... | ||
| 2025-05-17 09:50:45,282 [DEBUG] recovery_config:{'soc_model': 'cv22', 'soc_family': 'ambarella', 'usb_path': (1, (1, 2)), 'firmware': {'vid': 7054, 'pid': 49186, 'protocol': 'amba', 'firmware': {'dram_script': {'path': 'cv22_lpddr4_408MHz.ads', 'description': 'DRAM initialization script for CV22 LPDDR4 at 408MHz'}, 'bootloader': {'path': 'cv22_bld_linux_emmc.bin', 'description': 'CV22 bootloader for Linux eMMC boot'}}, 'steps': [{'name': 'Initialize DRAM', 'action': 'initialize_dram', 'description': 'Initialize device DRAM using ADS script'}, {'name': 'Load bootloader', 'action': 'load_bootloader', 'description': 'Load bootloader to device memory'}, {'name': 'Flash firmware', 'action': 'flash_firmware', 'description': 'Flash firmware image to device', 'args': {'firmware': 'firmware.bin'}}], 'description': 'Recovery process for Ambarella CV22 devices:\n1. Device enters USB recovery mode\n2. Initialize DRAM using ADS script\n3. Load bootloader to memory\n4. Flash firmware image\n5. Device boots from flashed firmware\n', 'notes': '- Ensure device is in USB recovery mode before starting\n- DRAM script and bootloader files must be in firmware directory\n- Firmware image should be compatible with CV22\n'}, 'args': {'soc': 'cv22', 'firmware_file': ['src/snagrecover/templates/ambarella-cv22.yaml'], 'firmware': None, 'uart': None, 'baudrate': 115200, 'netns': 'snagbootnet', 'loglevel': 'debug', 'logfile': 'board_recovery.log', 'rom_usb': None, 'usb_path': None, 'list_socs': False, 'version': False, 'template': None, 'udev': False, 'am335x_setup': False}} | ||
| 2025-05-17 09:50:45,283 [INFO] Starting recovery of cv22 board | ||
| 2025-05-17 09:50:45,289 [INFO] Done recovering cv22 board | ||
| 2025-05-17 09:50:45,290 [INFO] Logs were appended to board_recovery.log | ||
| 2025-05-17 09:50:45,290 [INFO] Done recovering cv22 board | ||
| 2025-05-17 09:52:22,581 [DEBUG] Searching for USB device paths matching 4255:0013... | ||
| 2025-05-17 09:52:22,594 [DEBUG] recovery_config:{'soc_model': 'cv22', 'soc_family': 'ambarella', 'usb_path': (1, (1, 2)), 'firmware': {'vid': 7054, 'pid': 49186, 'protocol': 'amba', 'firmware': {'dram_script': {'path': 'cv22_lpddr4_408MHz.ads', 'description': 'DRAM initialization script for CV22 LPDDR4 at 408MHz'}, 'bootloader': {'path': 'cv22_bld_linux_emmc.bin', 'description': 'CV22 bootloader for Linux eMMC boot'}}, 'steps': [{'name': 'Initialize DRAM', 'action': 'initialize_dram', 'description': 'Initialize device DRAM using ADS script'}, {'name': 'Load bootloader', 'action': 'load_bootloader', 'description': 'Load bootloader to device memory'}, {'name': 'Flash firmware', 'action': 'flash_firmware', 'description': 'Flash firmware image to device', 'args': {'firmware': 'firmware.bin'}}], 'description': 'Recovery process for Ambarella CV22 devices:\n1. Device enters USB recovery mode\n2. Initialize DRAM using ADS script\n3. Load bootloader to memory\n4. Flash firmware image\n5. Device boots from flashed firmware\n', 'notes': '- Ensure device is in USB recovery mode before starting\n- DRAM script and bootloader files must be in firmware directory\n- Firmware image should be compatible with CV22\n'}, 'args': {'soc': 'cv22', 'firmware_file': ['src/snagrecover/templates/ambarella-cv22.yaml'], 'firmware': None, 'uart': None, 'baudrate': 115200, 'netns': 'snagbootnet', 'loglevel': 'debug', 'logfile': 'board_recovery.log', 'rom_usb': None, 'usb_path': None, 'list_socs': False, 'version': False, 'template': None, 'udev': False, 'am335x_setup': False}} | ||
| 2025-05-17 09:52:22,594 [INFO] Starting recovery of cv22 board | ||
| 2025-05-17 09:52:22,601 [INFO] Done recovering cv22 board | ||
| 2025-05-17 09:52:22,601 [INFO] Logs were appended to board_recovery.log | ||
| 2025-05-17 09:52:22,601 [INFO] Done recovering cv22 board |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| # This file is part of Snagboot | ||
| # Copyright (C) 2025 Petr Hodina | ||
| # | ||
| # This program is free software; you can redistribute it and/or | ||
| # modify it under the terms of the GNU General Public License | ||
| # as published by the Free Software Foundation; either version 2 | ||
| # of the License, or (at your option) any later version. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| # GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License | ||
| # along with this program; if not, write to the Free Software | ||
| # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
| # | ||
|
|
||
| import struct | ||
| from dataclasses import dataclass | ||
| from pathlib import Path | ||
| from typing import Optional | ||
|
|
||
| from .firmware import Firmware, FirmwareError | ||
|
There was a problem hiding this comment. These + same comment as for the previous commit regarding relative path imports. |
||
|
|
||
| FIRM_OFFSET_VERSION = 0x3C | ||
| FIRM_OFFSET_MEMFW_RESULT = 0x40 | ||
| FIRM_OFFSET_MEMFW_CMD = 0x50 | ||
| FIRM_OFFSET_MEMFW_PROG = 0x60 | ||
|
|
||
| BOARD_INFO_MAGIC = 0x12345678 | ||
| BOARD_INFO_ADDR = 0x100000 | ||
| PTB_PTR = 0x200000 | ||
|
|
||
| FW_INFO_MAGIC = 0x87654321 | ||
| FW_INFO_ADDR = 0x110000 | ||
|
|
||
|
|
||
| @dataclass | ||
| class AmbaFirmwareInfo: | ||
| version: int | ||
| memfw_result_addr: int | ||
| memfw_cmd_addr: int | ||
| memfw_prog_addr: int | ||
|
|
||
|
|
||
| class AmbaFirmware(Firmware): | ||
| def __init__( | ||
| self, | ||
| bootloader_path: Optional[Path] = None, | ||
| dram_script_path: Optional[Path] = None, | ||
| ): | ||
| super().__init__() | ||
| self.bootloader_path = bootloader_path | ||
| self.dram_script_path = dram_script_path | ||
| self._bootloader_data: Optional[bytes] = None | ||
| self._dram_script_data: Optional[str] = None | ||
|
|
||
| def load(self) -> None: | ||
| if self.bootloader_path: | ||
| try: | ||
| with open(self.bootloader_path, "rb") as f: | ||
| self._bootloader_data = f.read() | ||
| except OSError as e: | ||
| raise FirmwareError("Failed to load bootloader") from e | ||
|
|
||
| if self.dram_script_path: | ||
| try: | ||
| with open(self.dram_script_path, "r") as f: | ||
| self._dram_script_data = f.read() | ||
| except OSError as e: | ||
| raise FirmwareError("Failed to load DRAM script") from e | ||
|
|
||
| @property | ||
| def bootloader(self) -> bytes: | ||
| if not self._bootloader_data: | ||
| raise FirmwareError("Bootloader not loaded") | ||
| return self._bootloader_data | ||
|
|
||
| @property | ||
| def dram_script(self) -> str: | ||
| if not self._dram_script_data: | ||
| raise FirmwareError("DRAM script not loaded") | ||
| return self._dram_script_data | ||
|
|
||
| @staticmethod | ||
| def get_firmware_info(firmware_path: Path) -> AmbaFirmwareInfo: | ||
| try: | ||
| with open(firmware_path, "rb") as f: | ||
| f.seek(FIRM_OFFSET_VERSION) | ||
| version = struct.unpack("<I", f.read(4))[0] | ||
|
|
||
| f.seek(FIRM_OFFSET_MEMFW_RESULT) | ||
| result_addr = struct.unpack("<I", f.read(4))[0] | ||
|
|
||
| f.seek(FIRM_OFFSET_MEMFW_CMD) | ||
| cmd_addr = struct.unpack("<I", f.read(4))[0] | ||
|
|
||
| f.seek(FIRM_OFFSET_MEMFW_PROG) | ||
| prog_addr = struct.unpack("<I", f.read(4))[0] | ||
|
|
||
| return AmbaFirmwareInfo( | ||
| version=version, | ||
| memfw_result_addr=result_addr, | ||
| memfw_cmd_addr=cmd_addr, | ||
| memfw_prog_addr=prog_addr, | ||
| ) | ||
|
|
||
| except (OSError, struct.error) as e: | ||
| raise FirmwareError("Failed to extract firmware info") from e | ||
|
|
||
| @staticmethod | ||
| def pack_board_info() -> bytes: | ||
| return struct.pack( | ||
| "<IIII", | ||
| BOARD_INFO_MAGIC, | ||
| 0x6F547541, # 'AuTo' in little endian | ||
| PTB_PTR, | ||
| 0, | ||
| ) # reserved | ||
|
|
||
| @staticmethod | ||
| def pack_firmware_info(fw_info: AmbaFirmwareInfo) -> bytes: | ||
| return struct.pack( | ||
| "<IIII", | ||
| FW_INFO_MAGIC, | ||
| fw_info.memfw_cmd_addr, | ||
| fw_info.memfw_result_addr, | ||
| 0, | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| # This file is part of Snagboot | ||
| # Copyright (C) 2023 Bootlin | ||
|
There was a problem hiding this comment. The copyright holder is you, not Bootlin. The rest of the license header is OK. |
||
| # | ||
| # This program is free software; you can redistribute it and/or | ||
| # modify it under the terms of the GNU General Public License | ||
| # as published by the Free Software Foundation; either version 2 | ||
| # of the License, or (at your option) any later version. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| # GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License | ||
| # along with this program; if not, write to the Free Software | ||
| # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
| # | ||
|
|
||
| import struct | ||
| from dataclasses import dataclass | ||
| from enum import IntEnum | ||
| from typing import Tuple | ||
|
|
||
| from ..usb import UsbDevice, UsbError | ||
|
There was a problem hiding this comment. UsbDevice and UsbError are not defined in usb.py, are you missing some commits in your series? Also, please use |
||
|
|
||
| CMD_SIGNATURE = 0x55434D44 | ||
| RSP_SIGNATURE = 0x55525350 | ||
|
|
||
|
|
||
| class AmbaUsbError(Exception): | ||
| pass | ||
|
|
||
|
|
||
| class AmbaInquiryType(IntEnum): | ||
| CHIP = 0x00000001 | ||
| ADDR = 0x00000002 | ||
| REG = 0x00000003 | ||
|
|
||
|
|
||
| class AmbaCommand(IntEnum): | ||
| RDY_TO_RCV = 0 | ||
| RCV_DATA = 1 | ||
| RDY_TO_SND = 2 | ||
| SND_DATA = 3 | ||
| INQUIRY_STATUS = 4 | ||
|
|
||
|
|
||
| class AmbaResponse(IntEnum): | ||
| SUCCESS = 0 | ||
| FAILED = 1 | ||
| IN_BLD = 2 | ||
|
|
||
|
|
||
| @dataclass | ||
| class AmbaDeviceInfo: | ||
| chip_type: int | ||
| dram_start: int | ||
|
|
||
|
|
||
| class AmbaProtocol: | ||
| def __init__(self, device: UsbDevice): | ||
| self.device = device | ||
| self._cmd_buf = bytearray(32) | ||
| self._rsp_buf = bytearray(16) | ||
|
|
||
| def _pack_command(self, cmd: int, *params) -> bytes: | ||
| struct.pack_into( | ||
| "<IIIIIIII", | ||
| self._cmd_buf, | ||
| 0, | ||
| CMD_SIGNATURE, | ||
| cmd, | ||
| *(params + (0,) * (6 - len(params))), | ||
| ) | ||
| return self._cmd_buf | ||
|
|
||
| def _unpack_response(self) -> Tuple[int, int, int, int]: | ||
| return struct.unpack_from("<IIII", self._rsp_buf) | ||
|
|
||
| def send_command(self, cmd: int, *params) -> Tuple[int, int, int]: | ||
| try: | ||
| cmd_buf = self._pack_command(cmd, *params) | ||
| self.device.write(cmd_buf) | ||
|
|
||
| self.device.read(self._rsp_buf) | ||
| sig, rsp, p0, p1 = self._unpack_response() | ||
|
|
||
| if sig != RSP_SIGNATURE: | ||
| raise AmbaUsbError("Invalid response signature") | ||
|
|
||
| return rsp, p0, p1 | ||
|
|
||
| except UsbError as e: | ||
| raise AmbaUsbError("USB communication error") from e | ||
|
|
||
| def get_device_info(self) -> AmbaDeviceInfo: | ||
| rsp, chip, _ = self.send_command( | ||
| AmbaCommand.INQUIRY_STATUS, AmbaInquiryType.CHIP | ||
| ) | ||
| if rsp != AmbaResponse.SUCCESS: | ||
| raise AmbaUsbError("Failed to get chip type") | ||
|
|
||
| rsp, dram_start, _ = self.send_command( | ||
| AmbaCommand.INQUIRY_STATUS, AmbaInquiryType.ADDR | ||
| ) | ||
| if rsp != AmbaResponse.SUCCESS: | ||
| raise AmbaUsbError("Failed to get DRAM start address") | ||
|
|
||
| return AmbaDeviceInfo(chip, dram_start) | ||
|
|
||
| def send_file(self, addr: int, data: bytes) -> None: | ||
| rsp, _, _ = self.send_command(AmbaCommand.RDY_TO_RCV, addr) | ||
| if rsp != AmbaResponse.SUCCESS: | ||
| raise AmbaUsbError("Device not ready to receive") | ||
|
|
||
| rsp, _, _ = self.send_command(AmbaCommand.RCV_DATA) | ||
| if rsp != AmbaResponse.SUCCESS: | ||
| raise AmbaUsbError("Failed to initiate data transfer") | ||
|
|
||
| try: | ||
| self.device.write(data) | ||
| except UsbError as e: | ||
| raise AmbaUsbError("Failed to send data") from e | ||
|
|
||
| rsp, _, _ = self.send_command( | ||
| AmbaCommand.RDY_TO_RCV, | ||
| 0x80000000, | ||
| addr, | ||
| ) | ||
| if rsp != AmbaResponse.SUCCESS: | ||
| raise AmbaUsbError("Data transfer failed") | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.