- gerrit-log - lists.osmocom.org

[XL] Change in osmo-ccid-firmware[master]: Make ch9 usb tests work
by laforge 13 Mar '25

13 Mar '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39759?usp=email ) Change subject: Make ch9 usb tests work ...................................................................... Make ch9 usb tests work This passes all tests except TD 9.9. That's is weird, because 9.9 works fine when doing the same commands on linux. It does not really matter anyway, since stalling the device ep by sending a message from the host is is only useful for the test itself... There is no reasonable way to continue running after random forced ep stalls anyway, resetting the device would be the sane option. This adds some mildly useful debug python snippets that can be used to inspect the device state. Change-Id: Icadaee9d8cbe24bd3cac002cc4f710dcf846a32b --- M ccid_common/cuart.c A contrib/ch9_epstall.py A contrib/gdb_clocktree.py A contrib/gdb_msgb.py A contrib/gdb_sercom.py A contrib/gdb_usb.py M sysmoOCTSIM/hpl/usb/hpl_usb.c M sysmoOCTSIM/main.c M sysmoOCTSIM/usb/class/ccid/device/ccid_df.c M sysmoOCTSIM/usb/class/ccid/device/ccid_df.h M sysmoOCTSIM/usb/device/usbdc.c 11 files changed, 1,306 insertions(+), 50 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c index 9966942..9c96891 100644 --- a/ccid_common/cuart.c +++ b/ccid_common/cuart.c @@ -154,6 +154,7 @@ /* we have to reset this somewhere, and powering down loses all state * this is not hw specific so it belongs here, after handling the hw specific part */ if (!arg) { + osmo_timer_del(&cuart->wtime_tmr); cuart->tx_busy = false; cuart->rx_threshold = 1; cuart->wtime_etu = 9600; /* ISO 7816-3 Section 8.1 */ diff --git a/contrib/ch9_epstall.py b/contrib/ch9_epstall.py new file mode 100644 index 0000000..e1759ac --- /dev/null +++ b/contrib/ch9_epstall.py @@ -0,0 +1,209 @@ +#!/usr/bin/env python3 +""" +Copyright 2025 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + +SPDX-License-Identifier: 0BSD + +Permission to use, copy, modify, and/or distribute this software for any purpose +with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE +AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR +BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE +USE OR PERFORMANCE OF THIS SOFTWARE. + +""" + +""" +ch9 9.9 usb ep halt test code snippets +""" + +import sys +import getopt +import ctypes +import libusb + +VENDOR = 0x1d50 +PRODUCT = 0x6141 +TIMEOUT = 1000 # milliseconds + +def is_myusb(dev): + desc = libusb.device_descriptor() + ret = libusb.get_device_descriptor(dev, ctypes.byref(desc)) + if ret != 0: + sys.stderr.write("Failed to get device descriptor\n") + return False + return (desc.idVendor == VENDOR and desc.idProduct == PRODUCT) + + +def print_device_endpoints(dev): + """Prints the list of endpoints for each interface from the first configuration.""" + enum_mapping = { + value: name + for name, value in vars(libusb).items() + if name.startswith("LIBUSB_ENDPOINT_TRANSFER_TYPE_") and isinstance(value, int) + } + + def _dir(ep): + return "IN" if (ep & libusb.LIBUSB_ENDPOINT_DIR_MASK) == libusb.LIBUSB_ENDPOINT_DIR_MASK else "OUT" + + cfg_ptr = ctypes.POINTER(libusb.config_descriptor)() + ret = libusb.get_config_descriptor(dev, 0, ctypes.byref(cfg_ptr)) + if ret != 0: + sys.stderr.write("Error getting config descriptor: error {}\n".format(ret)) + return + cfg = cfg_ptr.contents + print("Device Configuration:") + print(" Number of interfaces: {}".format(cfg.bNumInterfaces)) + # Iterate over interfaces + for i in range(cfg.bNumInterfaces): + iface = cfg.interface[i] + print(" Interface {}: {} alternate setting(s)".format(i, iface.num_altsetting)) + for j in range(iface.num_altsetting): + alt = iface.altsetting[j] + print(" Interface Altsetting {}: Interface Number {}, Number of Endpoints: {}" .format(j, alt.bInterfaceNumber, alt.bNumEndpoints)) + for k in range(alt.bNumEndpoints): + ep = alt.endpoint[k] + print(f" Endpoint {k}: address: 0x{ep.bEndpointAddress:02x} {_dir(ep.bEndpointAddress):3} {enum_mapping[ep.bmAttributes & 0b11]}") + libusb.free_config_descriptor(cfg_ptr) + + +def set_endpoint_halt(handle, ep, timeout=TIMEOUT): + # bmRequestType: 0x02 (Host-to-device, Standard, Endpoint) + # bRequest: 0x03 (SET_FEATURE) with wValue = 0 (ENDPOINT_HALT) + ret = libusb.control_transfer(handle, 0x02, 0x03, 0, ep, None, 0, timeout) + return ret + + +def get_endpoint_halt(handle, ep, timeout=TIMEOUT): + # bmRequestType: 0x82 (Device-to-host, Standard, Endpoint) + # bRequest: 0x00 (GET_STATUS) with 2-byte response. + buf = (ctypes.c_ubyte * 2)() + ret = libusb.control_transfer(handle, 0x82, 0x00, 0, ep, buf, 2, timeout) + if ret < 0: + return None, ret + status = buf[0] | (buf[1] << 8) + halted = (status & 1) != 0 + return halted, 0 + + +def clear_endpoint_halt(handle, ep, timeout=TIMEOUT): + # bmRequestType: 0x02 (Host-to-device, Standard, Endpoint) + # bRequest: 0x01 (CLEAR_FEATURE) with wValue = 0 (ENDPOINT_HALT) + # ret = libusb.control_transfer(handle, 0x02, 0x01, 0, ep, None, 0, timeout) + + # use proper clear, because the halt resets the toggle, so the host needs to know + ret = libusb.clear_halt(handle, ep) + return ret + + +def main(): + try: + opts, _ = getopt.getopt(sys.argv[1:], "e:d:i:") + except getopt.GetoptError as err: + sys.stderr.write("ERR: Invalid options: {}\n".format(err)) + sys.exit(1) + + ep = None + iface = 0 + for opt, arg in opts: + if opt == '-e': + ep = int(arg, 0) + elif opt == '-i': + iface = int(arg, 0) + + ctx = ctypes.POINTER(libusb.context)() + ret = libusb.init(ctypes.byref(ctx)) + if ret != 0: + sys.stderr.write("Failed to initialize libusb, error {}\n".format(ret)) + sys.exit(1) + + # Get device list. + devs = ctypes.POINTER(ctypes.POINTER(libusb.device))() + cnt = libusb.get_device_list(ctx, ctypes.byref(devs)) + print("Number of attached USB devices = {}".format(cnt)) + + my_dev = None + for i in range(cnt): + dev = devs[i] + if is_myusb(dev): + my_dev = dev + break + + if not my_dev: + sys.stderr.write("ERR: Device not found\n") + libusb.free_device_list(devs, 1) + libusb.exit(ctx) + sys.exit(1) + + # Print the list of endpoints before performing endpoint halt operations. + print("Listing device endpoints:") + print_device_endpoints(my_dev) + + if ep is None: + sys.stderr.write("ERR: -e: Specify endpoint number\n") + libusb.free_device_list(devs, 1) + libusb.exit(ctx) + sys.exit(1) + + handle = ctypes.POINTER(libusb.device_handle)() + ret = libusb.open(my_dev, ctypes.byref(handle)) + if ret != 0: + sys.stderr.write("ERR: Failed to open device, error {}\n".format(libusb.strerror(ret))) + libusb.free_device_list(devs, 1) + libusb.exit(ctx) + sys.exit(1) + + if libusb.kernel_driver_active(handle, iface) == 1: + libusb.detach_kernel_driver(handle, iface) + + ret = libusb.claim_interface(handle, iface) + if ret != 0: + sys.stderr.write("ERR: Failed to claim interface {}: error {}\n".format(iface, libusb.strerror(ret))) + libusb.close(handle) + libusb.free_device_list(devs, 1) + libusb.exit(ctx) + sys.exit(1) + + print("Performing halt operations on endpoint 0x{:02x}".format(ep)) + + # Set endpoint halt (stall). + ret = set_endpoint_halt(handle, ep) + if ret < 0: + sys.stderr.write("Error setting halt on endpoint 0x{:02x}, error {}\n".format(ep, libusb.strerror(ret))) + else: + print("Endpoint 0x{:02x} set to halted state.".format(ep)) + + # Get the halt status. + halted, ret = get_endpoint_halt(handle, ep) + if ret < 0: + sys.stderr.write("Error getting halt status on endpoint 0x{:02x}, error {}\n".format(ep, libusb.strerror(ret))) + else: + print("Endpoint 0x{:02x} halt status: {}".format(ep, halted)) + + # Clear the endpoint halt. + ret = clear_endpoint_halt(handle, ep) + if ret < 0: + sys.stderr.write("Error clearing halt on endpoint 0x{:02x}, error {}\n".format(ep, libusb.strerror(ret))) + else: + print("Clear halt command issued for endpoint 0x{:02x}.".format(ep)) + + # Verify the status after clearing. + halted, ret = get_endpoint_halt(handle, ep) + if ret < 0: + sys.stderr.write("Error getting halt status after clear on endpoint 0x{:02x}, error {}\n".format(ep, libusb.strerror(ret))) + else: + print("Endpoint 0x{:02x} halt status after clear: {}".format(ep, halted)) + + # Cleanup. + libusb.release_interface(handle, iface) + libusb.attach_kernel_driver(handle, iface) + libusb.close(handle) + libusb.free_device_list(devs, 1) + libusb.exit(ctx) + sys.exit(0) + + +if __name__ == '__main__': + main() diff --git a/contrib/gdb_clocktree.py b/contrib/gdb_clocktree.py new file mode 100644 index 0000000..179cb19 --- /dev/null +++ b/contrib/gdb_clocktree.py @@ -0,0 +1,471 @@ +""" +Copyright 2025 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + +SPDX-License-Identifier: 0BSD + +Permission to use, copy, modify, and/or distribute this software for any purpose +with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE +AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR +BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE +USE OR PERFORMANCE OF THIS SOFTWARE. + +""" + +import gdb + +class ClockTreePrinter(gdb.Command): + + def __init__(self): + super(ClockTreePrinter, self).__init__("print-clock-tree", gdb.COMMAND_USER) + + self.known_xosc1_freq = 12e6 + + self.OSCCTRL_BASE = 0x40001000 + self.OSC32KCTRL_BASE = 0x40001400 + self.GCLK_BASE = 0x40001C00 + self.MCLK_BASE = 0x40000800 + + self.dpll_sources = { + 0x0 : "GCLK", # Dedicated GCLK clock reference + 0x1 : "XOSC32", # XOSC32K clock reference (default) + 0x2 : "XOSC0", # XOSC0 clock reference + 0x3 : "XOSC1", # XOSC1 clock reference + #Other - Reserved + } + self.clock_sources = { + "XOSC0" : 0x00, # XOSC 0 oscillator output + "XOSC1" : 0x01, # XOSC 1 oscillator output + "GCLK_IN" : 0x02, # Generator input pad (GCLK_IO) + "GCLK_GEN1" : 0x03, # Generic clock generator 1 output + "OSCULP32K" : 0x04, # OSCULP32K oscillator output + "XOSC32K" : 0x05, # XOSC32K oscillator output + "DFLL" : 0x06, # DFLL48M oscillator output + "DPLL0" : 0x07, # FDPLL200M0 output + "DPLL1" : 0x08, # FDPLL200M1 output + # 0x09-0x0F Reserved Reserved + } + + self.generic_clocks = range(0, 12) # GCLK0 to GCLK11 + self.main_clocks = [ + "CPU", "APBA", "APBB", "APBC", "APBD", "APBE" + ] + + self._peripheral_ids = [ + # grep -rh _GCLK_ID 2>/dev/null | grep define |tr -s ' ' |sort -Vk3 | uniq | sed -E 's/^#define ([^ ]+)[[:space:]]+([0-9]+).*/\2 : "\1"/p' | uniq + {0 : "OSCCTRL_GCLK_ID_DFLL48"}, + {1 : "OSCCTRL_GCLK_ID_FDPLL0"}, + {2 : "I2S_GCLK_ID_SIZE"}, + {2 : "OSCCTRL_GCLK_ID_FDPLL1"}, + {3 : "SERCOM0_GCLK_ID_SLOW"}, + {3 : "SERCOM1_GCLK_ID_SLOW"}, + {3 : "SERCOM2_GCLK_ID_SLOW"}, + {3 : "SERCOM3_GCLK_ID_SLOW"}, + {3 : "SERCOM4_GCLK_ID_SLOW"}, + {3 : "SERCOM5_GCLK_ID_SLOW"}, + {3 : "SERCOM6_GCLK_ID_SLOW"}, + {3 : "SERCOM7_GCLK_ID_SLOW"}, + {3 : "SDHC0_GCLK_ID_SLOW"}, + {3 : "SDHC1_GCLK_ID_SLOW"}, + {3 : "OSCCTRL_GCLK_ID_FDPLL032K"}, + {3 : "OSCCTRL_GCLK_ID_FDPLL132K"}, + {4 : "EIC_GCLK_ID"}, + {5 : "FREQM_GCLK_ID_MSR"}, + {7 : "SERCOM0_GCLK_ID_CORE"}, + {8 : "SERCOM1_GCLK_ID_CORE"}, + {9 : "TC0_GCLK_ID"}, + {9 : "TC1_GCLK_ID"}, + {10 : "USB_GCLK_ID"}, + {11 : "EVSYS_GCLK_ID_0"}, + {11 : "EVSYS_GCLK_ID_LSB"}, + {12 : "EVSYS_GCLK_ID_1"}, + {12 : "EVSYS_GCLK_ID_SIZE"}, + {13 : "EVSYS_GCLK_ID_2"}, + {14 : "EVSYS_GCLK_ID_3"}, + {15 : "EVSYS_GCLK_ID_4"}, + {16 : "EVSYS_GCLK_ID_5"}, + {17 : "EVSYS_GCLK_ID_6"}, + {18 : "EVSYS_GCLK_ID_7"}, + {19 : "EVSYS_GCLK_ID_8"}, + {20 : "EVSYS_GCLK_ID_9"}, + {21 : "EVSYS_GCLK_ID_10"}, + {22 : "EVSYS_GCLK_ID_11"}, + {22 : "EVSYS_GCLK_ID_MSB"}, + {23 : "SERCOM2_GCLK_ID_CORE"}, + {24 : "SERCOM3_GCLK_ID_CORE"}, + {25 : "TCC0_GCLK_ID"}, + {25 : "TCC1_GCLK_ID"}, + {26 : "TC2_GCLK_ID"}, + {26 : "TC3_GCLK_ID"}, + {27 : "CAN0_GCLK_ID"}, + {28 : "CAN1_GCLK_ID"}, + {29 : "TCC2_GCLK_ID"}, + {29 : "TCC3_GCLK_ID"}, + {30 : "TC4_GCLK_ID"}, + {30 : "TC5_GCLK_ID"}, + {31 : "PDEC_GCLK_ID"}, + {32 : "AC_GCLK_ID"}, + {33 : "CCL_GCLK_ID"}, + {34 : "SERCOM4_GCLK_ID_CORE"}, + {35 : "SERCOM5_GCLK_ID_CORE"}, + {36 : "SERCOM6_GCLK_ID_CORE"}, + {37 : "SERCOM7_GCLK_ID_CORE"}, + {38 : "TCC4_GCLK_ID"}, + {39 : "TC6_GCLK_ID"}, + {39 : "TC7_GCLK_ID"}, + {40 : "ADC0_GCLK_ID"}, + {41 : "ADC1_GCLK_ID"}, + {42 : "DAC_GCLK_ID"}, + {43 : "I2S_GCLK_ID_0"}, + {43 : "I2S_GCLK_ID_LSB"}, + {44 : "I2S_GCLK_ID_1"}, + {44 : "I2S_GCLK_ID_MSB"}, + {45 : "SDHC0_GCLK_ID"}, + {46 : "SDHC1_GCLK_ID"}, + ] + self.peripheral_ids = defaultdict(list) + for e in self._peripheral_ids: + for k,v in e.items(): + self.peripheral_ids[k].append(v) + + def read_register(self, address): + val = gdb.parse_and_eval(f"*(uint32_t *)({address})") + return int(val) + + def read_register_field(self, reg_val, mask, shift): + return (reg_val & mask) >> shift + + def get_clock_source_name(self, source_id): + for name, id in self.clock_sources.items(): + if id == source_id: + return name + return f"UNKNOWN_SOURCE({source_id})" + + def get_xosc_frequency(self, xosc_num): + """Get frequency of external oscillator""" + xosc_ctrl = self.read_register(self.OSCCTRL_BASE + 0x14 + (xosc_num * 4)) + if self.read_register_field(xosc_ctrl, 0x2, 1) == 1: # Enabled?# + if self.read_register_field(xosc_ctrl, 0x4, 2) == 1: # External crystal + freq_range = self.read_register_field(xosc_ctrl, 0x00f00000, 20) + if freq_range == 0: + return "0.4 to 2 MHz (external crystal)" + elif freq_range == 1: + return "2 to 4 MHz (external crystal)" + elif freq_range == 2: + return "4 to 8 MHz (external crystal)" + elif freq_range == 3: + return "8 to 16 MHz (external crystal)" + elif freq_range == 4: + return "16 to 32 MHz (external crystal)" + else: + return "External clock (check configuration)" + else: # External clock + return "External clock (check configuration)" + return f"Disabled {xosc_ctrl:032b}" + + def get_xosc32k_frequency(self): + """Get frequency of 32kHz internal oscillator""" + osc32k_ctrl = self.read_register(self.OSC32KCTRL_BASE + 0x14) + if osc32k_ctrl & 0x02: # Enabled? + return "32.768 kHz" + return f"Disabled {osc32k_ctrl:b}" + + def get_osculp32k_frequency(self): + """Get frequency of ultra low power 32kHz oscillator""" + osculp32k_ctrl = self.read_register(self.OSC32KCTRL_BASE + 0x1C) + en32k = self.read_register_field(osculp32k_ctrl, 0x02, 1) + en1k = self.read_register_field(osculp32k_ctrl, 0x04, 2) + + retstr = f"Disabled" + if en32k == 1: + retstr = "32.768 kHz (Ultra Low Power)" + if en1k == 1: + retstr += "+ 1 kHz (Ultra Low Power)" + retstr += f" {osculp32k_ctrl:b}" + return retstr + + def get_dfll_frequency(self): + """Get DFLL frequency and configuration""" + dfll_ctrl = self.read_register(self.OSCCTRL_BASE + 0x1c) + if dfll_ctrl & 0x02: # Enabled? + dfll_config = self.read_register(self.OSCCTRL_BASE + 0x20) + + if dfll_config & 0x1: # Closed loop + pchctrl = self.read_register(self.GCLK_BASE + 0x80) # PCHCTRL[0] for DFLL + gclk_id = pchctrl & 0xf # self.read_register_field(pchctrl, 0x3e, 1) + + mult = self.read_register(self.OSCCTRL_BASE + 0x28) & 0xfff + + # This is simplified - would need to trace through GCLK configuration + return f"Closed loop mode, Ref: GCLK{gclk_id}, Mult: {mult} (~48 MHz)" + else: + return "Open loop mode (~48 MHz)" + (" USBCRM" if dfll_config & 0x8 else "") + return f"Disabled {dfll_ctrl:032b}" + + def get_dpll_frequency(self, dpll_num): + """Get DPLL frequency and configuration""" + dpll_base = self.OSCCTRL_BASE + 0x30 + (dpll_num * 0x14) + + dpll_ctrl_a = self.read_register(dpll_base) + if dpll_ctrl_a & 0x02: # Enabled? + dpll_status = self.read_register(dpll_base + 0x10) + # if dpll_status & 0x01: # Locked? + dpll_ctrl_b = self.read_register(dpll_base + 0x08) + refclk = self.read_register_field(dpll_ctrl_b, 0xe0, 5) + + ref_src = "" + if refclk == 0: + ref_src = "GCLK" + elif refclk == 1: + ref_src = "XOSC32K" + elif refclk == 2: + ref_src = "XOSC0" + elif refclk == 3: + ref_src = "XOSC1" + + ratio = self.read_register(dpll_base + 0x04) + ldr = self.read_register_field(ratio, 0x1FFF, 0) + ldrfrac = self.read_register_field(ratio, 0xF000, 16) + + # Calculate actual ratio (simplified) + actual_ratio = ldr + (ldrfrac / 16.0) + + refdiv = 2 * (self.read_register_field(dpll_ctrl_b, 0xffff0000, 16) +1) + + rets = f"{ "Locked" if dpll_status & 0x1 else "NOT locked"}, Ref: {ref_src}, Ref div: {refdiv}, Ratio: {actual_ratio:.2f}" + + if refclk == 3: + rets += f" -> op freq {self.known_xosc1_freq/refdiv * (actual_ratio+1)}" + + return rets + + return f"Disabled {dpll_ctrl_a:032b}" + + def get_clock_frequency(self, source_id): + """Get frequency of a clock source""" + if source_id == self.clock_sources["XOSC0"]: + return self.get_xosc_frequency(0) + + elif source_id == self.clock_sources["XOSC1"]: + return self.get_xosc_frequency(1) + + elif source_id == self.clock_sources["XOSC32K"]: + return self.get_xosc32k_frequency() + + elif source_id == self.clock_sources["OSCULP32K"]: + return self.get_osculp32k_frequency() + + elif source_id == self.clock_sources["DFLL"]: + return self.get_dfll_frequency() + + elif source_id == self.clock_sources["DPLL0"]: + return self.get_dpll_frequency(0) + + elif source_id == self.clock_sources["DPLL1"]: + return self.get_dpll_frequency(1) + + elif source_id == self.clock_sources["GCLK_GEN1"]: + # This would be circular, so just indicate it's from another GCLK + return "From GCLK Generator 1" + + return "Unknown" + + def print_generic_clock(self, gclk_num): + # Each GCLKn has its own GENCTRL register + genctrl_addr = self.GCLK_BASE + 0x20 + (gclk_num * 0x04) + genctrl = self.read_register(genctrl_addr) + + enabled = genctrl & (0x1 << 8) + if not enabled: + print(f" GCLK{gclk_num}: Disabled") + return + + source_id = self.read_register_field(genctrl, 0x0F, 0) + source_name = self.get_clock_source_name(source_id) + + div_val = self.read_register_field(genctrl, 0xFFFF, 16) + div_mode = self.read_register_field(genctrl, (0x1 << 12), 8) + + if div_mode: # 50/50 duty cycle divider + actual_div = div_val * 2 + else: + actual_div = div_val + + if actual_div == 0 or actual_div == 1: + divider_str = "No division" + else: + divider_str = f"Divide by {actual_div}" + + print(f" GCLK{gclk_num}: Enabled, Source: {source_name}, {divider_str}") + + # Print peripherals using this GCLK + print(f" Peripherals using GCLK{gclk_num}:") + peripherals_found = False + for periph_id in self.peripheral_ids.keys(): + pchctrl_addr = self.GCLK_BASE + 0x80 + (periph_id * 0x04) + pchctrl = self.read_register(pchctrl_addr) + + enabled = pchctrl & (0x1 << 6) + if not enabled: + continue + + gen = self.read_register_field(pchctrl, 0x0f, 0) + if gen == gclk_num: + print(f" - {'\n '.join(self.peripheral_ids[periph_id])}") + peripherals_found = True + + if not peripherals_found: + print(" None") + + def print_main_clocks(self): + """Print main clock configuration (CPU, AHB, APBx)""" + hsdiv = self.read_register(self.MCLK_BASE + 0x04) + cpudiv = self.read_register(self.MCLK_BASE + 0x05) + div = cpudiv & 0xFF + if div == 0 or div == 1: + cpu_div = "No division" + else: + cpu_div = f"Divide by {div}" + + print(f" CPU Clock: {cpu_div}") + print(f" HS div: {hsdiv & 0xFF}") + + bridge_names = ['H', 'A', 'B', 'C', 'D'] + + for i, bridge in enumerate(bridge_names): + mask = self.read_register(self.MCLK_BASE + 0x10 + (i * 4)) + print(f" APB{bridge} Bridge: Mask 0x{mask:08X}") + + if mask != 0: + print(f" Enabled peripherals:") + + # grep -rh ".*define.*MCLK_A.*MASK.*Pos" 2>/dev/null | grep -v _U_ | tr -s ' ' |sort -Vk3 | uniq | sort -k1.8,1.9 | sed -E 's/^#define ([^ ]+)[[:space:]]+([0-9]+).*/\2 : "\1"/p' | sed -s 's/_Pos//g' | uniq | sort -k2.11,2.13 -Vk1 + if bridge == 'H': + apb_peripherals = { + 0 : "MCLK_AHBMASK_HPB0", + 1 : "MCLK_AHBMASK_HPB1", + 2 : "MCLK_AHBMASK_HPB2", + 3 : "MCLK_AHBMASK_HPB3", + 4 : "MCLK_AHBMASK_DSU", + 5 : "MCLK_AHBMASK_HMATRIX", + 6 : "MCLK_AHBMASK_NVMCTRL", + 7 : "MCLK_AHBMASK_HSRAM", + 8 : "MCLK_AHBMASK_CMCC", + 9 : "MCLK_AHBMASK_DMAC", + 10 : "MCLK_AHBMASK_USB", + 11 : "MCLK_AHBMASK_BKUPRAM", + 12 : "MCLK_AHBMASK_PAC", + 13 : "MCLK_AHBMASK_QSPI", + 14 : "MCLK_AHBMASK_GMAC", + 15 : "MCLK_AHBMASK_SDHC0", + 16 : "MCLK_AHBMASK_SDHC1", + 17 : "MCLK_AHBMASK_CAN0", + 18 : "MCLK_AHBMASK_CAN1", + 19 : "MCLK_AHBMASK_ICM", + 20 : "MCLK_AHBMASK_PUKCC", + 21 : "MCLK_AHBMASK_QSPI_2X", + 22 : "MCLK_AHBMASK_NVMCTRL_SMEEPROM", + 23 : "MCLK_AHBMASK_NVMCTRL_CACHE", + } + elif bridge == 'A': + apb_peripherals = { + 0 : "MCLK_APBAMASK_PAC", + 1 : "MCLK_APBAMASK_PM", + 2 : "MCLK_APBAMASK_MCLK", + 3 : "MCLK_APBAMASK_RSTC", + 4 : "MCLK_APBAMASK_OSCCTRL", + 5 : "MCLK_APBAMASK_OSC32KCTRL", + 6 : "MCLK_APBAMASK_SUPC", + 7 : "MCLK_APBAMASK_GCLK", + 8 : "MCLK_APBAMASK_WDT", + 9 : "MCLK_APBAMASK_RTC", + 10 : "MCLK_APBAMASK_EIC", + 11 : "MCLK_APBAMASK_FREQM", + 12 : "MCLK_APBAMASK_SERCOM0", + 13 : "MCLK_APBAMASK_SERCOM1", + 14 : "MCLK_APBAMASK_TC0", + 15 : "MCLK_APBAMASK_TC1", + } + elif bridge == 'B': + apb_peripherals = { + 0 : "MCLK_APBBMASK_USB", + 1 : "MCLK_APBBMASK_DSU", + 2 : "MCLK_APBBMASK_NVMCTRL", + 4 : "MCLK_APBBMASK_PORT", + 6 : "MCLK_APBBMASK_HMATRIX", + 7 : "MCLK_APBBMASK_EVSYS", + 9 : "MCLK_APBBMASK_SERCOM2", + 10 : "MCLK_APBBMASK_SERCOM3", + 11 : "MCLK_APBBMASK_TCC0", + 12 : "MCLK_APBBMASK_TCC1", + 13 : "MCLK_APBBMASK_TC2", + 14 : "MCLK_APBBMASK_TC3", + 16 : "MCLK_APBBMASK_RAMECC", + } + elif bridge == 'C': + apb_peripherals = { + 2 : "MCLK_APBCMASK_GMAC", + 3 : "MCLK_APBCMASK_TCC2", + 4 : "MCLK_APBCMASK_TCC3", + 5 : "MCLK_APBCMASK_TC4", + 6 : "MCLK_APBCMASK_TC5", + 7 : "MCLK_APBCMASK_PDEC", + 8 : "MCLK_APBCMASK_AC", + 9 : "MCLK_APBCMASK_AES", + 10 : "MCLK_APBCMASK_TRNG", + 11 : "MCLK_APBCMASK_ICM", + 13 : "MCLK_APBCMASK_QSPI", + 14 : "MCLK_APBCMASK_CCL", + } + elif bridge == 'D': + apb_peripherals = { + 0 : "MCLK_APBDMASK_SERCOM4", + 1 : "MCLK_APBDMASK_SERCOM5", + 2 : "MCLK_APBDMASK_SERCOM6", + 3 : "MCLK_APBDMASK_SERCOM7", + 4 : "MCLK_APBDMASK_TCC4", + 5 : "MCLK_APBDMASK_TC6", + 6 : "MCLK_APBDMASK_TC7", + 7 : "MCLK_APBDMASK_ADC0", + 8 : "MCLK_APBDMASK_ADC1", + 9 : "MCLK_APBDMASK_DAC", + 10 : "MCLK_APBDMASK_I2S", + 11 : "MCLK_APBDMASK_PCC", + } + else: + apb_peripherals = {} + + # Check each bit in the mask + for bit in range(32): + if mask & (1 << bit): + periph_name = apb_peripherals.get(bit, f"Unknown({bit})") + print(f" - {periph_name}") + + def print_clock_tree(self): + print("SAME54 Clock Tree") + print("=================") + + print("\n Clock Sources:") + print("----------------") + for name, source_id in self.clock_sources.items(): + freq = self.get_clock_frequency(source_id) + print(f" {name}: {freq}") + + print("\n Generic Clocks:") + print("----------------") + for gclk_num in self.generic_clocks: + self.print_generic_clock(gclk_num) + + print("\n Main Clock Buses:") + print("------------------") + self.print_main_clocks() + + def invoke(self, arg, from_tty): + """GDB command invocation""" + self.print_clock_tree() + + + +ClockTreePrinter() \ No newline at end of file diff --git a/contrib/gdb_msgb.py b/contrib/gdb_msgb.py new file mode 100644 index 0000000..9b80c23 --- /dev/null +++ b/contrib/gdb_msgb.py @@ -0,0 +1,83 @@ +""" +Copyright 2025 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + +SPDX-License-Identifier: 0BSD + +Permission to use, copy, modify, and/or distribute this software for any purpose +with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE +AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR +BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE +USE OR PERFORMANCE OF THIS SOFTWARE. + +""" + +import gdb + +class MsgbListPrinter(gdb.Command): + """Prints all msgb entries in a libosmocore linked list""" + + def __init__(self): + super(MsgbListPrinter, self).__init__("print-msgb-list", gdb.COMMAND_USER) + + # prettier full fledged: https://raw.githubusercontent.com/hotsphink/sfink-tools/master/conf/gdbinit… + def container_of(self, ptr, typename, member): + ty = gdb.lookup_type(typename) + # first matching field + bofs = [f.bitpos//8 for f in ty.strip_typedefs().fields() if f.name == member][0] + container_addr = ptr.cast(gdb.lookup_type('unsigned long')) - int(bofs) + return container_addr.cast(ty.pointer()) + + + def invoke(self, args, from_tty): + try: + if not args: + # print("Usage: print-msgb-list list_head") + # return + heads_names = [[f"g_ccid_s.{epn}.list"] for epn in ["in_ep", "irq_ep", "out_ep"]] # f"*(struct msgb*)g_ccid_s.{epn}.in_progress" + heads_names = [nested_item for item in heads_names for nested_item in item] + [f"g_ccid_s.free_q"] + heads = [gdb.parse_and_eval(i) for i in heads_names] + + else: + heads_names = [args] + heads = [gdb.parse_and_eval(args)] + + # print(heads) + + for hn, list_head in zip(heads_names, heads): + print(hn) + # list_head = gdb.parse_and_eval(args) + if not list_head.address: + continue + # print(list_head) + try: + list_head = list_head["list"] + current = list_head + except: + current = list_head['next'] + + head_addr = list_head.address + count = 0 + # print(current, list_head) + + while current != head_addr: + msgb = self.container_of(current, "struct msgb", "list") + print(f"msgb[{int(count):02}] at {int(current):08x}: <-{int(msgb["list"]["prev"]):08x} {int(msgb["list"]["next"]):08x}-> len: {int(msgb['len'])}") + # print(f" data: {msgb['data']}") + # print(f" head: {msgb['head']}") + # print(f" tail: {msgb['tail']}") + + current = msgb['list']['next'] + count += 1 + if current == 0x00100100 or current == 0x00200200: # poison values + break + + print(f"\nTotal msgb entries: {count}" if count else "empty!") + + except gdb.error as e: + print(f"Error: {str(e)}") + +MsgbListPrinter() + diff --git a/contrib/gdb_sercom.py b/contrib/gdb_sercom.py new file mode 100644 index 0000000..c526d44 --- /dev/null +++ b/contrib/gdb_sercom.py @@ -0,0 +1,191 @@ +""" +Copyright 2025 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + +SPDX-License-Identifier: 0BSD + +Permission to use, copy, modify, and/or distribute this software for any purpose +with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE +AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR +BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE +USE OR PERFORMANCE OF THIS SOFTWARE. + +""" + +import gdb + + +##grep -A15 name\>SERCOM ATSAME54N19A.svd | grep base +# <baseAddress>0x40003000</baseAddress> +# <baseAddress>0x40003400</baseAddress> +# <baseAddress>0x41012000</baseAddress> +# <baseAddress>0x41014000</baseAddress> +# <baseAddress>0x43000000</baseAddress> +# <baseAddress>0x43000400</baseAddress> +# <baseAddress>0x43000800</baseAddress> +# <baseAddress>0x43000C00</baseAddress> +# <baseAddress>0x40001800</baseAddress> + + +def gdbdl(addr): + plong=gdb.lookup_type('long').pointer() + val=gdb.Value(addr).cast(plong).dereference() + return int(val)&0xffffffff + + +sercbases = [ +0x40003000, +0x40003400, +0x41012000, +0x41014000, +0x43000000, +0x43000400, +0x43000800, +0x43000C00, +0x40001800] + +USB_EPS=gdb.parse_and_eval (f'usb_d_inst.ep') +NUM_EPS= USB_EPS.type.sizeof // USB_EPS.type.target().sizeof + +# 5 #### { +# xfer = { +# hdr = { +# type = 0 '\000', +# ep = 255 '\377', +# state = 0 '\000', +# status = 0 '\000' +# }, + +for iusb in range(0,NUM_EPS): + iusbd = gdb.parse_and_eval (f'usb_d_inst.ep[{iusb}]'); + state = iusbd['xfer']['hdr']['state'].cast(gdb.lookup_type("enum usb_ep_state")) + status = iusbd['xfer']['hdr']['status'].cast(gdb.lookup_type("enum usb_xfer_code")) + print(iusb, "####", iusbd) + print(state) + print(status) + +def print_usblists(): + def _print_usblists(structptr): + print(structptr) + current = gdb.parse_and_eval(structptr) + while current != 0: + print(current) + current = current['next'] + + _print_usblists("(struct usbdf_driver *)usbdc.func_list.head") + _print_usblists("(struct usbdc_req_handler *)usbdc.handlers.req_list.head") + _print_usblists("(struct usbdc_change_handler *)usbdc.handlers.change_list.head") + _print_usblists("(struct usbdc_sof_handler *)usbdc.handlers.sof_list.head") +print_usblists() + + +for i in range(0,7): + # >>> py print(gdb.parse_and_eval("((Sercom *)0x40003000)->USART.CTRLA.bit").type.fields()[0].name) + #SWRST + uartix = gdb.parse_and_eval (f"g_si.slot[{i}].cuart.u.asf4.usa_pd.device.hw") + u = gdb.parse_and_eval(f"((Sercom *){uartix})->USART") + + for screg in u.type.fields(): + if 'reserved' in screg.name.lower(): + continue + scregf = [x.name for x in u[str(screg.name)].type.fields()] + # print(screg.name, scregf) + if 'bit' in scregf: + ctral_f = [fn.name for fn in u[str(screg.name)]["bit"].type.fields()] + # print(ctral_f) + vals = {x: u[screg.name]["bit"][x] for x in ctral_f} + print(uartix, ' '.join([f"{k}: {int(v)}" for k,v in vals.items()])) + # ctral_f = [fn.name for fn in u[str(screg.name)]["bit"].type.fields()] + # vals = {x: str(u[screg.name]["bit"][x]) for x in ctral_f} + # print(' '.join([f"{k}: {v}" for k,v in vals.items()])) + + +for i in range(0,7): + uslotdata = gdb.parse_and_eval (f"*g_si.slot[{i}].cuart") + print("###################", uslotdata) + + +def _get_enum_flen(ty, v): + gdbty = gdb.lookup_type(ty) + maxl = len(max(gdb.types.make_enum_dict(gdbty).keys())) + return str(v.cast(gdbty)).rjust(20) + +# iso7816_3_state_len = "{max(gdb.types.make_enum_dict(gdb.lookup_type("enum iso7816_3_state")).keys()) +# atr_state_len = max(gdb.types.make_enum_dict(gdb.lookup_type("enum atr_state")).keys()) +# tpdu_state_len = max(gdb.types.make_enum_dict(gdb.lookup_type("enum tpdu_state")).keys()) +# pps_state_len = max(gdb.types.make_enum_dict(gdb.lookup_type("enum pps_state")).keys()) + +# d = gdb.parse_and_eval (f'(enum iso7816_3_state)g_si.slot[{i}].fi.state') +# a = gdb.parse_and_eval (f'(enum atr_state)((struct iso7816_3_priv*)g_si.slot[{i}].fi.priv).atr_fi.state') +# b = gdb.parse_and_eval (f'(enum tpdu_state)((struct iso7816_3_priv*)g_si.slot[{i}].fi.priv).tpdu_fi.state' ) +# c = gdb.parse_and_eval (f'(enum pps_state)((struct iso7816_3_priv*)g_si.slot[{i}].fi.priv).pps_fi.state') + +for i in range(0,7): + # slot = gdb.execute ('p g_ci.slot[%i]' % (i) , False, True) + # a = gdb.execute ('p (enum atr_state)((struct iso7816_3_priv*)g_si.slot[%i].fi.priv).atr_fi.state' % (i) , False, True).split('\n')[-2]#.rpartition('\n') + # b = gdb.execute ('p (enum tpdu_state)((struct iso7816_3_priv*)g_si.slot[%i].fi.priv).tpdu_fi.state' % (i) , False, True).split('\n')[-2]#.rpartition('\n') + # c = gdb.execute ('p (enum pps_state)((struct iso7816_3_priv*)g_si.slot[%i].fi.priv).pps_fi.state' % (i) , False, True).split('\n')[-2]#.rpartition('\n') + # d = gdb.execute ('p (enum iso7816_3_state)g_si.slot[%i].fi.state' % (i) , False, True).split('\n')[-2]#.rpartition('\n') + + uslotdata = gdb.parse_and_eval (f"g_si.slot[{i}].cuart.u.asf4.usa_pd.device.hw") + uslotdata_str = (f"data_reg: {hex(gdbdl(uslotdata+0x28) & 0xffffffff)}") + + + g_slot = gdb.parse_and_eval(f'g_si.slot[{i}]') + + # slot = gdb.parse_and_eval(f'g_ci.slot[{i}]') + # d = gdb.parse_and_eval (f'(enum iso7816_3_state)g_si.slot[{i}].fi.state') + # a = gdb.parse_and_eval (f'(enum atr_state)((struct iso7816_3_priv*)g_si.slot[{i}].fi.priv).atr_fi.state') + # b = gdb.parse_and_eval (f'(enum tpdu_state)((struct iso7816_3_priv*)g_si.slot[{i}].fi.priv).tpdu_fi.state' ) + # c = gdb.parse_and_eval (f'(enum pps_state)((struct iso7816_3_priv*)g_si.slot[{i}].fi.priv).pps_fi.state') + + + d = gdb.parse_and_eval (f'g_si.slot[{i}].fi') + a = gdb.parse_and_eval (f'((struct iso7816_3_priv*)g_si.slot[{i}].fi.priv).atr_fi') + b = gdb.parse_and_eval (f'((struct iso7816_3_priv*)g_si.slot[{i}].fi.priv).tpdu_fi') + c = gdb.parse_and_eval (f'((struct iso7816_3_priv*)g_si.slot[{i}].fi.priv).pps_fi') + + # sloevent = gdb.parse_and_eval (f'g_si.slot[{i}].cs.event') + # sloeventdata = gdb.parse_and_eval (f'g_si.slot[{i}].cs.event_data') + + print( + i, + f"seq: {int(g_slot["seq"]):3d}", + _get_enum_flen("enum iso7816_3_state", d['state']), + _get_enum_flen("enum atr_state", a['state']), + _get_enum_flen("enum tpdu_state", b['state']), + _get_enum_flen("enum pps_state", c['state']), + uslotdata_str, + f"ev: {g_slot['cs']['event']} evdata: {g_slot['cs']['event_data']} ", end='', sep=None) + + + # for i in sercbases: + # print(f"data{i} {hex(gdbdl(i+0x28) & 0xffffffff)}") + + # gdb.execute ('x/20b (&SIM%d.rx->buf[SIM%d.rx->write_index & SIM%d.rx->size])-20' % (i,i,i) , True) + + xx = gdb.parse_and_eval ('g_si.slot[%i].cuart.u.asf4.usa_pd.tx_por' % (i)) + xy = gdb.parse_and_eval ('g_si.slot[%i].cuart.u.asf4.usa_pd.tx_buffer_length' % (i)) + idx = int(xx) + idx2 = int(xy) + nval = None + bval = None + + if idx != idx2: + nval = int(gdb.parse_and_eval ('g_si.slot[%i].cuart.u.asf4.usa_pd.tx_buffer[%i]' % (i, idx))) + + if idx > 0: + bval = int(gdb.parse_and_eval ('g_si.slot[%i].cuart.u.asf4.usa_pd.tx_buffer[%i]' % (i, idx-1))) + + #print idx, idx2, bval + # print(f"{i}: ", end='', sep=None) + if nval is not None and bval is not None: + print("last tx:0x" + "{:02x}".format(bval) + " next tx:0x" + "{:02x}".format(nval)) + elif nval is None and bval is not None: + print("last tx:0x" + "{:02x}".format(bval) + " next tx:none" ) + elif nval is not None and bval is None: + print("last tx:none next tx:0x" + "{:02x}".format(nval)) + else: + print(f"wat?! {nval} {bval} {idx} {idx2}") diff --git a/contrib/gdb_usb.py b/contrib/gdb_usb.py new file mode 100644 index 0000000..1c911a7 --- /dev/null +++ b/contrib/gdb_usb.py @@ -0,0 +1,122 @@ +""" +Copyright 2025 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + +SPDX-License-Identifier: 0BSD + +Permission to use, copy, modify, and/or distribute this software for any purpose +with or without fee is hereby granted.THE SOFTWARE IS PROVIDED "AS IS" AND THE +AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR +BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE +USE OR PERFORMANCE OF THIS SOFTWARE. + +""" + +import gdb + + +EP_N_MASK = 0x0F +EP_DIR_MASK = 0x80 +USB = 0x41000000 +CONF_USB_D_MAX_EP_N = 4 # !! + +eptstr = { + 0: "USB_D_EPTYPE_DISABLE", + 1: "USB_D_EPTYPE_CTRL", + 2: "USB_D_EPTYPE_ISOCH", + 3: "USB_D_EPTYPE_INT", + 4: "USB_D_EPTYPE_BULK", + 5: "USB_D_EPTYPE_DUAL", + 0x11: "USB_D_EPCFG_CTRL", +} + +# bmAttributes +# define USB_EP_XTYPE_CTRL 0x0 +# define USB_EP_XTYPE_ISOCH 0x1 +# define USB_EP_XTYPE_BULK 0x2 +# define USB_EP_XTYPE_INTERRUPT 0x3 +# define USB_EP_XTYPE_MASK 0x3u + + +hwepty1 = { + 0x0: "Bank1 is disabled.", + 0x1: "Bank1 is enabled and configured as Control IN.", + 0x2: "Bank1 is enabled and configured as Isochronous IN.", + 0x3: "Bank1 is enabled and configured as Bulk IN.", + 0x4: "Bank1 is enabled and configured as Interrupt IN.", + 0x5: "Bank1 is enabled and configured as Dual-Bank OUT (Endpoint type is the same as the one defined in EPTYPE0)", } +# 0x6-0x7 Reserved +def USB_DEVICE_EPCFG_EPTYPE1(v): return (v >> 4) & 0x7 + + +hwepty0 = { + 0x0: "Bank0 is disabled.", + 0x1: "Bank0 is enabled and configured as Control SETUP / Control OUT.", + 0x2: "Bank0 is enabled and configured as Isochronous OUT.", + 0x3: "Bank0 is enabled and configured as Bulk OUT.", + 0x4: "Bank0 is enabled and configured as Interrupt OUT.", + 0x5: "Bank0 is enabled and configured as Dual Bank IN (Endpoint type is the same as the one defined in EPTYPE1)", } +# 0x6-0x7 Reserved +def USB_DEVICE_EPCFG_EPTYPE0(v): return v & 0x7 + + +def get_epdir(ep): + return ep & EP_DIR_MASK + + +def get_epn(ep): + return ep & EP_N_MASK + + +def _usb_d_dev_ept(epn, dir): + if (epn == 0): + ep_index = 0 + else: + if dir: + ep_index = (epn + CONF_USB_D_MAX_EP_N) + else: + ep_index = epn + return gdb.parse_and_eval(f'dev_inst.ep[{ep_index}]') + + +def get_epcfg_typ(n, v): + if n == 0: + return v & 0x7 + if n == 1: + return (v >> 4) & 0x7 + + +def hri_usbendpoint_read_EPCFG_reg(epn): + addr = USB+0x100+epn*0x20 + epcfg = gdb.parse_and_eval(f'*{addr}') + return epcfg + + +CCID_USB_EPS = gdb.parse_and_eval(f'_ccid_df_funcd') +# print(USB_EPS["func_iface"]) +for ept in ["func_ep_in", "func_ep_out", "func_ep_irq"]: + cept = int(CCID_USB_EPS[ept]) + dir = 1 if get_epdir(cept) else 0 + epn = get_epn(cept) + softep = gdb.parse_and_eval(f"*_usb_d_dev_ept({epn},{dir})") # _usb_d_dev_ept(epn, dir) + # print(epn, dir) + # gdb.execute(f"p *_usb_d_dev_ept({epn},{dir})") + epcfg = hri_usbendpoint_read_EPCFG_reg(epn) + eptype = softep["flags"]["bits"]["eptype"] + t0 = int(USB_DEVICE_EPCFG_EPTYPE0(epcfg)) + t1 = int(USB_DEVICE_EPCFG_EPTYPE1(epcfg)) + + print(f"epn:{epn} {ept}:\tccid/soft:{int(cept):02x}:{int(softep["ep"]):02x}\tdir:{int(dir):02x} n:{int(epn):02x}", + epcfg, eptstr[int(eptype)], hwepty0[t0], "\t", hwepty1[t1]) + +USB_EPS = gdb.parse_and_eval(f'usb_d_inst.ep') +NUM_EPS = USB_EPS.type.sizeof // USB_EPS.type.target().sizeof +for iusb in range(0, NUM_EPS): + iusbd = gdb.parse_and_eval(f'usb_d_inst.ep[{iusb}]') + state = iusbd['xfer']['hdr']['state'].cast(gdb.lookup_type("enum usb_ep_state")) + status = iusbd['xfer']['hdr']['status'].cast(gdb.lookup_type("enum usb_xfer_code")) + print(iusb, "####", iusbd) + print(state) + print(status) diff --git a/sysmoOCTSIM/hpl/usb/hpl_usb.c b/sysmoOCTSIM/hpl/usb/hpl_usb.c index c7e2d33..ed9ef62 100644 --- a/sysmoOCTSIM/hpl/usb/hpl_usb.c +++ b/sysmoOCTSIM/hpl/usb/hpl_usb.c @@ -41,11 +41,6 @@ #include <utils_assert.h> #include <hal_delay.h> -/* save previous setup state to allow device reset when receving usb reset after the device - * was previously properly configured, i.e. when powered externally and usb is disconnected and reconnected */ -volatile bool address_was_set = false; -volatile bool delayed_usb_reset = false; - /** * \brief Dummy callback function * \return Always false. @@ -981,11 +976,6 @@ _usb_d_dev_reset_epts(); - if (address_was_set == true) { - address_was_set = 0; - delayed_usb_reset = true; - } - dev_inst.callbacks.event(USB_EV_RESET, 0); } @@ -1591,7 +1581,6 @@ void _usb_d_dev_set_address(uint8_t addr) { hri_usbdevice_write_DADD_reg(USB, USB_DEVICE_DADD_ADDEN | USB_DEVICE_DADD_DADD(addr)); - address_was_set = true; } uint8_t _usb_d_dev_get_address(void) @@ -1732,9 +1721,10 @@ _usb_d_dev_trans_setup(ept); } else if (dir) { - if (epcfg & USB_DEVICE_EPCFG_EPTYPE1_Msk) { - return -USB_ERR_REDO; - } + /* prevents init->enable->disable->enable again from working without reinit...*/ + // if (epcfg & USB_DEVICE_EPCFG_EPTYPE1_Msk) { + // return -USB_ERR_REDO; + // } epcfg |= USB_DEVICE_EPCFG_EPTYPE1(ept->flags.bits.eptype); hri_usbendpoint_write_EPCFG_reg(hw, epn, epcfg); @@ -1746,10 +1736,10 @@ _usbd_ep_clear_bank_status(epn, 1); } else { - - if (epcfg & USB_DEVICE_EPCFG_EPTYPE0_Msk) { - return -USB_ERR_REDO; - } + /* prevents init->enable->disable->enable again from working without reinit...*/ + // if (epcfg & USB_DEVICE_EPCFG_EPTYPE0_Msk) { + // return -USB_ERR_REDO; + // } epcfg |= USB_DEVICE_EPCFG_EPTYPE0(ept->flags.bits.eptype); hri_usbendpoint_write_EPCFG_reg(hw, epn, epcfg); diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index 51421aa..b0c0229 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -38,6 +38,12 @@ #include "ccid_device.h" #include "usb_descriptors.h" + +static void bdg_bkptpanic(const char *fmt, va_list args) +{ + __asm("BKPT #0"); +} + extern struct ccid_slot_ops iso_fsm_slot_ops; static struct ccid_instance g_ci; @@ -129,6 +135,10 @@ { struct msgb *msg; CRITICAL_SECTION_ENTER() + OSMO_ASSERT(q->next != LLIST_POISON1) + OSMO_ASSERT(q->next->next != LLIST_POISON1) + OSMO_ASSERT(q->prev != LLIST_POISON2) + OSMO_ASSERT(q->prev->prev != LLIST_POISON2) msg = msgb_dequeue(q); CRITICAL_SECTION_LEAVE() return msg; @@ -138,6 +148,10 @@ { CRITICAL_SECTION_ENTER() msgb_enqueue(q, msg); + OSMO_ASSERT(msg->list.next != LLIST_POISON1) + OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) + OSMO_ASSERT(msg->list.prev != LLIST_POISON2) + OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) CRITICAL_SECTION_LEAVE() } @@ -158,6 +172,10 @@ ep_q->in_progress = msg; rc = ccid_df_write_in(msgb_data(msg), msgb_length(msg)); if (rc != ERR_NONE) { + OSMO_ASSERT(msg->list.next != LLIST_POISON1) + OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) + OSMO_ASSERT(msg->list.prev != LLIST_POISON2) + OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) printf("EP %s failed: %d\r\n", ep_q->name, rc); return -1; } @@ -183,6 +201,10 @@ rc = ccid_df_write_irq(msgb_data(msg), msgb_length(msg)); /* may return HALTED/ERROR/DISABLED/BUSY/ERR_PARAM/ERR_FUNC/ERR_DENIED */ if (rc != ERR_NONE) { + // ep_q->in_progress = msg; + // msgb_enqueue_irqsafe(&ep_q->list, msg); + // OSMO_ASSERT(msg->list.next != LLIST_POISON1) + // OSMO_ASSERT(msg->list.prev != LLIST_POISON2) printf("EP %s failed: %d\r\n", ep_q->name, rc); return -1; } @@ -195,7 +217,9 @@ struct msgb *msg; int rc; - OSMO_ASSERT(!ep_q->in_progress); + if (ep_q->in_progress) + return 0; + msg = msgb_dequeue_irqsafe(&g_ccid_s.free_q); if (!msg) return -1; @@ -206,6 +230,10 @@ if (rc != ERR_NONE) { /* re-add to the list of free msgb's */ llist_add_tail_at(&msg->list, &g_ccid_s.free_q); + OSMO_ASSERT(msg->list.next != LLIST_POISON1) + OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) + OSMO_ASSERT(msg->list.prev != LLIST_POISON2) + OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) return 0; } return 1; @@ -216,12 +244,32 @@ { struct msgb *msg = g_ccid_s.out_ep.in_progress; + /* + reset: resubmit from main loop when ready + unhalt: resubmit immediately + */ + if (code == USB_XFER_RESET || code == USB_XFER_UNHALT || code == USB_XFER_HALT) { + if (msg) { + msgb_reset(msg); + llist_add_tail_at(&msg->list, &g_ccid_s.free_q); + g_ccid_s.out_ep.in_progress = NULL; + } + if (code == USB_XFER_UNHALT) { + submit_next_out(); + } + return; + } + /* add just-received msg to tail of endpoint queue */ OSMO_ASSERT(msg); /* update msgb with the amount of data received */ msgb_put(msg, transferred); /* append to list of pending-to-be-handed messages */ llist_add_tail_at(&msg->list, &g_ccid_s.out_ep.list); + OSMO_ASSERT(msg->list.next != LLIST_POISON1) + OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) + OSMO_ASSERT(msg->list.prev != LLIST_POISON2) + OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) g_ccid_s.out_ep.in_progress = NULL; if(code != USB_XFER_DONE) @@ -236,10 +284,18 @@ { struct msgb *msg = g_ccid_s.in_ep.in_progress; - OSMO_ASSERT(msg); - /* return the message back to the queue of free message buffers */ - llist_add_tail_at(&msg->list, &g_ccid_s.free_q); - g_ccid_s.in_ep.in_progress = NULL; + if (msg) { + /* return the message back to the queue of free message buffers */ + llist_add_tail_at(&msg->list, &g_ccid_s.free_q); + OSMO_ASSERT(msg->list.next != LLIST_POISON1) + OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) + OSMO_ASSERT(msg->list.prev != LLIST_POISON2) + OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) + g_ccid_s.in_ep.in_progress = NULL; + } + + if (code == USB_XFER_UNHALT) + submit_next_in(); if(code != USB_XFER_DONE) return; @@ -253,10 +309,18 @@ { struct msgb *msg = g_ccid_s.irq_ep.in_progress; - OSMO_ASSERT(msg); - /* return the message back to the queue of free message buffers */ - llist_add_tail_at(&msg->list, &g_ccid_s.free_q); - g_ccid_s.irq_ep.in_progress = NULL; + if (msg) { + /* return the message back to the queue of free message buffers */ + llist_add_tail_at(&msg->list, &g_ccid_s.free_q); + OSMO_ASSERT(msg->list.next != LLIST_POISON1) + OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) + OSMO_ASSERT(msg->list.prev != LLIST_POISON2) + OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) + g_ccid_s.irq_ep.in_progress = NULL; + } + + if (code == USB_XFER_UNHALT) + submit_next_irq(); if(code != USB_XFER_DONE) return; @@ -452,6 +516,10 @@ /* append to list of pending-to-be-handed messages */ llist_add_tail_at(&msg->list, &g_ccid_s.in_ep.list); + OSMO_ASSERT(msg->list.next != LLIST_POISON1) + OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) + OSMO_ASSERT(msg->list.prev != LLIST_POISON2) + OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) submit_next_in(); return 0; } @@ -473,21 +541,83 @@ char rstcause_buf[RSTCAUSE_STR_SIZE]; -void do_usb_res(void) +void reset_all_stuff_irq(void) { - hri_usbdevice_set_CTRLA_SWRST_bit(USB); - uint32_t *application_start_address = (uint32_t *)(16384); - __set_MSP(*application_start_address); - __DSB(); - __ISB(); - asm("bx %0" ::"r"(*(application_start_address + 1))); + SysTick->CTRL = 0; // no clock ticks for osmo timers + + Sercom *const sercom_modules[] = SERCOM_INSTS; + for (uint32_t i = 0; i < SERCOM_INST_NUM; i++) { + hri_sercomusart_clear_CTRLA_ENABLE_bit(sercom_modules[i]); + hri_sercomusart_clear_INTFLAG_reg(sercom_modules[i], 0xff); + } } -extern volatile bool delayed_usb_reset; +extern volatile bool was_unconfigured_flag; + +void reset_all_stuff_non_irq(void) +{ + if (!was_unconfigured_flag) + return; + + CRITICAL_SECTION_ENTER() + + for (int i = 0; i <= usb_fs_descs.ccid.class.bMaxSlotIndex; i++) { + g_ci.slot_ops->handle_fsm_events(&g_ci.slot[i], true); + } + + for (int i = 0; i <= usb_fs_descs.ccid.class.bMaxSlotIndex; i++) { + g_ci.slot_ops->icc_set_insertion_status(&g_ci.slot[i], false); + g_ci.slot_ops->handle_fsm_events(&g_ci.slot[i], true); + } + + for (int i = 0; i <= usb_fs_descs.ccid.class.bMaxSlotIndex; i++) { + g_ci.slot_ops->handle_fsm_events(&g_ci.slot[i], true); + } + + volatile struct usb_ep_q *all_epqs[] = { &g_ccid_s.in_ep, &g_ccid_s.irq_ep, &g_ccid_s.out_ep }; + for (int i = 0; i < ARRAY_SIZE(all_epqs); i++) { + volatile struct usb_ep_q *cur_epq = all_epqs[i]; + struct msgb *msg; + while ((msg = msgb_dequeue_irqsafe(&cur_epq->list))) { + msgb_reset(msg); + llist_add_tail_at(&msg->list, &g_ccid_s.free_q); + OSMO_ASSERT(msg->list.next != LLIST_POISON1) + OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) + OSMO_ASSERT(msg->list.prev != LLIST_POISON2) + OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) + } +#if 0 + struct msgb *cur_msg = cur_epq->in_progress; + if (cur_msg) { + /* + if (i == 2 && usb_d_ep_get_status(/*_ccid_df_funcd.func_ep_out*/ 2, 0) == USB_BUSY) + continue; + */ + + msgb_reset(cur_msg); + llist_add_tail_at(&cur_msg->list, &g_ccid_s.free_q); + OSMO_ASSERT(msg->list.next != LLIST_POISON1) + OSMO_ASSERT(msg->list.next->next != LLIST_POISON1) + OSMO_ASSERT(msg->list.prev != LLIST_POISON2) + OSMO_ASSERT(msg->list.prev->prev != LLIST_POISON2) + cur_epq->in_progress = NULL; + } +#endif + } + + SysTick->CTRL = 1; + + // while (!ccid_df_is_enabled()) + // ; + g_ccid_s.card_insert_mask = 0; + was_unconfigured_flag = false; + CRITICAL_SECTION_LEAVE() + ccid_eps_enable(); +} int main(void) { - + osmo_set_panic_handler(&bdg_bkptpanic); #if 0 CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk ; //| /* tracing*/ ////CoreDebug_DEMCR_MON_EN_Msk; /* mon interupt catcher */ @@ -567,9 +697,10 @@ struct msgb *msg = msgb_alloc(300, "ccid"); OSMO_ASSERT(msg); /* return the message back to the queue of free message buffers */ + OSMO_ASSERT(msg->list.next != LLIST_POISON1) llist_add_tail_at(&msg->list, &g_ccid_s.free_q); } - submit_next_out(); + // submit_next_out(); CRITICAL_SECTION_LEAVE() #if 0 /* CAN_RX */ @@ -585,8 +716,10 @@ // command_print_prompt(); while (true) { // main loop - if (delayed_usb_reset) - do_usb_res(); + if (was_unconfigured_flag) { + reset_all_stuff_non_irq(); + submit_next_out(); + } poll_extpower_detect(); command_try_recv(); poll_card_detect(); @@ -597,19 +730,18 @@ feed_ccid(); osmo_timers_update(); int qs = llist_count_at(&g_ccid_s.free_q); - if(qs > NUM_OUT_BUF) - for (int i= 0; i < qs-NUM_OUT_BUF; i++){ + if (qs > NUM_OUT_BUF) + for (int i = 0; i < qs - NUM_OUT_BUF; i++) { struct msgb *msg = msgb_dequeue_irqsafe(&g_ccid_s.free_q); if (msg) - msgb_free(msg); + msgb_free(msg); } - if(qs < NUM_OUT_BUF) - for (int i= 0; i < NUM_OUT_BUF-qs; i++){ - struct msgb *msg = msgb_alloc(300,"ccid"); + if (qs < NUM_OUT_BUF) + for (int i = 0; i < NUM_OUT_BUF - qs; i++) { + struct msgb *msg = msgb_alloc(300, "ccid"); OSMO_ASSERT(msg); /* return the message back to the queue of free message buffers */ llist_add_tail_at(&msg->list, &g_ccid_s.free_q); } - } } diff --git a/sysmoOCTSIM/usb/class/ccid/device/ccid_df.c b/sysmoOCTSIM/usb/class/ccid/device/ccid_df.c index 2227a23..f9cae34 100644 --- a/sysmoOCTSIM/usb/class/ccid/device/ccid_df.c +++ b/sysmoOCTSIM/usb/class/ccid/device/ccid_df.c @@ -38,7 +38,7 @@ uint8_t func_ep_in; /*!< IN endpoint number */ uint8_t func_ep_out; /*!< OUT endpoint number */ uint8_t func_ep_irq; /*!< IRQ endpoint number */ - bool enabled; /*!< is this driver/function enabled? */ + volatile bool enabled; /*!< is this driver/function enabled? */ const struct usb_ccid_class_descriptor *ccid_cd; }; @@ -47,6 +47,21 @@ extern const struct usb_desc_collection usb_fs_descs; +void ccid_eps_enable(void) +{ + while (!ccid_df_is_enabled()) + ; + + CRITICAL_SECTION_ENTER() + usb_d_ep_disable(_ccid_df_funcd.func_ep_in); + usb_d_ep_enable(_ccid_df_funcd.func_ep_in); + usb_d_ep_disable(_ccid_df_funcd.func_ep_irq); + usb_d_ep_enable(_ccid_df_funcd.func_ep_irq); + usb_d_ep_disable(_ccid_df_funcd.func_ep_out); + usb_d_ep_enable(_ccid_df_funcd.func_ep_out); + CRITICAL_SECTION_LEAVE() +} + /* FIXME: make those configurable, ensure they're sized according to * bNumClockSupported / bNumDataRatesSupported */ static uint32_t ccid_clock_frequencies[CCID_NUM_CLK_SUPPORTED] = { LE32(2500),LE32(5000),LE32(10000),LE32(20000) }; @@ -93,7 +108,10 @@ } else { func_data->func_ep_out = ep_desc.bEndpointAddress; } + /* + don't do this here: too early for reset, config 0, .. ccid not ready. usb_d_ep_enable(ep_desc.bEndpointAddress); + */ desc->sod = ep; ep = usb_find_ep_desc(usb_desc_next(desc->sod), desc->eod); } @@ -119,16 +137,16 @@ func_data->func_iface = 0xff; if (func_data->func_ep_in != 0xff) { - func_data->func_ep_in = 0xff; usb_d_ep_deinit(func_data->func_ep_in); + func_data->func_ep_in = 0xff; } if (func_data->func_ep_out != 0xff) { - func_data->func_ep_out = 0xff; usb_d_ep_deinit(func_data->func_ep_out); + func_data->func_ep_out = 0xff; } if (func_data->func_ep_irq != 0xff) { - func_data->func_ep_irq = 0xff; usb_d_ep_deinit(func_data->func_ep_irq); + func_data->func_ep_irq = 0xff; } _ccid_df_funcd.enabled = false; @@ -200,6 +218,39 @@ /* process a control endpoint request */ static int32_t ccid_df_ctrl_req(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) { + /* ERR_NOT_FOUND defers to default handlers which do the right thing */ + if (stage == USB_SETUP_STAGE) { + if ((req->bmRequestType & USB_REQT_RECIP_MASK) == USB_REQT_RECIP_ENDPOINT) { + int32_t st; + static uint8_t ctrl_buffer[8] = { 0 }; + uint8_t epad = req->wIndex & 0xFF; + // if (!(_ccid_df_funcd.func_ep_in == epad || _ccid_df_funcd.func_ep_irq == epad || _ccid_df_funcd.func_ep_out == epad)) + // return ERR_NOT_FOUND; + + switch (req->bRequest) { + case USB_REQ_CLEAR_FTR: + // usb_d_ep_halt(epad, USB_EP_HALT_CLR); + // usbdc_xfer(ep, NULL, 0, true); + return ERR_NOT_FOUND; + case USB_REQ_SET_FTR: + // usb_d_ep_halt(epad, USB_EP_HALT_SET); + // usbdc_xfer(ep, NULL, 0, true); + return ERR_NOT_FOUND; + case USB_REQ_GET_STATUS: + // st = usb_d_ep_halt(epad, USB_EP_HALT_GET); + // if (st < 0) { + // return ERR_NONE; + // } + // st = st & 0x1; + // memcpy(ctrl_buffer, &st, 2); + // usbdc_xfer(ep, ctrl_buffer, 2, false); + return ERR_NOT_FOUND; + default: + return ERR_NOT_FOUND; + } + } + } + /* verify this is a class-specific request */ if (0x01 != ((req->bmRequestType >> 5) & 0x03)) return ERR_NOT_FOUND; diff --git a/sysmoOCTSIM/usb/class/ccid/device/ccid_df.h b/sysmoOCTSIM/usb/class/ccid/device/ccid_df.h index 21fa99e..02d4445 100644 --- a/sysmoOCTSIM/usb/class/ccid/device/ccid_df.h +++ b/sysmoOCTSIM/usb/class/ccid/device/ccid_df.h @@ -15,3 +15,4 @@ int32_t ccid_df_write_irq(uint8_t *buf, uint32_t size); int32_t ccid_df_register_callback(enum ccid_df_cb_type cb_type, FUNC_PTR ptr); bool ccid_df_is_enabled(void); +void ccid_eps_enable(void); diff --git a/sysmoOCTSIM/usb/device/usbdc.c b/sysmoOCTSIM/usb/device/usbdc.c index 4b84937..38aa0e0 100644 --- a/sysmoOCTSIM/usb/device/usbdc.c +++ b/sysmoOCTSIM/usb/device/usbdc.c @@ -36,6 +36,8 @@ #define USBDC_VERSION 0x00000001u extern bool old_extpwer_state; +volatile bool was_unconfigured_flag = false; +extern void reset_all_stuff_irq(void); /** * \brief USB Device Core Sof Handler @@ -450,6 +452,9 @@ */ static void usbdc_unconfig(void) { + reset_all_stuff_irq(); + was_unconfigured_flag = true; + struct usbdf_driver *func = (struct usbdf_driver *)usbdc.func_list.head; while (NULL != func) { func->ctrl(func, USBDF_DISABLE, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39759?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Icadaee9d8cbe24bd3cac002cc4f710dcf846a32b Gerrit-Change-Number: 39759 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XL] Change in osmo-ccid-firmware[master]: Make ch9 usb tests work
by laforge 13 Mar '25

13 Mar '25

Attention is currently required from: Hoernchen. laforge has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39759?usp=email ) Change subject: Make ch9 usb tests work ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39759?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Icadaee9d8cbe24bd3cac002cc4f710dcf846a32b Gerrit-Change-Number: 39759 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Mar 2025 15:02:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ccid-firmware[master]: fix some warnings and add some warning flags
by laforge 13 Mar '25

