diff options
Diffstat (limited to 'board/servo_micro')
| -rw-r--r-- | board/servo_micro/board.c | 450 | ||||
| -rw-r--r-- | board/servo_micro/board.h | 134 | ||||
| -rw-r--r-- | board/servo_micro/build.mk | 13 | ||||
| -rw-r--r-- | board/servo_micro/ccd.md | 168 | ||||
| -rw-r--r-- | board/servo_micro/ec.tasklist | 11 | ||||
| -rw-r--r-- | board/servo_micro/gpio.inc | 75 | ||||
| -rw-r--r-- | board/servo_micro/servo_micro.png | bin | 33724 -> 0 bytes | |||
| -rw-r--r-- | board/servo_micro/servo_micro_sch_20180404.pdf | bin | 123116 -> 0 bytes |
8 files changed, 0 insertions, 851 deletions
diff --git a/board/servo_micro/board.c b/board/servo_micro/board.c deleted file mode 100644 index 8074ba38ab..0000000000 --- a/board/servo_micro/board.c +++ /dev/null @@ -1,450 +0,0 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ -/* Servo micro board configuration */ - -#include "common.h" -#include "console.h" -#include "ec_version.h" -#include "gpio.h" -#include "hooks.h" -#include "i2c.h" -#include "i2c_ite_flash_support.h" -#include "queue_policies.h" -#include "registers.h" -#include "spi.h" -#include "system.h" -#include "task.h" -#include "timer.h" -#include "update_fw.h" -#include "usart-stm32f0.h" -#include "usart_tx_dma.h" -#include "usart_rx_dma.h" -#include "usb_hw.h" -#include "usb_i2c.h" -#include "usb_spi.h" -#include "usb-stream.h" -#include "util.h" - -#include "gpio_list.h" - -void board_config_pre_init(void) -{ - /* enable SYSCFG clock */ - STM32_RCC_APB2ENR |= STM32_RCC_SYSCFGEN; - - /* - * the DMA mapping is : - * Chan 3 : USART3_RX - * Chan 5 : USART2_RX - * Chan 6 : USART4_RX (Disable) - * Chan 6 : SPI2_RX - * Chan 7 : SPI2_TX - * - * i2c : no dma - * tim16/17: no dma - */ - STM32_SYSCFG_CFGR1 |= BIT(26); /* Remap USART3 RX/TX DMA */ - - /* Remap SPI2 to DMA channels 6 and 7 */ - /* STM32F072 SPI2 defaults to using DMA channels 4 and 5 */ - /* but cros_ec hardcodes a 6/7 assumption in registers.h */ - STM32_SYSCFG_CFGR1 |= BIT(24); - -} - -/****************************************************************************** - * Forward UARTs as a USB serial interface. - */ - -#define USB_STREAM_RX_SIZE 32 -#define USB_STREAM_TX_SIZE 64 - -/****************************************************************************** - * Forward USART2 (EC) as a simple USB serial interface. - */ - -static struct usart_config const usart2; -struct usb_stream_config const usart2_usb; - -static struct queue const usart2_to_usb = QUEUE_DIRECT(1024, uint8_t, - usart2.producer, usart2_usb.consumer); -static struct queue const usb_to_usart2 = QUEUE_DIRECT(64, uint8_t, - usart2_usb.producer, usart2.consumer); - -static struct usart_rx_dma const usart2_rx_dma = - USART_RX_DMA(STM32_DMAC_CH5, 32); - -static struct usart_config const usart2 = - USART_CONFIG(usart2_hw, - usart2_rx_dma.usart_rx, - usart_tx_interrupt, - 115200, - 0, - usart2_to_usb, - usb_to_usart2); - -USB_STREAM_CONFIG_USART_IFACE(usart2_usb, - USB_IFACE_USART2_STREAM, - USB_STR_USART2_STREAM_NAME, - USB_EP_USART2_STREAM, - USB_STREAM_RX_SIZE, - USB_STREAM_TX_SIZE, - usb_to_usart2, - usart2_to_usb, - usart2) - - -/****************************************************************************** - * Forward USART3 (CPU) as a simple USB serial interface. - */ - -static struct usart_config const usart3; -struct usb_stream_config const usart3_usb; - -static struct queue const usart3_to_usb = QUEUE_DIRECT(1024, uint8_t, - usart3.producer, usart3_usb.consumer); -static struct queue const usb_to_usart3 = QUEUE_DIRECT(64, uint8_t, - usart3_usb.producer, usart3.consumer); - -static struct usart_rx_dma const usart3_rx_dma = - USART_RX_DMA(STM32_DMAC_CH3, 32); - -static struct usart_config const usart3 = - USART_CONFIG(usart3_hw, - usart3_rx_dma.usart_rx, - usart_tx_interrupt, - 115200, - 0, - usart3_to_usb, - usb_to_usart3); - -USB_STREAM_CONFIG_USART_IFACE(usart3_usb, - USB_IFACE_USART3_STREAM, - USB_STR_USART3_STREAM_NAME, - USB_EP_USART3_STREAM, - USB_STREAM_RX_SIZE, - USB_STREAM_TX_SIZE, - usb_to_usart3, - usart3_to_usb, - usart3) - - -/****************************************************************************** - * Forward USART4 (cr50) as a simple USB serial interface. - * We cannot enable DMA due to lack of DMA channels. - */ - -static struct usart_config const usart4; -struct usb_stream_config const usart4_usb; - -static struct queue const usart4_to_usb = QUEUE_DIRECT(64, uint8_t, - usart4.producer, usart4_usb.consumer); -static struct queue const usb_to_usart4 = QUEUE_DIRECT(64, uint8_t, - usart4_usb.producer, usart4.consumer); - -static struct usart_config const usart4 = - USART_CONFIG(usart4_hw, - usart_rx_interrupt, - usart_tx_interrupt, - 115200, - 0, - usart4_to_usb, - usb_to_usart4); - -USB_STREAM_CONFIG_USART_IFACE(usart4_usb, - USB_IFACE_USART4_STREAM, - USB_STR_USART4_STREAM_NAME, - USB_EP_USART4_STREAM, - USB_STREAM_RX_SIZE, - USB_STREAM_TX_SIZE, - usb_to_usart4, - usart4_to_usb, - usart4) - -/****************************************************************************** - * Check parity setting on usarts. - */ -static int command_uart_parity(int argc, char **argv) -{ - int parity = 0, newparity; - struct usart_config const *usart; - char *e; - - if ((argc < 2) || (argc > 3)) - return EC_ERROR_PARAM_COUNT; - - if (!strcasecmp(argv[1], "usart2")) - usart = &usart2; - else if (!strcasecmp(argv[1], "usart3")) - usart = &usart3; - else if (!strcasecmp(argv[1], "usart4")) - usart = &usart4; - else - return EC_ERROR_PARAM1; - - if (argc == 3) { - parity = strtoi(argv[2], &e, 0); - if (*e || (parity < 0) || (parity > 2)) - return EC_ERROR_PARAM2; - - usart_set_parity(usart, parity); - } - - newparity = usart_get_parity(usart); - ccprintf("Parity on %s is %d.\n", argv[1], newparity); - - if ((argc == 3) && (newparity != parity)) - return EC_ERROR_UNKNOWN; - - return EC_SUCCESS; -} -DECLARE_CONSOLE_COMMAND(parity, command_uart_parity, - "usart[2|3|4] [0|1|2]", - "Set parity on uart"); - -/****************************************************************************** - * Set baud rate setting on usarts. - */ -static int command_uart_baud(int argc, char **argv) -{ - int baud = 0; - struct usart_config const *usart; - char *e; - - if ((argc < 2) || (argc > 3)) - return EC_ERROR_PARAM_COUNT; - - if (!strcasecmp(argv[1], "usart2")) - usart = &usart2; - else if (!strcasecmp(argv[1], "usart3")) - usart = &usart3; - else if (!strcasecmp(argv[1], "usart4")) - usart = &usart4; - else - return EC_ERROR_PARAM1; - - baud = strtoi(argv[2], &e, 0); - if (*e || baud < 0) - return EC_ERROR_PARAM2; - - usart_set_baud(usart, baud); - - return EC_SUCCESS; -} -DECLARE_CONSOLE_COMMAND(baud, command_uart_baud, - "usart[2|3|4] rate", - "Set baud rate on uart"); - -/****************************************************************************** - * Hold the usart pins low while disabling it, or return it to normal. - */ -static int command_hold_usart_low(int argc, char **argv) -{ - /* Each bit represents if that port rx is being held low */ - static int usart_status; - - int usart_mask; - enum gpio_signal rx; - - if (argc > 3 || argc < 2) - return EC_ERROR_PARAM_COUNT; - - if (!strcasecmp(argv[1], "usart2")) { - usart_mask = 1 << 2; - rx = GPIO_USART2_SERVO_RX_DUT_TX; - } else if (!strcasecmp(argv[1], "usart3")) { - usart_mask = 1 << 3; - rx = GPIO_USART3_SERVO_RX_DUT_TX; - } else if (!strcasecmp(argv[1], "usart4")) { - usart_mask = 1 << 4; - rx = GPIO_USART4_SERVO_RX_DUT_TX; - } else { - return EC_ERROR_PARAM1; - } - - /* Updating the status of this port */ - if (argc == 3) { - char *e; - const int hold_low = strtoi(argv[2], &e, 0); - - if (*e || (hold_low < 0) || (hold_low > 1)) - return EC_ERROR_PARAM2; - - if (!!(usart_status & usart_mask) == hold_low) { - /* Do nothing since there is no change */ - } else if (hold_low) { - /* - * No need to shutdown UART, just de-mux the RX pin from - * UART and change it to a GPIO temporarily. - */ - gpio_config_pin(MODULE_USART, rx, 0); - gpio_set_flags(rx, GPIO_OUT_LOW); - - /* Update global uart state */ - usart_status |= usart_mask; - } else { - /* - * Mux the RX pin back to GPIO mode - */ - gpio_config_pin(MODULE_USART, rx, 1); - - /* Update global uart state */ - usart_status &= ~usart_mask; - } - } - - /* Print status for get and set case. */ - ccprintf("USART status: %s\n", - usart_status & usart_mask ? "held low" : "normal"); - - return EC_SUCCESS; -} -DECLARE_CONSOLE_COMMAND(hold_usart_low, command_hold_usart_low, - "usart[2|3|4] [0|1]?", - "Get/set the hold-low state for usart port"); - -/****************************************************************************** - * Define the strings used in our USB descriptors. - */ -const void *const usb_strings[] = { - [USB_STR_DESC] = usb_string_desc, - [USB_STR_VENDOR] = USB_STRING_DESC("Google Inc."), - [USB_STR_PRODUCT] = USB_STRING_DESC("Servo Micro"), - [USB_STR_SERIALNO] = 0, - [USB_STR_VERSION] = USB_STRING_DESC(CROS_EC_VERSION32), - [USB_STR_I2C_NAME] = USB_STRING_DESC("I2C"), - [USB_STR_USART4_STREAM_NAME] = USB_STRING_DESC("UART3"), - [USB_STR_CONSOLE_NAME] = USB_STRING_DESC("Servo Shell"), - [USB_STR_USART3_STREAM_NAME] = USB_STRING_DESC("CPU"), - [USB_STR_USART2_STREAM_NAME] = USB_STRING_DESC("EC"), - [USB_STR_UPDATE_NAME] = USB_STRING_DESC("Firmware update"), -}; - -BUILD_ASSERT(ARRAY_SIZE(usb_strings) == USB_STR_COUNT); - -/****************************************************************************** - * Support SPI bridging over USB, this requires usb_spi_board_enable and - * usb_spi_board_disable to be defined to enable and disable the SPI bridge. - */ - -/* SPI devices */ -const struct spi_device_t spi_devices[] = { - { CONFIG_SPI_FLASH_PORT, 1, GPIO_SPI_CS}, -}; -const unsigned int spi_devices_used = ARRAY_SIZE(spi_devices); - -void usb_spi_board_enable(struct usb_spi_config const *config) -{ - /* Configure SPI GPIOs */ - gpio_config_module(MODULE_SPI_FLASH, 1); - - /* Set all four SPI pins to high speed */ - STM32_GPIO_OSPEEDR(GPIO_B) |= 0xff000000; - - /* Enable clocks to SPI2 module */ - STM32_RCC_APB1ENR |= STM32_RCC_PB1_SPI2; - - /* Reset SPI2 */ - STM32_RCC_APB1RSTR |= STM32_RCC_PB1_SPI2; - STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; - - spi_enable(&spi_devices[0], 1); -} - -void usb_spi_board_disable(struct usb_spi_config const *config) -{ - spi_enable(&spi_devices[0], 0); - - /* Disable clocks to SPI2 module */ - STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; - - /* Release SPI GPIOs */ - gpio_config_module(MODULE_SPI_FLASH, 0); -} - -USB_SPI_CONFIG(usb_spi, USB_IFACE_SPI, USB_EP_SPI, 0); - -/****************************************************************************** - * Support I2C bridging over USB. - */ - -/* I2C ports */ -const struct i2c_port_t i2c_ports[] = { - {"master", I2C_PORT_MASTER, 100, - GPIO_MASTER_I2C_SCL, GPIO_MASTER_I2C_SDA}, -}; -const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); - -int usb_i2c_board_is_enabled(void) { return 1; } - -/* Configure ITE flash support module */ -const struct ite_dfu_config_t ite_dfu_config = { - .i2c_port = I2C_PORT_MASTER, - .scl = GPIO_MASTER_I2C_SCL, - .sda = GPIO_MASTER_I2C_SDA, -}; - -/****************************************************************************** - * Initialize board. - */ -static void board_init(void) -{ - /* USB to serial queues */ - queue_init(&usart2_to_usb); - queue_init(&usb_to_usart2); - queue_init(&usart3_to_usb); - queue_init(&usb_to_usart3); - queue_init(&usart4_to_usb); - queue_init(&usb_to_usart4); - - /* UART init */ - usart_init(&usart2); - usart_init(&usart3); - usart_init(&usart4); - - /* Enable GPIO expander. */ - gpio_set_level(GPIO_TCA6416_RESET_L, 1); - - /* Structured enpoints */ - usb_spi_enable(&usb_spi, 1); - - /* Enable UARTs by default. */ - gpio_set_level(GPIO_UART1_EN_L, 0); - gpio_set_level(GPIO_UART2_EN_L, 0); - /* Disable power output. */ - gpio_set_level(GPIO_SPI1_VREF_18, 0); - gpio_set_level(GPIO_SPI1_VREF_33, 0); - gpio_set_level(GPIO_SPI2_VREF_18, 0); - gpio_set_level(GPIO_SPI2_VREF_33, 0); - /* Enable UART3 routing. */ - gpio_set_level(GPIO_SPI1_MUX_SEL, 1); - gpio_set_level(GPIO_SPI1_BUF_EN_L, 1); - gpio_set_level(GPIO_JTAG_BUFIN_EN_L, 0); - gpio_set_level(GPIO_SERVO_JTAG_TDO_BUFFER_EN, 1); - gpio_set_level(GPIO_SERVO_JTAG_TDO_SEL, 1); -} -DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); - -/****************************************************************************** - * Turn down USART before jumping to RW. - */ -static void board_jump(void) -{ - /* - * If we don't shutdown the USARTs before jumping to RW, then when early - * RW tries to set the GPIOs to input (or anything other than alternate) - * the jump fail on some servo micros. - * - * It also make sense to shut them down since RW will reinitialize them - * in board_init above. - */ - usart_shutdown(&usart2); - usart_shutdown(&usart3); - usart_shutdown(&usart4); - - /* Shutdown other hardware modules and let RW reinitialize them */ - usb_spi_enable(&usb_spi, 0); -} -DECLARE_HOOK(HOOK_SYSJUMP, board_jump, HOOK_PRIO_DEFAULT); diff --git a/board/servo_micro/board.h b/board/servo_micro/board.h deleted file mode 100644 index 306bc0e5d7..0000000000 --- a/board/servo_micro/board.h +++ /dev/null @@ -1,134 +0,0 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/* Servo micro configuration */ - -#ifndef __CROS_EC_BOARD_H -#define __CROS_EC_BOARD_H - -#define CONFIG_LTO - -/* 48 MHz SYSCLK clock frequency */ -#define CPU_CLOCK 48000000 - -#define CONFIG_BOARD_PRE_INIT - -/* Enable USART1,3,4 and USB streams */ -#define CONFIG_STREAM_USART -#define CONFIG_STREAM_USART2 -#define CONFIG_STREAM_USART3 -#define CONFIG_STREAM_USART4 -#define CONFIG_STREAM_USB -#define CONFIG_CMD_USART_INFO - -/* The UART console is on USART1 (PA9/PA10) */ -#undef CONFIG_UART_CONSOLE -#define CONFIG_UART_CONSOLE 1 -#undef CONFIG_UART_TX_DMA -#undef CONFIG_UART_RX_DMA - -/* Optional features */ -#define CONFIG_STM_HWTIMER32 -#define CONFIG_HW_CRC -#define CONFIG_PVD -/* See 'Programmable voltage detector characteristics' in the STM32F072x8 Datasheet. - PVD Threshold 1 corresponds to a falling voltage threshold of min:2.09V, max:2.27V. */ -#define PVD_THRESHOLD (1) - -/* USB Configuration */ -#define CONFIG_USB -#define CONFIG_USB_PID 0x501a -#define CONFIG_USB_CONSOLE -#define CONFIG_USB_UPDATE - -#undef CONFIG_USB_MAXPOWER_MA -#define CONFIG_USB_MAXPOWER_MA 100 - -#define CONFIG_USB_SERIALNO -#define DEFAULT_SERIALNO "Uninitialized" - -/* USB interface indexes (use define rather than enum to expand them) */ -#define USB_IFACE_USART4_STREAM 0 -#define USB_IFACE_UPDATE 1 -#define USB_IFACE_SPI 2 -#define USB_IFACE_CONSOLE 3 -#define USB_IFACE_I2C 4 -#define USB_IFACE_USART3_STREAM 5 -#define USB_IFACE_USART2_STREAM 6 -#define USB_IFACE_COUNT 7 - -/* USB endpoint indexes (use define rather than enum to expand them) */ -#define USB_EP_CONTROL 0 -#define USB_EP_USART4_STREAM 1 -#define USB_EP_UPDATE 2 -#define USB_EP_SPI 3 -#define USB_EP_CONSOLE 4 -#define USB_EP_I2C 5 -#define USB_EP_USART3_STREAM 6 -#define USB_EP_USART2_STREAM 7 -#define USB_EP_COUNT 8 - -/* Enable console recasting of GPIO type. */ -#define CONFIG_CMD_GPIO_EXTENDED - -/* Enable control of SPI over USB */ -#define CONFIG_USB_SPI -#define CONFIG_SPI_CONTROLLER -#define CONFIG_SPI_FLASH_PORT 0 /* First SPI master port */ - -/* This is not actually an EC so disable some features. */ -#undef CONFIG_WATCHDOG_HELP -#undef CONFIG_LID_SWITCH - -/* Enable control of I2C over USB */ -#define CONFIG_USB_I2C -#define CONFIG_I2C -#define CONFIG_I2C_CONTROLLER -#define I2C_PORT_MASTER 0 - -/* See i2c_ite_flash_support.c for more information about these values */ -#define CONFIG_ITE_FLASH_SUPPORT -#define CONFIG_I2C_XFER_LARGE_TRANSFER -#undef CONFIG_USB_I2C_MAX_WRITE_COUNT -#undef CONFIG_USB_I2C_MAX_READ_COUNT -#define CONFIG_USB_I2C_MAX_WRITE_COUNT ((1<<9) - 4) -#define CONFIG_USB_I2C_MAX_READ_COUNT ((1<<9) - 6) - -/* - * Allow dangerous commands all the time, since we don't have a write protect - * switch. - */ -#define CONFIG_SYSTEM_UNLOCKED - -#ifndef __ASSEMBLER__ - -/* Timer selection */ -#define TIM_CLOCK32 2 - -#include "gpio_signal.h" - -/* GPIO signal mapping */ -#define GPIO_USART4_SERVO_TX_DUT_RX GPIO_UART3_TX_SERVO_JTAG_TCK -#define GPIO_USART4_SERVO_RX_DUT_TX GPIO_UART3_RX_JTAG_BUFFER_TO_SERVO_TDO - -/* USB string indexes */ -enum usb_strings { - USB_STR_DESC = 0, - USB_STR_VENDOR, - USB_STR_PRODUCT, - USB_STR_SERIALNO, - USB_STR_VERSION, - USB_STR_I2C_NAME, - USB_STR_USART4_STREAM_NAME, - USB_STR_CONSOLE_NAME, - USB_STR_USART3_STREAM_NAME, - USB_STR_USART2_STREAM_NAME, - USB_STR_UPDATE_NAME, - - USB_STR_COUNT -}; - -#endif /* !__ASSEMBLER__ */ -#endif /* __CROS_EC_BOARD_H */ diff --git a/board/servo_micro/build.mk b/board/servo_micro/build.mk deleted file mode 100644 index 0e069a31ad..0000000000 --- a/board/servo_micro/build.mk +++ /dev/null @@ -1,13 +0,0 @@ -# -*- makefile -*- -# Copyright 2016 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -# -# Board specific files build - -# the IC is STmicro STM32F072RBT6 -CHIP:=stm32 -CHIP_FAMILY:=stm32f0 -CHIP_VARIANT:=stm32f07x - -board-y=board.o diff --git a/board/servo_micro/ccd.md b/board/servo_micro/ccd.md deleted file mode 100644 index 267da66776..0000000000 --- a/board/servo_micro/ccd.md +++ /dev/null @@ -1,168 +0,0 @@ -<!-- - Copyright 2018 The Chromium OS Authors. All rights reserved. - Use of this source code is governed by a BSD-style license that can be - found in the LICENSE file. ---> - -# Case-Closed Debug in Chromebooks and Servo Micro - -The Servo debug/test-automation connector has been required on all chromebooks. -It has proved essential to performing the required testing to meet the six week -OS release cycle, for bringing up new systems and qualifying new components. In -newer form-factors it is becoming hard to fit the Servo connector (and related -flex) and in some designs the thermal solution stops working when the connector -is used. The secure Case-Closed Debugging solution provides the same -capabilities and can take advantage of the Debug Mode detection available on the -USB-C connector. This application note gives an overview of Case-Closed Debug -(CCD) but does not address the related security issues. - -## Introduction to Case-Closed Debug - -Case-Closed Debug provides the same set of features as are available on the -Servo connector: - -* Access to console UART connections to AP, EC and on some systems a third MCU -* Ability to reprogram firmware/BIOS SPI flash used by the AP -* Ability to reprogram SPI flash used by the EC or use a firmware update mode - to reprogram the internal flash on the EC (using UART or I2C) -* GPIOs for holding the EC (and thus entire system) or AP in reset -* Act as master on a debug I2C that is primarily used for power measurements. - This bus normally contains INA voltage/current monitors and temperature - monitors that will not be populated on final MP systems. -* JTAG/SWD could be provided but has not been implemented on any existing - system. - -When the Servo connector is used these interfaces are presented on well defined -pins of the board-to-board connector and a flex is used to attach to the -external Servo controller. The height needed for the mated board-to-board -connector is not available in newer slim designs, and the disruption caused by -the flex may interfere with thermal solutions. In a system using Case-Closed -Debug the interfaces are gathered by a part on the board into a single USB -interface that can come out of the system on an existing connector. In -particular, the USB-C connector has two SideBand Use pins (SBU1, SBU2) that can -be used for the debug USB while the main link on the connector continues to be -available. (The SBU pins are also used by some Alternate Modes, so the connector -cannot be used for video out at the same time as debugging.) - -## Servo Micro: Using CCD with existing boards - -The Servo Micro implements the CCD functions in a way that can connect to -existing boards and thus can also serve as an easy introduction to the CCD -implementation. The debug USB interface is expanded by a STM32F072 into an -existing Servo flex connector that can be plugged into the target board. - - - -The Servo Micro includes the voltage level buffering between the microcontroller -and the device under test (DUT), making use of the DUT supplied reference -voltages. To allow use with all the existing designs a third UART (not on the -original Servo connector, but on some designs) can be connected to either the -JTAG pins or the SPI pins. It is capable of providing the SPI flash supply -voltages. - -The schematics for Servo Micro are available -[as a pdf](servo_micro_sch_20180404.pdf). - -Servo Micro has a USB micro-B connector and acts as a USB device. - -Schematic sheet 2 shows the STM32 powered from the uB connector. The UART3 pins -can also be used as GPIO pins when driving the JTAG interface. As a useful but -non-compliant hack if the ID pin on the uB is low then Q4 will force the STM32 -to boot in programming mode. This allows initial programming of the part with -USB DFU using an illegal USB-A plug to USB-A plug cable and a USB-A receptacle -to uB plug adapter. Alternatively the initial programming can be done using a -UART connection on CN2. - -Schematic sheet 3 shows the I2C GPIO expander and the buffers for JTAG/SWD. The -buffers adapt to the voltage needed on the DUT that is provided on -`PPDUT_JTAG_VREF`. In the SWD case the TDI becomes the bidirectional SWDIO but -the STM32 continues to use a discrete input and output pin. The DUT signal is -received through U55 and a selection made with U1 to determine if to forward TDO -from the DUT or the TDI/SWDIO. Because of the shared pins on the STM32 the JTAG -interface can alternatively be used to connect UART3 to the DUT for a few -chromebook models. - -Schematic sheet 4 shows the buffers for the SPI interfaces. Again the -`PPDUT_SPIn_VREF` sets the voltage level required from the DUT. However, I61 and -I62 (which are expanded on sheets 7 and 8) allow the Servo Micro to supply 3.3V -or 1.8V for cases where the DUT does not provide the reference (care is needed -to select the correct voltage for the given DUT). Only one of the SPI interfaces -can be used at any time, so the buffers are also used to select which connects -to the STM32 SPI pins. Certain chromebook models connect the UART3 in place of -SPI1 which is enabled using U5 to select between the STM32 UART3 (TX,RX) and SPI -(CLK, MISO). - -Schematic sheet 5 shows the buffers for the UART interfaces. The -`PPDUT_UARTn_VREF` sets the voltage level required from the DUT. - -Schematic sheet 6 shows the board-to-board connector that mates with the servo -connector on the DUT. - -Schematic sheets 7 and 8 are the expansion of blocks I61 and I62 on sheet 4. The -load switches are carefully selected to have reverse blocking (protecting -against a DUT providing a voltage or both being enabled). - -The code for the STM32 in Servo Micro is open source as the -[`servo_micro`](../../board/servo_micro) board in the -[Chromium EC codebase](https://chromium.googlesource.com/chromiumos/platform/ec/). -Essentially it is a USB device that provides the standard control endpoint and 7 -function endpoints defined in [`board.h`](board.h). - -<!-- does not work in emacs/markdown preview but should in gitlies --> - -```c -#define USB_EP_USART4_STREAM 1 -#define USB_EP_UPDATE 2 -#define USB_EP_SPI 3 -#define USB_EP_CONSOLE 4 -#define USB_EP_I2C 5 -#define USB_EP_USART3_STREAM 6 -#define USB_EP_USART2_STREAM 7 -``` - -The USART endpoints use the simple `GOOGLE_SERIAL` vendor class to connect the -STM32 UARTs. The CONSOLE endpoint also uses `GOOGLE_STREAM` to connect to the -console of the code running on the STM32. `GOOGLE_STREAM` provides simple byte -streams on the IN and OUT of the endpoint and host support is included in the -standard Linux `drivers/usb/serial/usb-serial-simple.c` - -The SPI endpoint is described in -[`chip/stm32/usb_spi.h`](../../chip/stm32/usb_spi.h) and provides a simple -connection to the SPI port. The host support is provided as a -[driver in flashrom](https://chromium.googlesource.com/chromiumos/third_party/flashrom/+/HEAD/raiden_debug_spi.c). - -The I2C endpoint is described in [`include/usb_i2c.h`](../../include/usb_i2c.h) -and provides a simple connection to the I2C bus. The host support is provided in -the -[hdctools servo support](https://chromium.googlesource.com/chromiumos/third_party/hdctools/+/HEAD/servo/stm32i2c.py). - -The GPIO endpoint is cryptically described in -[`chip/stm32/usb_gpio.h`](../../chip/stm32/usb_gpio.h) and provides simple -access to set/clear and read the GPIO pins. The host support is provided in the -[hdctools servo support](https://chromium.googlesource.com/chromiumos/third_party/hdctools/+/HEAD/servo/stm32gpio.py). - -The UPDATE endpoint is not part of CCD. It provides a method for updating the -STM32 without needing the special boot modes. This uses the -[Chromium EC update over USB](../../docs/usb_updater.md) method. The STM32 runs -the code in [`common/usb_update.c`](../../common/usb_update.c). The host side -code is in -[`extra/usb_updater/usb_updater2.c`](../../extra/usb_updater/usb_updater2.c) and -the [`extra/usb_updater`](../../extra/usb_updater/) directory contains -additional scripts. - -## Using CCD on new designs - -New chromebook designs implement the CCD in a similar way to Servo Micro. There -are two changes to the Servo Micro: - -* The USB microB connector is replaced with the USB connection being carried - on the SBU pins of one of the devices USB-C ports. This will only be - activated when the USB-C port detects a debug accessory or a debug alternate - mode is entered. Use of the debug connection precludes use of the Display - Port alternate mode (which also uses the SBU pins) but allows full USB3 and - USB2 functions including both host and gadget mode. -* The system security chip will normally lock out debug access. Using secure - transactions, user authorization and proof of user physical presence it can - unlock various degrees of debug access. - -The full details are part of the Cr50 firmware specification. diff --git a/board/servo_micro/ec.tasklist b/board/servo_micro/ec.tasklist deleted file mode 100644 index c1fb169118..0000000000 --- a/board/servo_micro/ec.tasklist +++ /dev/null @@ -1,11 +0,0 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/** - * See CONFIG_TASK_LIST in config.h for details. - */ -#define CONFIG_TASK_LIST \ - TASK_ALWAYS(HOOKS, hook_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_ALWAYS(CONSOLE, console_task, NULL, VENTI_TASK_STACK_SIZE) diff --git a/board/servo_micro/gpio.inc b/board/servo_micro/gpio.inc deleted file mode 100644 index 10e411c5f2..0000000000 --- a/board/servo_micro/gpio.inc +++ /dev/null @@ -1,75 +0,0 @@ -/* -*- mode:c -*- - * - * Copyright 2016 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/* Outputs */ -GPIO(UART1_EN_L, PIN(A, 8), GPIO_OUT_LOW) -GPIO(SERVO_JTAG_TRST_L, PIN(A, 13), GPIO_OUT_LOW) -GPIO(SPI1_BUF_EN_L, PIN(A, 14), GPIO_OUT_HIGH) -GPIO(SPI2_BUF_EN_L, PIN(A, 15), GPIO_OUT_HIGH) - -GPIO(UART2_EN_L, PIN(B, 0), GPIO_OUT_LOW) -GPIO(SPI1_VREF_33, PIN(B, 2), GPIO_OUT_LOW) -GPIO(SPI1_VREF_18, PIN(B, 3), GPIO_OUT_LOW) -GPIO(SPI2_VREF_33, PIN(B, 4), GPIO_OUT_LOW) -GPIO(SPI2_VREF_18, PIN(B, 5), GPIO_OUT_LOW) -GPIO(SERVO_JTAG_TRST_DIR, PIN(B, 6), GPIO_OUT_HIGH) -GPIO(SERVO_JTAG_TDI_DIR, PIN(B, 7), GPIO_OUT_HIGH) - -GPIO(TCA6416_RESET_L, PIN(C, 13), GPIO_OUT_LOW) -GPIO(SPI1_MUX_SEL, PIN(A, 5), GPIO_OUT_HIGH) -GPIO(SERVO_JTAG_TMS_DIR, PIN(C, 14), GPIO_OUT_LOW) -GPIO(SERVO_JTAG_TDO_SEL, PIN(C, 15), GPIO_OUT_HIGH) -GPIO(JTAG_BUFOUT_EN_L, PIN(F, 0), GPIO_OUT_HIGH) -GPIO(JTAG_BUFIN_EN_L, PIN(F, 1), GPIO_OUT_LOW) - -/* Inputs */ -GPIO(SERVO_JTAG_TMS, PIN(A, 4), GPIO_INPUT) -GPIO(SERVO_JTAG_TDO_BUFFER_EN, PIN(A, 6), GPIO_OUT_HIGH) -GPIO(SERVO_JTAG_TDI, PIN(A, 7), GPIO_INPUT) - -GPIO(SERVO_JTAG_RTCK, PIN(B, 1), GPIO_INPUT) - -/* Flash SPI interface */ -GPIO(SPI_CS, PIN(B, 12), GPIO_OUT_HIGH) -GPIO(SPI_CLK, PIN(B, 13), GPIO_INPUT) -GPIO(SPI_MISO, PIN(B, 14), GPIO_INPUT) -GPIO(SPI_MOSI, PIN(B, 15), GPIO_INPUT) - -/* I2C pins should be configured as inputs until I2C module is */ -/* initialized. This will avoid driving the lines unintentionally.*/ -GPIO(MASTER_I2C_SCL, PIN(B, 8), GPIO_INPUT) -GPIO(MASTER_I2C_SDA, PIN(B, 9), GPIO_INPUT) - -/* These pins are used for USART and are set to alternate mode below */ -GPIO(USART2_SERVO_TX_DUT_RX, PIN(A, 2), GPIO_INPUT) -GPIO(USART2_SERVO_RX_DUT_TX, PIN(A, 3), GPIO_INPUT) -GPIO(USART3_SERVO_TX_DUT_RX, PIN(B, 10), GPIO_INPUT) -GPIO(USART3_SERVO_RX_DUT_TX, PIN(B, 11), GPIO_INPUT) -/* - * The USART4 (UART3) names are already in use by dut-controls, so they can't - * be easily updated. They are aliased in board.h though. - * - * Also, these need to be GPIO_ALTERNATE until all servo micro RO images have - * the board_jump USART shutdown. After ~2020/06/01 they can move to GPIO_INPUT. - * See b/144356961 for more background. - */ -GPIO(UART3_TX_SERVO_JTAG_TCK, PIN(A, 0), GPIO_ALTERNATE) -GPIO(UART3_RX_JTAG_BUFFER_TO_SERVO_TDO, PIN(A, 1), GPIO_ALTERNATE) - -/* Unimplemented signals since we are not an EC */ -UNIMPLEMENTED(ENTERING_RW) -UNIMPLEMENTED(WP_L) - -ALTERNATE(PIN_MASK(A, 0x0600), 1, MODULE_UART, 0) /* USART1: PA09/PA10 - Servo stm32 console UART*/ -ALTERNATE(PIN_MASK(A, 0x000C), 1, MODULE_USART, 0) /* USART2: PA2/PA3 - Servo UART1 */ -ALTERNATE(PIN_MASK(B, 0x0C00), 4, MODULE_USART, 0) /* USART3: PB10/PB11 - Servo UART2 */ -ALTERNATE(PIN_MASK(A, 0x0003), 4, MODULE_USART, 0) /* USART4: PA0/PA1 - Servo UART3 */ - -ALTERNATE(PIN_MASK(B, 0x0300), 1, MODULE_I2C, 0) /* I2C MASTER:PB8/PB9 GPIO_ODR_HIGH */ -ALTERNATE(PIN_MASK(B, 0x0300), 2, MODULE_I2C_TIMERS, 0) /* I2C MASTER:PB8/PB9 TIM16_CH1/TIM17_CH1 */ - -ALTERNATE(PIN_MASK(B, 0xE000), 0, MODULE_SPI_FLASH, 0) /* SPI: PB15 - PB12 MOSI, MISO, CLK, CS */ diff --git a/board/servo_micro/servo_micro.png b/board/servo_micro/servo_micro.png Binary files differdeleted file mode 100644 index e3591d41c7..0000000000 --- a/board/servo_micro/servo_micro.png +++ /dev/null diff --git a/board/servo_micro/servo_micro_sch_20180404.pdf b/board/servo_micro/servo_micro_sch_20180404.pdf Binary files differdeleted file mode 100644 index d9f643a11b..0000000000 --- a/board/servo_micro/servo_micro_sch_20180404.pdf +++ /dev/null |
