Drop support for semihosting
We don't use semihosting in any of our test configs at the moment so
there's a risk this code might get broken without us notifying it.
It seems better to reintroduce it if and when we actually need it.
Change-Id: Iae84e3be034cc3da0248954aa5a1029ddd50aabb
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
diff --git a/docs/design.rst b/docs/design.rst
index d063790..edb3c95 100644
--- a/docs/design.rst
+++ b/docs/design.rst
@@ -111,10 +111,6 @@
a string in the test report, macros to skip tests on platforms that do not
meet topology requirements, etc.
- - ``semihosting.h``
-
- Semihosting support.
-
- ``io_storage.h``
Low-level IO operations. Tests are not expected to use these APIs
diff --git a/include/lib/semihosting.h b/include/lib/semihosting.h
deleted file mode 100644
index 9938a56..0000000
--- a/include/lib/semihosting.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef __SEMIHOSTING_H__
-#define __SEMIHOSTING_H__
-
-#include <stdint.h>
-#include <stdio.h> /* For ssize_t */
-
-
-#define SEMIHOSTING_SYS_OPEN 0x01
-#define SEMIHOSTING_SYS_CLOSE 0x02
-#define SEMIHOSTING_SYS_WRITE0 0x04
-#define SEMIHOSTING_SYS_WRITEC 0x03
-#define SEMIHOSTING_SYS_WRITE 0x05
-#define SEMIHOSTING_SYS_READ 0x06
-#define SEMIHOSTING_SYS_READC 0x07
-#define SEMIHOSTING_SYS_SEEK 0x0A
-#define SEMIHOSTING_SYS_FLEN 0x0C
-#define SEMIHOSTING_SYS_REMOVE 0x0E
-#define SEMIHOSTING_SYS_SYSTEM 0x12
-#define SEMIHOSTING_SYS_ERRNO 0x13
-
-#define FOPEN_MODE_R 0x0
-#define FOPEN_MODE_RB 0x1
-#define FOPEN_MODE_RPLUS 0x2
-#define FOPEN_MODE_RPLUSB 0x3
-#define FOPEN_MODE_W 0x4
-#define FOPEN_MODE_WB 0x5
-#define FOPEN_MODE_WPLUS 0x6
-#define FOPEN_MODE_WPLUSB 0x7
-#define FOPEN_MODE_A 0x8
-#define FOPEN_MODE_AB 0x9
-#define FOPEN_MODE_APLUS 0xa
-#define FOPEN_MODE_APLUSB 0xb
-
-long semihosting_connection_supported(void);
-long semihosting_file_open(const char *file_name, size_t mode);
-long semihosting_file_seek(long file_handle, ssize_t offset);
-long semihosting_file_read(long file_handle, size_t *length, uintptr_t buffer);
-long semihosting_file_write(long file_handle,
- size_t *length,
- const uintptr_t buffer);
-long semihosting_file_close(long file_handle);
-long semihosting_file_length(long file_handle);
-long semihosting_system(char *command_line);
-long semihosting_get_flen(const char *file_name);
-long semihosting_download_file(const char *file_name,
- size_t buf_size,
- uintptr_t buf);
-void semihosting_write_char(char character);
-void semihosting_write_string(char *string);
-char semihosting_read_char(void);
-
-#endif /* __SEMIHOSTING_H__ */
diff --git a/lib/semihosting/aarch32/semihosting_call.S b/lib/semihosting/aarch32/semihosting_call.S
deleted file mode 100644
index fe489b6..0000000
--- a/lib/semihosting/aarch32/semihosting_call.S
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <asm_macros.S>
-
- .globl semihosting_call
-
-func semihosting_call
- svc #0x123456
- bx lr
-endfunc semihosting_call
diff --git a/lib/semihosting/aarch64/semihosting_call.S b/lib/semihosting/aarch64/semihosting_call.S
deleted file mode 100644
index dfded2e..0000000
--- a/lib/semihosting/aarch64/semihosting_call.S
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <asm_macros.S>
-
- .globl semihosting_call
-
-func semihosting_call
- hlt #0xf000
- ret
-endfunc semihosting_call
diff --git a/lib/semihosting/semihosting.c b/lib/semihosting/semihosting.c
deleted file mode 100644
index cf10802..0000000
--- a/lib/semihosting/semihosting.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <assert.h>
-#include <errno.h>
-#include <semihosting.h>
-#include <string.h>
-
-#ifndef SEMIHOSTING_SUPPORTED
-#define SEMIHOSTING_SUPPORTED 1
-#endif
-
-long semihosting_call(unsigned long operation,
- void *system_block_address);
-
-typedef struct {
- const char *file_name;
- unsigned long mode;
- size_t name_length;
-} smh_file_open_block_t;
-
-typedef struct {
- long handle;
- uintptr_t buffer;
- size_t length;
-} smh_file_read_write_block_t;
-
-typedef struct {
- long handle;
- ssize_t location;
-} smh_file_seek_block_t;
-
-typedef struct {
- char *command_line;
- size_t command_length;
-} smh_system_block_t;
-
-long semihosting_connection_supported(void)
-{
- return SEMIHOSTING_SUPPORTED;
-}
-
-long semihosting_file_open(const char *file_name, size_t mode)
-{
- smh_file_open_block_t open_block;
-
- open_block.file_name = file_name;
- open_block.mode = mode;
- open_block.name_length = strlen(file_name);
-
- return semihosting_call(SEMIHOSTING_SYS_OPEN,
- (void *) &open_block);
-}
-
-long semihosting_file_seek(long file_handle, ssize_t offset)
-{
- smh_file_seek_block_t seek_block;
- long result;
-
- seek_block.handle = file_handle;
- seek_block.location = offset;
-
- result = semihosting_call(SEMIHOSTING_SYS_SEEK,
- (void *) &seek_block);
-
- if (result)
- result = semihosting_call(SEMIHOSTING_SYS_ERRNO, 0);
-
- return result;
-}
-
-long semihosting_file_read(long file_handle, size_t *length, uintptr_t buffer)
-{
- smh_file_read_write_block_t read_block;
- long result = -EINVAL;
-
- if ((length == NULL) || (buffer == (uintptr_t)NULL))
- return result;
-
- read_block.handle = file_handle;
- read_block.buffer = buffer;
- read_block.length = *length;
-
- result = semihosting_call(SEMIHOSTING_SYS_READ,
- (void *) &read_block);
-
- if (result == *length) {
- return -EINVAL;
- } else if (result < *length) {
- *length -= result;
- return 0;
- } else
- return result;
-}
-
-long semihosting_file_write(long file_handle,
- size_t *length,
- const uintptr_t buffer)
-{
- smh_file_read_write_block_t write_block;
-
- if ((length == NULL) || (buffer == (uintptr_t)NULL))
- return -EINVAL;
-
- write_block.handle = file_handle;
- write_block.buffer = (uintptr_t)buffer; /* cast away const */
- write_block.length = *length;
-
- *length = semihosting_call(SEMIHOSTING_SYS_WRITE,
- (void *) &write_block);
-
- return *length;
-}
-
-long semihosting_file_close(long file_handle)
-{
- return semihosting_call(SEMIHOSTING_SYS_CLOSE,
- (void *) &file_handle);
-}
-
-long semihosting_file_length(long file_handle)
-{
- return semihosting_call(SEMIHOSTING_SYS_FLEN,
- (void *) &file_handle);
-}
-
-char semihosting_read_char(void)
-{
- return semihosting_call(SEMIHOSTING_SYS_READC, NULL);
-}
-
-void semihosting_write_char(char character)
-{
- semihosting_call(SEMIHOSTING_SYS_WRITEC, (void *) &character);
-}
-
-void semihosting_write_string(char *string)
-{
- semihosting_call(SEMIHOSTING_SYS_WRITE0, (void *) string);
-}
-
-long semihosting_system(char *command_line)
-{
- smh_system_block_t system_block;
-
- system_block.command_line = command_line;
- system_block.command_length = strlen(command_line);
-
- return semihosting_call(SEMIHOSTING_SYS_SYSTEM,
- (void *) &system_block);
-}
-
-long semihosting_get_flen(const char *file_name)
-{
- long file_handle;
- size_t length;
-
- assert(semihosting_connection_supported());
-
- file_handle = semihosting_file_open(file_name, FOPEN_MODE_RB);
- if (file_handle == -1)
- return file_handle;
-
- /* Find the length of the file */
- length = semihosting_file_length(file_handle);
-
- return semihosting_file_close(file_handle) ? -1 : length;
-}
-
-long semihosting_download_file(const char *file_name,
- size_t buf_size,
- uintptr_t buf)
-{
- long ret = -EINVAL;
- size_t length;
- long file_handle;
-
- /* Null pointer check */
- if (!buf)
- return ret;
-
- assert(semihosting_connection_supported());
-
- file_handle = semihosting_file_open(file_name, FOPEN_MODE_RB);
- if (file_handle == -1)
- return ret;
-
- /* Find the actual length of the file */
- length = semihosting_file_length(file_handle);
- if (length == -1)
- goto semihosting_fail;
-
- /* Signal error if we do not have enough space for the file */
- if (length > buf_size)
- goto semihosting_fail;
-
- /*
- * A successful read will return 0 in which case we pass back
- * the actual number of bytes read. Else we pass a negative
- * value indicating an error.
- */
- ret = semihosting_file_read(file_handle, &length, buf);
- if (ret)
- goto semihosting_fail;
- else
- ret = length;
-
-semihosting_fail:
- semihosting_file_close(file_handle);
- return ret;
-}
diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk
index 2326bde..eed9913 100644
--- a/plat/arm/board/fvp/platform.mk
+++ b/plat/arm/board/fvp/platform.mk
@@ -12,8 +12,6 @@
drivers/arm/sp805/sp805.c \
drivers/arm/timer/private_timer.c \
drivers/arm/timer/system_timer.c \
- lib/semihosting/${ARCH}/semihosting_call.S \
- lib/semihosting/semihosting.c \
plat/arm/board/fvp/${ARCH}/plat_helpers.S \
plat/arm/board/fvp/fvp_pwr_state.c \
plat/arm/board/fvp/fvp_topology.c \