13 Mar '25

Attention is currently required from: Hoernchen. laforge has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39448?usp=email ) Change subject: fix some warnings and add some warning flags ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I55e1de7fe8428a5c6cdf741cdc0ae7c47aa7c8d8 Gerrit-Change-Number: 39448 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Mar 2025 15:02:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ccid-firmware[master]: add ext power detect & dev reset
by laforge 13 Mar '25

13 Mar '25

Attention is currently required from: Hoernchen. laforge has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39447?usp=email ) Change subject: add ext power detect & dev reset ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39447?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ied62450670dba2227daa96cbcd162cfe8414445a Gerrit-Change-Number: 39447 Gerrit-PatchSet: 11 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Mar 2025 15:02:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ccid-firmware[master]: fix usb usb reset handling by delayed soft reset
by laforge 13 Mar '25

13 Mar '25

Attention is currently required from: Hoernchen. laforge has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39445?usp=email ) Change subject: fix usb usb reset handling by delayed soft reset ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I0939930a42f3009abf7e670561a123963bbd3845 Gerrit-Change-Number: 39445 Gerrit-PatchSet: 7 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Mar 2025 15:02:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-asf4-dfu[master]: contrib: add nvm urow parser ipynb
by laforge 13 Mar '25

13 Mar '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39436?usp=email ) ( 7 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: contrib: add nvm urow parser ipynb ...................................................................... contrib: add nvm urow parser ipynb Useful when dealing with the urow bits for wdt, bootprot, .. Change-Id: I588838d7c33be24636e00cec65c3b485a486f747 --- A contrib/same54_urow.ipynb 1 file changed, 135 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/same54_urow.ipynb b/contrib/same54_urow.ipynb new file mode 100644 index 0000000..3069475 --- /dev/null +++ b/contrib/same54_urow.ipynb @@ -0,0 +1,135 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": 5, + "metadata": {}, + "outputs": [], + "source": [ + "# Memory dump from GDB\n", + "# (gdb) x/512xb 0x00804000\n", + "memory_dump = \"\"\"\n", + "0x804000: 0x39 0x92 0x9a 0xfe 0x80 0xff 0xc0 0xee\n", + "0x804008: 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff\n", + "0x804010: 0x10 0x40 0x80 0x00 0xff 0xff 0xff 0xff\n", + "0x804018: 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff\n", + "0x804020: 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff\n", + "0x804028: 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff\n", + "0x804030: 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff\n", + "0x804038: 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff\n", + "\"\"\"" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "import struct\n", + "\n", + "DEFAULTS = {\n", + "\t'BOD33 Disable': 0x1,\n", + "\t'BOD33 Level': 0x1C,\n", + "\t'BOD33 Action': 0x1,\n", + "\t'BOD33 Hysteresis': 0x2,\n", + "\t'NVM BOOTPROT': 0xF,\n", + "\t'SBLK': 0x0,\n", + "\t'PSZ': 0x0,\n", + "\t'RAM ECCDIS': 0x1,\n", + "\t'WDT Enable': 0x0,\n", + "\t'WDT Always-On': 0x0,\n", + "\t'WDT Period': 0xB,\n", + "\t'WDT Window': 0xB,\n", + "\t'WDT EWOFFSET': 0xB,\n", + "\t'WDT WEN': 0x0,\n", + "\t'NVM LOCKS': 0xFFFFFFFF\n", + "}\n", + "\n", + "# def extract_bits(value, offset, mask):\n", + "# \treturn (value >> offset) & mask\n", + "\n", + "def extract_bits(value, start, end):\n", + "\tmask = (1 << (end - start + 1)) - 1\n", + "\treturn (value >> start) & mask\n", + "\n", + "\n", + "def decode_user_row(memory_dump):\n", + "\t# Extract only the hexadecimal values from the memory dump\n", + "\thex_values = ''.join(line.split(':')[1].strip().replace(' ', '') for line in memory_dump.strip().split('\\n'))\n", + "\thex_values = hex_values.replace('0x', '').replace('\\n', '')\n", + "\t\n", + "\t# Convert the cleaned hex string to bytes\n", + "\tmemory_bytes = bytes.fromhex(hex_values)\n", + "\t\n", + "\t# Convert bytes to 32-bit words\n", + "\t# words = struct.unpack('<8I', memory_bytes[:32])\n", + "\twords = struct.unpack('<8I', memory_bytes[:32])\n", + "\t\n", + "\tsettings = {\n", + "\t\t'BOD33 Disable': extract_bits(words[0], 0, 0),\n", + "\t\t'BOD33 Level': extract_bits(words[0], 1, 8),\n", + "\t\t'BOD33 Action': extract_bits(words[0], 9, 10),\n", + "\t\t'BOD33 Hysteresis': extract_bits(words[0], 11, 14),\n", + "\t\t'BOD12 Calibration': extract_bits(words[0], 15, 25),\n", + "\t\t'NVM BOOTPROT': extract_bits(words[0], 26, 29),\n", + "\t\t'SBLK': extract_bits(words[1], 0, 3),\n", + "\t\t'PSZ': extract_bits(words[1], 4, 6),\n", + "\t\t'RAM ECCDIS': extract_bits(words[1], 7, 7),\n", + "\t\t'WDT Enable': extract_bits(words[1], 16, 16),\n", + "\t\t'WDT Always-On': extract_bits(words[1], 17, 17),\n", + "\t\t'WDT Period': extract_bits(words[1], 18, 21),\n", + "\t\t'WDT Window': extract_bits(words[1], 22, 25),\n", + "\t\t'WDT EWOFFSET': extract_bits(words[1], 26, 29),\n", + "\t\t'WDT WEN': extract_bits(words[1], 30, 30),\n", + "\t\t'NVM LOCKS': words[2],\n", + "\t\t'User Page': words[3]\n", + "\t}\n", + "\treturn settings\n", + "\n", + "\n", + "\n", + "def display_user_row_settings(settings):\n", + "\tprint(\"SAME54 User Row Settings (Current vs Default):\")\n", + "\tprint(\"-\" * 50)\n", + "\tfor key, value in settings.items():\n", + "\t\tif key in DEFAULTS:\n", + "\t\t\tif value != DEFAULTS[key]:\n", + "\t\t\t\tprint(f\"{key:15}: 0x{value:X} (Default: 0x{DEFAULTS[key]:X}) *DIFFERENT*\")\n", + "\t\t\telse:\n", + "\t\t\t\tprint(f\"{key:15}: 0x{value:X} (Default: 0x{DEFAULTS[key]:X})\")\n", + "\t\telse:\n", + "\t\t\tprint(f\"{key:15}: 0x{value:X}\")\n", + "\n", + "\n", + "\n", + "# Decode the memory dump\n", + "decoded_settings = decode_user_row(memory_dump)\n", + "\n", + "# Display the formatted settings\n", + "display_user_row_settings(decoded_settings)\n" + ] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.12.3" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I588838d7c33be24636e00cec65c3b485a486f747 Gerrit-Change-Number: 39436 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[L] Change in osmo-asf4-dfu[master]: add fw update crcstub
by laforge 13 Mar '25

