Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-16 01:24:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes from topic "deprecate_io_drivers" into integration

Browse source 
* changes:
  refactor(st): remove unused io_mmc driver
  docs: deprecate io_dummy driver
This commit is contained in:
Manish Pandey 2023-01-16 16:45:37 +01:00 • committed by TrustedFirmware Code Review
commit 7f31629d5d
5 changed files with 2 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/about/release-information.rst
View file

@ -69,6 +69,8 @@ after which it will be removed.
+================================+=============+=========+=========================================================+
| plat_convert_pk() function | Nov'22 | 2.9 | Platform conversion to manage specific PK hash |
+--------------------------------+-------------+---------+---------------------------------------------------------+
| io_dummy driver | Nov'22 | 2.9 | No more used by any upstream platform |
+--------------------------------+-------------+---------+---------------------------------------------------------+
--------------

143
drivers/st/io/io_mmc.c
View file

@ -1,143 +0,0 @@
/*
* Copyright (c) 2018-2021, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <assert.h>
#include <errno.h>
#include <string.h>
#include <common/debug.h>
#include <drivers/io/io_driver.h>
#include <drivers/io/io_storage.h>
#include <drivers/mmc.h>
#include <drivers/st/io_mmc.h>
#include <drivers/st/stm32_sdmmc2.h>
/* SDMMC device functions */
static int mmc_dev_open(const uintptr_t init_params, io_dev_info_t **dev_info);
static int mmc_block_open(io_dev_info_t *dev_info, const uintptr_t spec,
io_entity_t *entity);
static int mmc_dev_init(io_dev_info_t *dev_info, const uintptr_t init_params);
static int mmc_block_seek(io_entity_t *entity, int mode,
signed long long offset);
static int mmc_block_read(io_entity_t *entity, uintptr_t buffer, size_t length,
size_t *length_read);
static int mmc_block_close(io_entity_t *entity);
static int mmc_dev_close(io_dev_info_t *dev_info);
static io_type_t device_type_mmc(void);
static signed long long seek_offset;
static size_t (*_read_blocks)(int lba, uintptr_t buf, size_t size);
static const io_dev_connector_t mmc_dev_connector = {
.dev_open = mmc_dev_open
};
static const io_dev_funcs_t mmc_dev_funcs = {
.type = device_type_mmc,
.open = mmc_block_open,
.seek = mmc_block_seek,
.size = NULL,
.read = mmc_block_read,
.write = NULL,
.close = mmc_block_close,
.dev_init = mmc_dev_init,
.dev_close = mmc_dev_close,
};
static const io_dev_info_t mmc_dev_info = {
.funcs = &mmc_dev_funcs,
.info = 0,
};
/* Identify the device type as mmc device */
static io_type_t device_type_mmc(void)
{
return IO_TYPE_MMC;
}
/* Open a connection to the mmc device */
static int mmc_dev_open(const uintptr_t init_params, io_dev_info_t **dev_info)
{
struct io_mmc_dev_spec *device_spec =
(struct io_mmc_dev_spec *)init_params;
assert(dev_info != NULL);
*dev_info = (io_dev_info_t *)&mmc_dev_info;
_read_blocks = !device_spec->use_boot_part ?
mmc_read_blocks : mmc_boot_part_read_blocks;
return 0;
}
static int mmc_dev_init(io_dev_info_t *dev_info, const uintptr_t init_params)
{
return 0;
}
/* Close a connection to the mmc device */
static int mmc_dev_close(io_dev_info_t *dev_info)
{
return 0;
}
/* Open a file on the mmc device */
static int mmc_block_open(io_dev_info_t *dev_info, const uintptr_t spec,
io_entity_t *entity)
{
seek_offset = 0;
return 0;
}
/* Seek to a particular file offset on the mmc device */
static int mmc_block_seek(io_entity_t *entity, int mode,
signed long long offset)
{
seek_offset = offset;
return 0;
}
/* Read data from a file on the mmc device */
static int mmc_block_read(io_entity_t *entity, uintptr_t buffer,
size_t length, size_t *length_read)
{
uint8_t retries;
for (retries = 0U; retries < 3U; retries++) {
*length_read = _read_blocks(seek_offset / MMC_BLOCK_SIZE,
buffer, length);
if (*length_read == length) {
return 0;
}
WARN("%s: length_read = %lu (!= %lu), retry %u\n", __func__,
(unsigned long)*length_read, (unsigned long)length,
retries + 1U);
}
return -EIO;
}
/* Close a file on the mmc device */
static int mmc_block_close(io_entity_t *entity)
{
return 0;
}
/* Register the mmc driver with the IO abstraction */
int register_io_dev_mmc(const io_dev_connector_t **dev_con)
{
int result;
assert(dev_con != NULL);
result = io_register_device(&mmc_dev_info);
if (result == 0) {
*dev_con = &mmc_dev_connector;
}
return result;
}

18
include/drivers/st/io_mmc.h
View file

@ -1,18 +0,0 @@
/*
* Copyright (c) 2015-2021, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef IO_MMC_H
#define IO_MMC_H
#include <drivers/io/io_driver.h>
struct io_mmc_dev_spec {
bool use_boot_part;
};
int register_io_dev_mmc(const io_dev_connector_t **dev_con);
#endif /* IO_MMC_H */

1
plat/st/common/bl2_io_storage.c
View file

@ -25,7 +25,6 @@
#include <drivers/raw_nand.h>
#include <drivers/spi_nand.h>
#include <drivers/spi_nor.h>
#include <drivers/st/io_mmc.h>
#include <drivers/st/stm32_fmc2_nand.h>
#include <drivers/st/stm32_qspi.h>
#include <drivers/st/stm32_sdmmc2.h>

1
plat/st/stm32mp1/platform.mk
View file

@ -403,7 +403,6 @@ ifneq ($(filter 1,${STM32MP_EMMC} ${STM32MP_SDMMC}),)
BL2_SOURCES += drivers/mmc/mmc.c \
drivers/partition/gpt.c \
drivers/partition/partition.c \
drivers/st/io/io_mmc.c \
drivers/st/mmc/stm32_sdmmc2.c
endif