13 Mar '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39437?usp=email ) Change subject: add fw update crcstub ...................................................................... add fw update crcstub Adds a crc stub that lives in front of the dfu bl updater app and checks it. The whole process is somewhat complicated to ensure we end up not just with a firmware file that contains the right crc for the right offsets, but the elf file is updated as well, to ensure the result is debuggable as-is. The stub is built as part of the firmware code, and ends up in its own section. Linker script padding and alignment ensures that this works. Change-Id: I39eae7aaafd5531db6ce48837c9499432caadbed --- A crc_code.c A crc_params.c M gcc/Makefile M gcc/gcc/same54p20a_dfu.ld M gcc/gcc/same54p20a_flash.ld M gcc/gcc/startup_same54.c M usb_dfu_main.c M usb_flash_main.c M usb_start.c 9 files changed, 246 insertions(+), 104 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/crc_code.c b/crc_code.c new file mode 100644 index 0000000..a48229f --- /dev/null +++ b/crc_code.c @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2024 sysmocom -s.f.m.c. GmbH, Author: Eric Wild <ewild(a)sysmocom.de> + * + * 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. +*/ + +#include <stdint.h> +#ifndef HOST_TOOL +#include "atmel_start.h" + +#ifdef __clang__ +#define OPTNONE optnone +#else +#define OPTNONE optimize("O0") +#endif + +extern void _Reset_Handler(void); + +__attribute__((used, section(".crc_code"))) +#endif +static uint32_t +calculate_crc(const uint8_t *data, uint32_t length) +{ + uint32_t crc = 0xFFFFFFFF; + for (uint32_t i = 0; i < length; i++) { + crc ^= data[i]; + for (uint8_t j = 0; j < 8; j++) { + crc = (crc & 1) ? (crc >> 1) ^ 0xEDB88320 : crc >> 1; + } + } + return ~crc; +} + +#ifndef HOST_TOOL +__attribute__((used, section(".crc_code"), OPTNONE)) void Reset_Handler(void) +{ + extern uint32_t __CRC_Checksum; + extern uint32_t __CRC_Start; + extern uint32_t __CRC_End; + extern int main(void); + + /* + the old BL will unfortunately enable usb even when booting and not doing dfu.. + we must reset it here, or the host will get really unhappy trying to talk to the "attached" + dev and reset the bus... + */ + USB->DEVICE.CTRLA.reg = 0x1; + + uint32_t length = (uint32_t)&__CRC_End - (uint32_t)&__CRC_Start; + uint32_t calculated_crc = calculate_crc((uint8_t *)&__CRC_Start, length); + uint32_t expected_crc = *(uint32_t *)&__CRC_Checksum; + + if (calculated_crc != expected_crc) { + static volatile uint32_t *dfu_magic = (uint32_t *)HSRAM_ADDR; + *dfu_magic = 0x44465521; + + /* Reset the device if CRC does not match */ + __DSB(); + SCB->AIRCR = (uint32_t)((0x5FAUL << SCB_AIRCR_VECTKEY_Pos) | (SCB->AIRCR & SCB_AIRCR_PRIGROUP_Msk) | + SCB_AIRCR_SYSRESETREQ_Msk); + __DSB(); + } + + /* Proceed to main application */ + // main(); + _Reset_Handler(); + + /* Infinite loop if main returns */ + while (1) + ; +} +#endif + +#ifdef HOST_TOOL +#include <stdio.h> +#include <stdlib.h> + +/* Usage: ./tool <binary_file> <start_offset_hex> <length_hex> + - start_offset_hex and length_hex are hex values indicating where to calculate the CRC. +*/ +int main(int argc, char *argv[]) +{ + if (argc != 4) { + fprintf(stderr, "Usage: %s <binary_file> <start_offset_hex> <length_hex>\n", argv[0]); + return 1; + } + + const char *filename = argv[1]; + uint32_t start_offset = strtoul(argv[2], NULL, 10); + uint32_t length = strtoul(argv[3], NULL, 10); + + FILE *f = fopen(filename, "rb"); + if (!f) { + perror("fopen"); + return 1; + } + + // Seek to start_offset + if (fseek(f, (long)start_offset, SEEK_SET) != 0) { + perror("fseek"); + fclose(f); + return 1; + } + + uint8_t *buf = (uint8_t *)malloc(length); + if (!buf) { + fprintf(stderr, "Memory allocation error\n"); + fclose(f); + return 1; + } + + size_t read_bytes = fread(buf, 1, length, f); + fclose(f); + + if (read_bytes != length) { + fprintf(stderr, "Error reading file or not enough data\n"); + free(buf); + return 1; + } + + uint32_t crc = calculate_crc(buf, length); + free(buf); + + printf("%08X\n", crc); + return 0; +} +#endif diff --git a/crc_params.c b/crc_params.c new file mode 100644 index 0000000..032c71e --- /dev/null +++ b/crc_params.c @@ -0,0 +1,5 @@ +#include <stdint.h> + +__attribute__((used, section(".crc_par"))) const uint32_t __CRC_Checksum = 0xFFFFFFFF; /* Placeholder */ +// __attribute__((used, section(".crc_par"))) const uint32_t __CRC_Start = 0xFFFFFFFF; /* Placeholder */ +// __attribute__((used, section(".crc_par"))) const uint32_t __CRC_End = 0xFFFFFFFF; /* Placeholder */ diff --git a/gcc/Makefile b/gcc/Makefile index 2df931e..7813750 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -1,62 +1,18 @@ -################################################################################ -# User configuration. Can be edited -################################################################################ - -# Set for which board the bootloader should be compiled -# run `make clean` for the change to be effective # possible values: SAME54_XPLAINED_PRO, SYSMOOCTSIM +SHELL := /bin/bash BOARD ?= SYSMOOCTSIM +CROSSCC ?= arm-none-eabi- +SILENT ?= @ +ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) + +#DBGFLGS = -fdebug-prefix-map=..=$(readlink -f .) +DBGFLGS = -fdebug-prefix-map=..=$(ROOT_DIR)/.. -fno-omit-frame-pointer -ggdb3 -Os # -fdata-sections -fno-common -Wl,--no-undefined -Wl,--strip-discarded #-Wl,--gc-debuginfo GIT_VERSION=$(shell ../git-version-gen $(TOP)/.tarvers) +DBGFLGS += -DGIT_VERSION=\"$(GIT_VERSION)\" -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ +MK_DIR = mkdir -p -ifdef SystemRoot - SHELL = cmd.exe - MK_DIR = mkdir -else - ifeq ($(shell uname), Linux) - MK_DIR = mkdir -p - endif - - ifeq ($(shell uname | cut -d _ -f 1), CYGWIN) - MK_DIR = mkdir -p - endif - - ifeq ($(shell uname | cut -d _ -f 1), MINGW32) - MK_DIR = mkdir -p - endif - - ifeq ($(shell uname | cut -d _ -f 1), MINGW64) - MK_DIR = mkdir -p - endif -endif - -# List the subdirectories for creating object files -SUB_DIRS += \ - \ -hpl/pm \ -gcc \ -hpl/osc32kctrl \ -hpl/ramecc \ -hpl/dmac \ -usb/class/dfu/device \ -hal/src \ -hpl/mclk \ -usb \ -hal/utils/src \ -hpl/gclk \ -usb/device \ -hpl/oscctrl \ -gcc/gcc \ -hpl/nvmctrl \ -hpl/usb \ -hpl/core \ -hpl/cmcc - -# List the object files OBJS += \ hal/src/hal_io.o \ hpl/core/hpl_core_m4.o \ @@ -92,6 +48,18 @@ usb/device/usbdc.o \ hal/src/hal_atomic.o +SRC_hosttools = crc_code.c +SRC_dfu = usb_dfu_main.c crc_code.c crc_params.c +SRC_flash = usb_flash_main.c + +OBJ_dfu := $(SRC_dfu:.c=.o) +OBJ_flash := $(SRC_flash:.c=.o) + +DFU_DEPS := $(OBJ_dfu:.o=.d) +FLASH_DEPS := $(OBJ_flash:.o=.d) + + +SUB_DIRS := $(sort $(dir $(OBJS))) DEPS := $(OBJS:%.o=%.d) OBJS_AS_ARGS = $(patsubst %,"%",$(OBJS)) DEPS_AS_ARGS = $(patsubst %,"%",$(DEPS)) @@ -99,64 +67,81 @@ BOARD_LC := $(shell echo $(BOARD) | tr A-Z a-z) OUTPUT_FILE_NAME := bootloader-$(BOARD_LC)-$(GIT_VERSION) QUOTE := " -# OUTPUT_FILE_PATH +=$(OUTPUT_FILE_NAME).elf -#OUTPUT_FILE_PATH_AS_ARGS +=$(OUTPUT_FILE_NAME).elf -BLSIZE_DEF := -D$(QUOTE)$(shell sed 's/;//g' gcc/blsize.ld | tr -d ' ')$(QUOTE) - -# .PHONY MAIN_dfu MAIN_flash -# MAIN_%: -# = usb_dfu_main.o +BLSZ = $(shell sed 's/;//g' gcc/blsize.ld | tr -d ' ' | cut -d '=' -f2) +CALC_BLSZ = $(shell echo $$(( $(BLSZ) ))) +$(info blsize is $(CALC_BLSZ)) +BLSIZE_DEF := -D$(QUOTE)BL_SIZE_BYTE=$(CALC_BLSZ)$(QUOTE) vpath %.c ../ vpath %.s ../ vpath %.S ../ -.PHONY: clean-dfu clean-flash +.PHONY: clean-dfu clean-flash hosttools -all: $(SUB_DIRS) dfu-merge +all: $(SUB_DIRS) hosttools dfu-merge + +hosttools: + $(CC) -DHOST_TOOL ../$(SRC_hosttools) -o crctool dfu-merge: $(OUTPUT_FILE_NAME)-dfu $(OUTPUT_FILE_NAME)-dfu: $(OUTPUT_FILE_NAME)-flash -# Linker target - -$(OUTPUT_FILE_NAME)-%: $(OBJS) usb_%_main.o - @echo Building target: $@ +.SECONDEXPANSION: +$(OUTPUT_FILE_NAME)-%: $(OBJS) $$(OBJ_$$*) + @echo Building target: $@ $^ @echo Invoking: ARM/GNU Linker - $(QUOTE)arm-none-eabi-gcc$(QUOTE) -o $(OUTPUT_FILE_NAME)-$*.elf $(OBJS_AS_ARGS) "usb_$*_main.o" \ - -Wl,--no-undefined -Wl,--print-memory-usage -Wl,--strip-discarded -Wl,--start-group -lm -Wl,--end-group -mthumb \ + $(SILENT)$(QUOTE)$(CROSSCC)gcc$(QUOTE) -o $(OUTPUT_FILE_NAME)-$*.elf $(OBJS_AS_ARGS) $(OBJ_$*) \ + $(DBGFLGS) -Wl,--no-undefined -Wl,--print-memory-usage -Wl,--strip-discarded -Wl,--start-group -lm -Wl,--end-group -mthumb \ -Wl,-Map="$(OUTPUT_FILE_NAME)-$*.map" --specs=nano.specs -Wl,--gc-sections -mcpu=cortex-m4 \ -T"../gcc/gcc/same54p20a_$*.ld" \ -L"../gcc/gcc" @echo Finished building target: $@ - "arm-none-eabi-objcopy" -O binary "$(OUTPUT_FILE_NAME)-$*.elf" "$(OUTPUT_FILE_NAME)-$*.bin" -# "arm-none-eabi-objcopy" -O ihex -R .eeprom -R .fuse -R .lock -R .signature "$(OUTPUT_FILE_NAME)-$*.elf" "$(OUTPUT_FILE_NAME)-$*.hex" -# "arm-none-eabi-objcopy" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O binary "$(OUTPUT_FILE_NAME)-$*.elf" "$(OUTPUT_FILE_NAME)-$*.eep" || exit 0 - "arm-none-eabi-objdump" -h -S "$(OUTPUT_FILE_NAME)-$*.elf" > "$(OUTPUT_FILE_NAME)-$*.lss" - "arm-none-eabi-size" "$(OUTPUT_FILE_NAME)-$*.elf" - ln -sf $(OUTPUT_FILE_NAME)-$*.bin bootloader-$(BOARD_LC)-$*.bin - ln -sf $(OUTPUT_FILE_NAME)-$*.elf bootloader-$(BOARD_LC)-$*.elf + $(SILENT)"$(CROSSCC)objcopy" -O binary "$(OUTPUT_FILE_NAME)-$*.elf" "$(OUTPUT_FILE_NAME)-$*.bin" +# $(SILENT)"$(CROSSCC)objcopy" -O ihex -R .eeprom -R .fuse -R .lock -R .signature "$(OUTPUT_FILE_NAME)-$*.elf" "$(OUTPUT_FILE_NAME)-$*.hex" +# $(SILENT)"$(CROSSCC)objcopy" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O binary "$(OUTPUT_FILE_NAME)-$*.elf" "$(OUTPUT_FILE_NAME)-$*.eep" || exit 0 + $(SILENT)"$(CROSSCC)objdump" -h -S "$(OUTPUT_FILE_NAME)-$*.elf" > "$(OUTPUT_FILE_NAME)-$*.lss" + $(SILENT)"$(CROSSCC)size" "$(OUTPUT_FILE_NAME)-$*.elf" + $(SILENT)ln -sf $(OUTPUT_FILE_NAME)-$*.bin bootloader-$(BOARD_LC)-$*.bin + $(SILENT)ln -sf $(OUTPUT_FILE_NAME)-$*.elf bootloader-$(BOARD_LC)-$*.elf .PHONY: dfu-merge dfu-merge: $(info updating updater section with padded bootloader file..) - $(SILENT)dd if=/dev/zero bs=16384 count=1 of=dfu-flash-padded.bin - $(SILENT)dd if=$(OUTPUT_FILE_NAME)-flash.bin conv=notrunc of=dfu-flash-padded.bin - $(SILENT)"arm-none-eabi-objcopy" --update-section .blupdate=dfu-flash-padded.bin $(OUTPUT_FILE_NAME)-dfu.elf - $(SILENT)"arm-none-eabi-objcopy" -O binary $(OUTPUT_FILE_NAME)-dfu.elf $(OUTPUT_FILE_NAME)-dfu.bin - rm dfu-flash-padded.bin + #$(SILENT)dd status=none if=/dev/zero bs=$(CALC_BLSZ) count=1 of=dfu-flash-padded.bin + #$(SILENT)dd status=none if=$(OUTPUT_FILE_NAME)-flash.bin conv=notrunc of=dfu-flash-padded.bin + $(SILENT)cp -a $(OUTPUT_FILE_NAME)-flash.bin dfu-flash-padded.bin + $(SILENT)truncate -s $(CALC_BLSZ) dfu-flash-padded.bin + $(SILENT)"$(CROSSCC)objcopy" --update-section .blupdate=dfu-flash-padded.bin $(OUTPUT_FILE_NAME)-dfu.elf + $(SILENT)"$(CROSSCC)objcopy" -O binary $(OUTPUT_FILE_NAME)-dfu.elf $(OUTPUT_FILE_NAME)-dfu.bin + $(SILENT)rm dfu-flash-padded.bin + + @FLASH_START_ADDR=0x$$($(CROSSCC)nm $(OUTPUT_FILE_NAME)-dfu.elf | grep ' _sfixed$$' | cut -d' ' -f1); \ + CRC_START_ADDR=0x$$($(CROSSCC)nm $(OUTPUT_FILE_NAME)-dfu.elf | grep ' __CRC_Start$$' | cut -d' ' -f1); \ + CRC_END_ADDR=0x$$($(CROSSCC)nm $(OUTPUT_FILE_NAME)-dfu.elf | grep ' _etext$$' | cut -d' ' -f1); \ + CRC_CHECKSUM_ADDR=0x$$($(CROSSCC)nm $(OUTPUT_FILE_NAME)-dfu.elf | grep ' __CRC_Checksum$$' | cut -d' ' -f1); \ + echo $$CRC_START_ADDR $$CRC_END_ADDR $$CRC_CHECKSUM_ADDR; \ + CRC_START_OFFSET=$$(($$CRC_START_ADDR - $$FLASH_START_ADDR)); \ + CRC_END_OFFSET=$$(($$CRC_END_ADDR - $$FLASH_START_ADDR)); \ + CRC_CHECKSUM_OFFSET=$$(($$CRC_CHECKSUM_ADDR - $$FLASH_START_ADDR)); \ + LENGTH=$$(($$CRC_END_OFFSET - $$CRC_START_OFFSET)); \ + CRC_HEX=$$(./crctool $(OUTPUT_FILE_NAME)-dfu.bin $$CRC_START_OFFSET $$LENGTH ); \ + echo len $$LENGTH : $$CRC_START_OFFSET-$$CRC_END_OFFSET, crco: $$CRC_CHECKSUM_OFFSET, start: $$CRC_START_ADDR crcval: $$CRC_HEX; \ + [ $$(($$CRC_START_OFFSET - $$CRC_CHECKSUM_OFFSET)) -ne 4 ] && exit 1; \ + printf $$CRC_HEX | xxd -r -p | xxd -e | xxd -r | dd of=$(OUTPUT_FILE_NAME)-dfu.bin bs=1 seek=$$CRC_CHECKSUM_OFFSET conv=notrunc 2>/dev/null; \ + xxd -s $$(($$CRC_START_ADDR - $$FLASH_START_ADDR -4)) -l 4 -g 1 $(OUTPUT_FILE_NAME)-dfu.bin; \ + "$(CROSSCC)objcopy" -O binary --only-section=.text $(OUTPUT_FILE_NAME)-dfu.elf section_text.bin; \ + printf $$CRC_HEX | xxd -r -p | xxd -e | xxd -r | dd of=section_text.bin bs=1 seek=$$CRC_CHECKSUM_OFFSET conv=notrunc 2>/dev/null; \ + xxd -s $$(($$CRC_START_ADDR - $$FLASH_START_ADDR -4)) -l 4 -g 1 section_text.bin; \ + "$(CROSSCC)objcopy" --update-section .text=section_text.bin $(OUTPUT_FILE_NAME)-dfu.elf; + # Compiler targets - - - - %.o: %.c @echo Building file: $< @echo ARM/GNU C Compiler - $(QUOTE)arm-none-eabi-gcc$(QUOTE) -x c -mthumb -DDEBUG -Os -ffunction-sections -mlong-calls -g3 -Wall -c -std=gnu99 \ + $(QUOTE)$(CROSSCC)gcc$(QUOTE) $(DBGFLGS) -x c -Wstringop-truncation -Wformat-truncation -mthumb -DDEBUG -ffunction-sections -mlong-calls -Wall -c -std=gnu99 \ $(BLSIZE_DEF) -D__SAME54P19A__ -D$(BOARD) -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 \ -I"../" -I"../config" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -I"../hpl/nvmctrl" -I"../hpl/osc32kctrl" -I"../hpl/oscctrl" -I"../hpl/pm" -I"../hpl/port" -I"../hpl/ramecc" -I"../hpl/usb" -I"../hri" -I"../" -I"../config" -I"../usb" -I"../usb/class/dfu" -I"../usb/class/dfu/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" @@ -165,7 +150,7 @@ %.o: %.s @echo Building file: $< @echo ARM/GNU Assembler - $(QUOTE)arm-none-eabi-as$(QUOTE) -x c -mthumb -DDEBUG -Os -ffunction-sections -mlong-calls -g3 -Wall -c -std=gnu99 \ + $(QUOTE)$(CROSSCC)as$(QUOTE) $(DBGFLGS) -x c -mthumb -DDEBUG -ffunction-sections -mlong-calls -Wall -c -std=gnu99 \ $(BLSIZE_DEF) -D__SAME54P19A__ -D$(BOARD) -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 \ -I"../" -I"../config" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -I"../hpl/nvmctrl" -I"../hpl/osc32kctrl" -I"../hpl/oscctrl" -I"../hpl/pm" -I"../hpl/port" -I"../hpl/ramecc" -I"../hpl/usb" -I"../hri" -I"../" -I"../config" -I"../usb" -I"../usb/class/dfu" -I"../usb/class/dfu/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" @@ -174,7 +159,7 @@ %.o: %.S @echo Building file: $< @echo ARM/GNU Preprocessing Assembler - $(QUOTE)arm-none-eabi-gcc$(QUOTE) -x c -mthumb -DDEBUG -Os -ffunction-sections -mlong-calls -g3 -Wall -c -std=gnu99 \ + $(QUOTE)$(CROSSCC)gcc$(QUOTE) $(DBGFLGS) -x c -mthumb -DDEBUG -ffunction-sections -mlong-calls -Wall -c -std=gnu99 \ $(BLSIZE_DEF) -D__SAME54P19A__ -D$(BOARD) -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 \ -I"../" -I"../config" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -I"../hpl/nvmctrl" -I"../hpl/osc32kctrl" -I"../hpl/oscctrl" -I"../hpl/pm" -I"../hpl/port" -I"../hpl/ramecc" -I"../hpl/usb" -I"../hri" -I"../" -I"../config" -I"../usb" -I"../usb/class/dfu" -I"../usb/class/dfu/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" @@ -184,7 +169,8 @@ ifneq ($(MAKECMDGOALS),clean) ifneq ($(strip $(DEPS)),) -include $(DEPS) --include usb_flash_main.d usb_dfu_main.d +-include $(DFU_DEPS) +-include $(FLASH_DEPS) endif endif @@ -192,20 +178,13 @@ $(MK_DIR) "$@" clean-%: - rm -f $(OBJS_AS_ARGS) - # rm -f $(OUTPUT_FILE_PATH) - rm -f $(DEPS_AS_ARGS) rm -f $(OUTPUT_FILE_NAME)-$*.a $(OUTPUT_FILE_NAME)-$*.hex $(OUTPUT_FILE_NAME)-$*.bin \ $(OUTPUT_FILE_NAME)-$*.lss $(OUTPUT_FILE_NAME)-$*.eep $(OUTPUT_FILE_NAME)-$*.map \ $(OUTPUT_FILE_NAME)-$*.srec bootloader-$(BOARD_LC)-$*.bin bootloader-$(BOARD_LC)-$*.elf clean: clean-dfu clean-flash rm -f $(OBJS_AS_ARGS) - # rm -f $(OUTPUT_FILE_PATH) rm -f $(DEPS_AS_ARGS) - # rm -f $(OUTPUT_FILE_NAME).a $(OUTPUT_FILE_NAME).hex $(OUTPUT_FILE_NAME).bin \ - # $(OUTPUT_FILE_NAME).lss $(OUTPUT_FILE_NAME).eep $(OUTPUT_FILE_NAME).map \ - # $(OUTPUT_FILE_NAME).srec bootloader-$(BOARD_LC).bin bootloader-$(BOARD_LC).elf mrproper: clean rm -f *.o *.d *.a *.elf *.bin *.hex *.ihex *.eep *.lss *.map *.srec diff --git a/gcc/gcc/same54p20a_dfu.ld b/gcc/gcc/same54p20a_dfu.ld index 532e32a..17642a2 100644 --- a/gcc/gcc/same54p20a_dfu.ld +++ b/gcc/gcc/same54p20a_dfu.ld @@ -54,6 +54,10 @@ . = ALIGN(4); _sfixed = .; KEEP(*(.vectors .vectors.*)) + KEEP(*(.crc_code)) /* CRC checking code */ + KEEP(*(.crc_par)) /* CRC parameters */ + . = ALIGN(4); + __CRC_Start = ORIGIN(rom) + .; *(.text .text.* .gnu.linkonce.t.*) *(.glue_7t) *(.glue_7) *(.rodata .rodata* .gnu.linkonce.r.*) @@ -96,14 +100,14 @@ . = ALIGN(4); _efixed = .; /* End of text section */ - } > rom + } > rom = 0xff /* .ARM.exidx is sorted, so has to go in its own output section. */ PROVIDE_HIDDEN (__exidx_start = .); .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } > rom + } > rom = 0xff PROVIDE_HIDDEN (__exidx_end = .); .blupdate : @@ -112,10 +116,11 @@ _blupdate_start = .; KEEP(*(.fwupdate .fwupdate.*)); _blupdate_end = .; - } > rom + } > rom = 0xff . = ALIGN(4); _etext = .; + __CRC_End = .; .relocate : AT (_etext) { diff --git a/gcc/gcc/same54p20a_flash.ld b/gcc/gcc/same54p20a_flash.ld index f2c5124..a3d94a5 100644 --- a/gcc/gcc/same54p20a_flash.ld +++ b/gcc/gcc/same54p20a_flash.ld @@ -96,14 +96,14 @@ . = ALIGN(4); _efixed = .; /* End of text section */ - } > rom + } > rom = 0xff /* .ARM.exidx is sorted, so has to go in its own output section. */ PROVIDE_HIDDEN (__exidx_start = .); .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } > rom + } > rom = 0xff PROVIDE_HIDDEN (__exidx_end = .); . = ALIGN(4); @@ -162,4 +162,11 @@ . = ALIGN(4); _end = . ; + + /DISCARD/ : + { + *(.crc_code*) + *(.crc_par*) + } + } diff --git a/gcc/gcc/startup_same54.c b/gcc/gcc/startup_same54.c index 3bdd4c4..710efe8 100644 --- a/gcc/gcc/startup_same54.c +++ b/gcc/gcc/startup_same54.c @@ -668,7 +668,7 @@ ; } -__attribute__((naked,noreturn)) void Reset_Handler(void) +__attribute__((naked, noreturn, weak)) void Reset_Handler(void) { // errata 2.6.10, do not remove this, ever. // WDT->CTRLA.reg = 0; diff --git a/usb_dfu_main.c b/usb_dfu_main.c index a5b2343..dca428f 100644 --- a/usb_dfu_main.c +++ b/usb_dfu_main.c @@ -25,7 +25,7 @@ #ifdef __clang__ #define OPTNONE optnone #else -#define OPTNONE optimize(0) +#define OPTNONE optimize("O0") #endif #define BLSZ_BYTE (BL_SIZE_BYTE) diff --git a/usb_flash_main.c b/usb_flash_main.c index 19d447a..c78c55c 100644 --- a/usb_flash_main.c +++ b/usb_flash_main.c @@ -20,6 +20,7 @@ */ #include <errno.h> +#include <stdio.h> #include "atmel_start.h" #include "atmel_start_pins.h" #include "hpl_user_area.h" @@ -121,8 +122,9 @@ } char sernr_buf[16 * 2 + 1]; -//unicode for descriptor -uint8_t sernr_buf_descr[1 + 1 + 16 * 2 * 2]; +char product_buf[] = "sysmoOCTSIM DFU-" GIT_VERSION; +uint8_t __attribute__((aligned(16))) sernr_buf_descr[1 + 1 + 16 * 2 * 2]; +uint8_t __attribute__((aligned(16))) product_buf_descr[1 + 1 + (sizeof(product_buf) - 1) * 2]; #endif int main(void) @@ -131,6 +133,7 @@ #if defined(SYSMOOCTSIM) get_chip_unique_serial_str(sernr_buf, sizeof(sernr_buf)); str_to_usb_desc(sernr_buf, sizeof(sernr_buf), sernr_buf_descr, sizeof(sernr_buf_descr)); + str_to_usb_desc(product_buf, sizeof(product_buf) - 1, product_buf_descr, sizeof(product_buf_descr)); #endif // errata 2.6.10, do not remove this, ever. diff --git a/usb_start.c b/usb_start.c index 16b163d..47e287f 100644 --- a/usb_start.c +++ b/usb_start.c @@ -72,6 +72,8 @@ } extern uint8_t sernr_buf_descr[]; +extern uint8_t product_buf_descr[]; + /* call-back for every control EP request */ static int32_t string_req_cb(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) { @@ -101,6 +103,8 @@ switch (index) { case CONF_USB_DFUD_ISERIALNUM: return send_str_desc(ep, req, stage, sernr_buf_descr); + case CONF_USB_DFUD_IPRODUCT: + return send_str_desc(ep, req, stage, product_buf_descr); default: return ERR_NOT_FOUND; } -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39437?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I39eae7aaafd5531db6ce48837c9499432caadbed Gerrit-Change-Number: 39437 Gerrit-PatchSet: 13 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in osmo-asf4-dfu[master]: gitgnore
by laforge 13 Mar '25

13 Mar '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39431?usp=email ) Change subject: gitgnore ...................................................................... gitgnore Change-Id: I95af162a01fb35656e0f9ccc9ce46b59a15c8c34 --- M .gitignore 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index ad0fce7..912ad53 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,8 @@ *.map .gdb_history NOTES +gcc/.cache/* +gcc/crctool +install/* +**/compile_commands.json +.cache/* \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39431?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I95af162a01fb35656e0f9ccc9ce46b59a15c8c34 Gerrit-Change-Number: 39431 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-asf4-dfu[master]: tame the linter
by laforge 13 Mar '25

13 Mar '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39439?usp=email ) Change subject: tame the linter ...................................................................... tame the linter Change-Id: I745b741dedf2c2ed5679c289e70adcb01c750e4d --- A .checkpatch.conf 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.checkpatch.conf b/.checkpatch.conf new file mode 100644 index 0000000..b97ab25 --- /dev/null +++ b/.checkpatch.conf @@ -0,0 +1,17 @@ +--exclude gcc/gcc/.*ld +--exclude CMSIS +--exclude hpl +--exclude hal + +--ignore BRACES_NOT_NECESSARY +--ignore OPEN_BRACE +--ignore FSF_MAILING_ADDRESS +--ignore DOS_LINE_ENDINGS +--ignore FUNCTION_WITHOUT_ARGS +--ignore TRAILING_WHITESPACE +--ignore CODE_INDENT +--ignore SPACING +--ignore POINTER_LOCATION +--ignore INLINE_LOCATION +--ignore LEADING_SPACE +--ignore SUSPECT_CODE_INDENT -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39439?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I745b741dedf2c2ed5679c289e70adcb01c750e4d Gerrit-Change-Number: 39439 Gerrit-PatchSet: 9 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-asf4-dfu[master]: linker scripts: add bl size, fix ram size to 19a part
by laforge 13 Mar '25

13 Mar '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39433?usp=email ) Change subject: linker scripts: add bl size, fix ram size to 19a part ...................................................................... linker scripts: add bl size, fix ram size to 19a part Change-Id: Ic2da201b8f95855d05e15ac6ac8461e434593760 --- A gcc/gcc/blsize.ld A gcc/gcc/same54p20a_dfu.ld M gcc/gcc/same54p20a_flash.ld M gcc/gcc/same54p20a_sram.ld 4 files changed, 178 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gcc/gcc/blsize.ld b/gcc/gcc/blsize.ld new file mode 100644 index 0000000..2ef3633 --- /dev/null +++ b/gcc/gcc/blsize.ld @@ -0,0 +1 @@ +BL_SIZE_BYTE = 8192 * 2; \ No newline at end of file diff --git a/gcc/gcc/same54p20a_dfu.ld b/gcc/gcc/same54p20a_dfu.ld new file mode 100644 index 0000000..532e32a --- /dev/null +++ b/gcc/gcc/same54p20a_dfu.ld @@ -0,0 +1,173 @@ +/** + * \file + * + * \brief Linker script for running in internal FLASH on the SAME54P20A + * + * Copyright (c) 2018 Microchip Technology Inc. + * + * \asf_license_start + * + * \page License + * + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the Licence at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * \asf_license_stop + * + */ + +INCLUDE blsize.ld + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +SEARCH_DIR(.) + +/* Memory Spaces Definitions */ +MEMORY +{ + rom (rx) : ORIGIN = 0x00000000 + BL_SIZE_BYTE, LENGTH = 0x00080000 - BL_SIZE_BYTE + /* The first word of the RAM is used for the DFU magic */ + ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 0x00030000 - 4 + bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 + qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 +} + +/* The stack size used by the application. NOTE: you need to adjust according to your application. */ +STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x10000; + +/* Section Definitions */ +SECTIONS +{ + .text : + { + . = ALIGN(4); + _sfixed = .; + KEEP(*(.vectors .vectors.*)) + *(.text .text.* .gnu.linkonce.t.*) + *(.glue_7t) *(.glue_7) + *(.rodata .rodata* .gnu.linkonce.r.*) + *(.ARM.extab* .gnu.linkonce.armextab.*) + + /* Support C constructors, and C destructors in both user code + and the C library. This also provides support for C++ code. */ + . = ALIGN(4); + KEEP(*(.init)) + . = ALIGN(4); + __preinit_array_start = .; + KEEP (*(.preinit_array)) + __preinit_array_end = .; + + . = ALIGN(4); + __init_array_start = .; + KEEP (*(SORT(.init_array.*))) + KEEP (*(.init_array)) + __init_array_end = .; + + . = ALIGN(4); + KEEP (*crtbegin.o(.ctors)) + KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) + KEEP (*(SORT(.ctors.*))) + KEEP (*crtend.o(.ctors)) + + . = ALIGN(4); + KEEP(*(.fini)) + + . = ALIGN(4); + __fini_array_start = .; + KEEP (*(.fini_array)) + KEEP (*(SORT(.fini_array.*))) + __fini_array_end = .; + + KEEP (*crtbegin.o(.dtors)) + KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) + KEEP (*(SORT(.dtors.*))) + KEEP (*crtend.o(.dtors)) + + . = ALIGN(4); + _efixed = .; /* End of text section */ + } > rom + + /* .ARM.exidx is sorted, so has to go in its own output section. */ + PROVIDE_HIDDEN (__exidx_start = .); + .ARM.exidx : + { + *(.ARM.exidx* .gnu.linkonce.armexidx.*) + } > rom + PROVIDE_HIDDEN (__exidx_end = .); + + .blupdate : + { + . = ALIGN(4); + _blupdate_start = .; + KEEP(*(.fwupdate .fwupdate.*)); + _blupdate_end = .; + } > rom + + . = ALIGN(4); + _etext = .; + + .relocate : AT (_etext) + { + . = ALIGN(4); + _srelocate = .; + *(.ramfunc .ramfunc.*); + *(.data .data.*); + . = ALIGN(4); + _erelocate = .; + } > ram + + .bkupram (NOLOAD): + { + . = ALIGN(8); + _sbkupram = .; + *(.bkupram .bkupram.*); + . = ALIGN(8); + _ebkupram = .; + } > bkupram + + .qspi (NOLOAD): + { + . = ALIGN(8); + _sqspi = .; + *(.qspi .qspi.*); + . = ALIGN(8); + _eqspi = .; + } > qspi + + /* .bss section which is used for uninitialized data */ + .bss (NOLOAD) : + { + . = ALIGN(4); + _sbss = . ; + _szero = .; + *(.bss .bss.*) + *(COMMON) + . = ALIGN(4); + _ebss = . ; + _ezero = .; + } > ram + + /* stack section */ + .stack (NOLOAD): + { + . = ALIGN(8); + _sstack = .; + . = . + STACK_SIZE; + . = ALIGN(8); + _estack = .; + } > ram + + . = ALIGN(4); + _end = . ; +} diff --git a/gcc/gcc/same54p20a_flash.ld b/gcc/gcc/same54p20a_flash.ld index 6aa3fb1..f2c5124 100644 --- a/gcc/gcc/same54p20a_flash.ld +++ b/gcc/gcc/same54p20a_flash.ld @@ -27,6 +27,7 @@ * */ +INCLUDE blsize.ld OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) @@ -35,9 +36,9 @@ /* Memory Spaces Definitions */ MEMORY { - rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00100000 + rom (rx) : ORIGIN = 0x00000000, LENGTH = BL_SIZE_BYTE /* The first word of the RAM is used for the DFU magic */ - ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 0x00040000 - 4 + ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 0x00030000 - 4 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 } diff --git a/gcc/gcc/same54p20a_sram.ld b/gcc/gcc/same54p20a_sram.ld index b3be5b3..5cf354c 100644 --- a/gcc/gcc/same54p20a_sram.ld +++ b/gcc/gcc/same54p20a_sram.ld @@ -35,7 +35,7 @@ /* Memory Spaces Definitions */ MEMORY { - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000 + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 } -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39433?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: Ic2da201b8f95855d05e15ac6ac8461e434593760 Gerrit-Change-Number: 39433 Gerrit-PatchSet: 10 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

2026

2025

2024

2023

2022

gerrit-log