mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-11-04 05:50:17 +00:00 
			
		
		
		
	Per Heiko the original changes were correct and something is misbehaving on his hardware. This reverts commit 3d5931e5986a49c44cdab845c6751d845812e8d8. Signed-off-by: Tom Rini <trini@konsulko.com>
		
			
				
	
	
		
			370 lines
		
	
	
		
			7.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			370 lines
		
	
	
		
			7.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
// SPDX-License-Identifier: GPL-2.0+
 | 
						|
/*
 | 
						|
 * (C) Copyright 2000-2010
 | 
						|
 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 | 
						|
 *
 | 
						|
 * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
 | 
						|
 * Andreas Heppel <aheppel@sysgo.de>
 | 
						|
 *
 | 
						|
 * (C) Copyright 2008 Atmel Corporation
 | 
						|
 */
 | 
						|
#include <common.h>
 | 
						|
#include <dm.h>
 | 
						|
#include <environment.h>
 | 
						|
#include <malloc.h>
 | 
						|
#include <spi.h>
 | 
						|
#include <spi_flash.h>
 | 
						|
#include <search.h>
 | 
						|
#include <errno.h>
 | 
						|
#include <dm/device-internal.h>
 | 
						|
 | 
						|
#ifndef CONFIG_ENV_SPI_BUS
 | 
						|
# define CONFIG_ENV_SPI_BUS	CONFIG_SF_DEFAULT_BUS
 | 
						|
#endif
 | 
						|
#ifndef CONFIG_ENV_SPI_CS
 | 
						|
# define CONFIG_ENV_SPI_CS	CONFIG_SF_DEFAULT_CS
 | 
						|
#endif
 | 
						|
#ifndef CONFIG_ENV_SPI_MAX_HZ
 | 
						|
# define CONFIG_ENV_SPI_MAX_HZ	CONFIG_SF_DEFAULT_SPEED
 | 
						|
#endif
 | 
						|
#ifndef CONFIG_ENV_SPI_MODE
 | 
						|
# define CONFIG_ENV_SPI_MODE	CONFIG_SF_DEFAULT_MODE
 | 
						|
#endif
 | 
						|
 | 
						|
#ifndef CONFIG_SPL_BUILD
 | 
						|
#define CMD_SAVEENV
 | 
						|
#define INITENV
 | 
						|
#endif
 | 
						|
 | 
						|
#ifdef CONFIG_ENV_OFFSET_REDUND
 | 
						|
#ifdef CMD_SAVEENV
 | 
						|
static ulong env_offset		= CONFIG_ENV_OFFSET;
 | 
						|
static ulong env_new_offset	= CONFIG_ENV_OFFSET_REDUND;
 | 
						|
#endif
 | 
						|
 | 
						|
#define ACTIVE_FLAG	1
 | 
						|
#define OBSOLETE_FLAG	0
 | 
						|
#endif /* CONFIG_ENV_OFFSET_REDUND */
 | 
						|
 | 
						|
DECLARE_GLOBAL_DATA_PTR;
 | 
						|
 | 
						|
static struct spi_flash *env_flash;
 | 
						|
 | 
						|
static int setup_flash_device(void)
 | 
						|
{
 | 
						|
#ifdef CONFIG_DM_SPI_FLASH
 | 
						|
	struct udevice *new;
 | 
						|
	int	ret;
 | 
						|
 | 
						|
	/* speed and mode will be read from DT */
 | 
						|
	ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
 | 
						|
				     CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE,
 | 
						|
				     &new);
 | 
						|
	if (ret) {
 | 
						|
		set_default_env("spi_flash_probe_bus_cs() failed", 0);
 | 
						|
		return ret;
 | 
						|
	}
 | 
						|
 | 
						|
	env_flash = dev_get_uclass_priv(new);
 | 
						|
#else
 | 
						|
 | 
						|
	if (!env_flash) {
 | 
						|
		env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
 | 
						|
			CONFIG_ENV_SPI_CS,
 | 
						|
			CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
 | 
						|
		if (!env_flash) {
 | 
						|
			set_default_env("spi_flash_probe() failed", 0);
 | 
						|
			return -EIO;
 | 
						|
		}
 | 
						|
	}
 | 
						|
#endif
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int is_end(const char *addr, size_t size)
 | 
						|
{
 | 
						|
	/* The end of env variables is marked by '\0\0' */
 | 
						|
	int i = 0;
 | 
						|
 | 
						|
	for (i = 0; i < size - 1; ++i)
 | 
						|
		if (addr[i] == 0x0 && addr[i + 1] == 0x0)
 | 
						|
			return 1;
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int spi_flash_read_env(struct spi_flash *flash, u32 offset, size_t len,
 | 
						|
			      void *buf)
 | 
						|
{
 | 
						|
	u32 addr = 0;
 | 
						|
	u32 page_size = flash->page_size;
 | 
						|
 | 
						|
	memset(buf, 0x0, len);
 | 
						|
	for (int i = 0; i < len / page_size; ++i) {
 | 
						|
		int ret = spi_flash_read(flash, offset, page_size,
 | 
						|
					 &((char *)buf)[addr]);
 | 
						|
 | 
						|
		if (ret < 0)
 | 
						|
			return ret;
 | 
						|
 | 
						|
		if (is_end(&((char *)buf)[addr], page_size))
 | 
						|
			return 0;
 | 
						|
 | 
						|
		addr += page_size;
 | 
						|
		offset += page_size;
 | 
						|
	}
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
#if defined(CONFIG_ENV_OFFSET_REDUND)
 | 
						|
#ifdef CMD_SAVEENV
 | 
						|
static int env_sf_save(void)
 | 
						|
{
 | 
						|
	env_t	env_new;
 | 
						|
	char	*saved_buffer = NULL, flag = OBSOLETE_FLAG;
 | 
						|
	u32	saved_size, saved_offset, sector;
 | 
						|
	int	ret;
 | 
						|
 | 
						|
	ret = setup_flash_device();
 | 
						|
	if (ret)
 | 
						|
		return ret;
 | 
						|
 | 
						|
	ret = env_export(&env_new);
 | 
						|
	if (ret)
 | 
						|
		return -EIO;
 | 
						|
	env_new.flags	= ACTIVE_FLAG;
 | 
						|
 | 
						|
	if (gd->env_valid == ENV_VALID) {
 | 
						|
		env_new_offset = CONFIG_ENV_OFFSET_REDUND;
 | 
						|
		env_offset = CONFIG_ENV_OFFSET;
 | 
						|
	} else {
 | 
						|
		env_new_offset = CONFIG_ENV_OFFSET;
 | 
						|
		env_offset = CONFIG_ENV_OFFSET_REDUND;
 | 
						|
	}
 | 
						|
 | 
						|
	/* Is the sector larger than the env (i.e. embedded) */
 | 
						|
	if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {
 | 
						|
		saved_size = CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SIZE;
 | 
						|
		saved_offset = env_new_offset + CONFIG_ENV_SIZE;
 | 
						|
		saved_buffer = memalign(ARCH_DMA_MINALIGN, saved_size);
 | 
						|
		if (!saved_buffer) {
 | 
						|
			ret = -ENOMEM;
 | 
						|
			goto done;
 | 
						|
		}
 | 
						|
		ret = spi_flash_read_env(env_flash, saved_offset,
 | 
						|
					 saved_size, saved_buffer);
 | 
						|
		if (ret)
 | 
						|
			goto done;
 | 
						|
	}
 | 
						|
 | 
						|
	sector = DIV_ROUND_UP(CONFIG_ENV_SIZE, CONFIG_ENV_SECT_SIZE);
 | 
						|
 | 
						|
	puts("Erasing SPI flash...");
 | 
						|
	ret = spi_flash_erase(env_flash, env_new_offset,
 | 
						|
				sector * CONFIG_ENV_SECT_SIZE);
 | 
						|
	if (ret)
 | 
						|
		goto done;
 | 
						|
 | 
						|
	puts("Writing to SPI flash...");
 | 
						|
 | 
						|
	ret = spi_flash_write(env_flash, env_new_offset,
 | 
						|
		CONFIG_ENV_SIZE, &env_new);
 | 
						|
	if (ret)
 | 
						|
		goto done;
 | 
						|
 | 
						|
	if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {
 | 
						|
		ret = spi_flash_write(env_flash, saved_offset,
 | 
						|
					saved_size, saved_buffer);
 | 
						|
		if (ret)
 | 
						|
			goto done;
 | 
						|
	}
 | 
						|
 | 
						|
	ret = spi_flash_write(env_flash, env_offset + offsetof(env_t, flags),
 | 
						|
				sizeof(env_new.flags), &flag);
 | 
						|
	if (ret)
 | 
						|
		goto done;
 | 
						|
 | 
						|
	puts("done\n");
 | 
						|
 | 
						|
	gd->env_valid = gd->env_valid == ENV_REDUND ? ENV_VALID : ENV_REDUND;
 | 
						|
 | 
						|
	printf("Valid environment: %d\n", (int)gd->env_valid);
 | 
						|
 | 
						|
 done:
 | 
						|
	if (saved_buffer)
 | 
						|
		free(saved_buffer);
 | 
						|
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
#endif /* CMD_SAVEENV */
 | 
						|
 | 
						|
static int env_sf_load(void)
 | 
						|
{
 | 
						|
	int ret;
 | 
						|
	int read1_fail, read2_fail;
 | 
						|
	env_t *tmp_env1, *tmp_env2;
 | 
						|
 | 
						|
	tmp_env1 = (env_t *)memalign(ARCH_DMA_MINALIGN,
 | 
						|
			CONFIG_ENV_SIZE);
 | 
						|
	tmp_env2 = (env_t *)memalign(ARCH_DMA_MINALIGN,
 | 
						|
			CONFIG_ENV_SIZE);
 | 
						|
	if (!tmp_env1 || !tmp_env2) {
 | 
						|
		set_default_env("malloc() failed", 0);
 | 
						|
		ret = -EIO;
 | 
						|
		goto out;
 | 
						|
	}
 | 
						|
 | 
						|
	ret = setup_flash_device();
 | 
						|
	if (ret)
 | 
						|
		goto out;
 | 
						|
 | 
						|
	read1_fail = spi_flash_read_env(env_flash, CONFIG_ENV_OFFSET,
 | 
						|
					CONFIG_ENV_SIZE, tmp_env1);
 | 
						|
	read2_fail = spi_flash_read_env(env_flash, CONFIG_ENV_OFFSET_REDUND,
 | 
						|
					CONFIG_ENV_SIZE, tmp_env2);
 | 
						|
 | 
						|
	ret = env_import_redund((char *)tmp_env1, read1_fail, (char *)tmp_env2,
 | 
						|
				read2_fail);
 | 
						|
 | 
						|
	spi_flash_free(env_flash);
 | 
						|
	env_flash = NULL;
 | 
						|
out:
 | 
						|
	free(tmp_env1);
 | 
						|
	free(tmp_env2);
 | 
						|
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
#else
 | 
						|
#ifdef CMD_SAVEENV
 | 
						|
static int env_sf_save(void)
 | 
						|
{
 | 
						|
	u32	saved_size, saved_offset, sector;
 | 
						|
	char	*saved_buffer = NULL;
 | 
						|
	int	ret = 1;
 | 
						|
	env_t	env_new;
 | 
						|
 | 
						|
	ret = setup_flash_device();
 | 
						|
	if (ret)
 | 
						|
		return ret;
 | 
						|
 | 
						|
	/* Is the sector larger than the env (i.e. embedded) */
 | 
						|
	if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {
 | 
						|
		saved_size = CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SIZE;
 | 
						|
		saved_offset = CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE;
 | 
						|
		saved_buffer = malloc(saved_size);
 | 
						|
		if (!saved_buffer)
 | 
						|
			goto done;
 | 
						|
 | 
						|
		ret = spi_flash_read_env(env_flash, saved_offset,
 | 
						|
					 saved_size, saved_buffer);
 | 
						|
		if (ret)
 | 
						|
			goto done;
 | 
						|
	}
 | 
						|
 | 
						|
	ret = env_export(&env_new);
 | 
						|
	if (ret)
 | 
						|
		goto done;
 | 
						|
 | 
						|
	sector = DIV_ROUND_UP(CONFIG_ENV_SIZE, CONFIG_ENV_SECT_SIZE);
 | 
						|
 | 
						|
	puts("Erasing SPI flash...");
 | 
						|
	ret = spi_flash_erase(env_flash, CONFIG_ENV_OFFSET,
 | 
						|
		sector * CONFIG_ENV_SECT_SIZE);
 | 
						|
	if (ret)
 | 
						|
		goto done;
 | 
						|
 | 
						|
	puts("Writing to SPI flash...");
 | 
						|
	ret = spi_flash_write(env_flash, CONFIG_ENV_OFFSET,
 | 
						|
		CONFIG_ENV_SIZE, &env_new);
 | 
						|
	if (ret)
 | 
						|
		goto done;
 | 
						|
 | 
						|
	if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {
 | 
						|
		ret = spi_flash_write(env_flash, saved_offset,
 | 
						|
			saved_size, saved_buffer);
 | 
						|
		if (ret)
 | 
						|
			goto done;
 | 
						|
	}
 | 
						|
 | 
						|
	ret = 0;
 | 
						|
	puts("done\n");
 | 
						|
 | 
						|
 done:
 | 
						|
	if (saved_buffer)
 | 
						|
		free(saved_buffer);
 | 
						|
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
#endif /* CMD_SAVEENV */
 | 
						|
 | 
						|
static int env_sf_load(void)
 | 
						|
{
 | 
						|
	int ret;
 | 
						|
	char *buf = NULL;
 | 
						|
 | 
						|
	buf = (char *)memalign(ARCH_DMA_MINALIGN, CONFIG_ENV_SIZE);
 | 
						|
	if (!buf) {
 | 
						|
		set_default_env("malloc() failed", 0);
 | 
						|
		return -EIO;
 | 
						|
	}
 | 
						|
 | 
						|
	ret = setup_flash_device();
 | 
						|
	if (ret)
 | 
						|
		goto out;
 | 
						|
 | 
						|
	ret = spi_flash_read_env(env_flash, CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
 | 
						|
				 buf);
 | 
						|
	if (ret) {
 | 
						|
		set_default_env("spi_flash_read_env() failed", 0);
 | 
						|
		goto err_read;
 | 
						|
	}
 | 
						|
 | 
						|
	ret = env_import(buf, 1);
 | 
						|
	if (!ret)
 | 
						|
		gd->env_valid = ENV_VALID;
 | 
						|
 | 
						|
err_read:
 | 
						|
	spi_flash_free(env_flash);
 | 
						|
	env_flash = NULL;
 | 
						|
out:
 | 
						|
	free(buf);
 | 
						|
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
#endif
 | 
						|
 | 
						|
#ifdef CONFIG_ENV_ADDR
 | 
						|
__weak void *env_sf_get_env_addr(void)
 | 
						|
{
 | 
						|
	return (void *)CONFIG_ENV_ADDR;
 | 
						|
}
 | 
						|
#endif
 | 
						|
 | 
						|
#if defined(INITENV) && defined(CONFIG_ENV_ADDR)
 | 
						|
static int env_sf_init(void)
 | 
						|
{
 | 
						|
	env_t *env_ptr = (env_t *)env_sf_get_env_addr();
 | 
						|
 | 
						|
	if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
 | 
						|
		gd->env_addr	= (ulong)&(env_ptr->data);
 | 
						|
		gd->env_valid	= 1;
 | 
						|
	} else {
 | 
						|
		gd->env_addr = (ulong)&default_environment[0];
 | 
						|
		gd->env_valid = 1;
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
#endif
 | 
						|
 | 
						|
U_BOOT_ENV_LOCATION(sf) = {
 | 
						|
	.location	= ENVL_SPI_FLASH,
 | 
						|
	ENV_NAME("SPI Flash")
 | 
						|
	.load		= env_sf_load,
 | 
						|
#ifdef CMD_SAVEENV
 | 
						|
	.save		= env_save_ptr(env_sf_save),
 | 
						|
#endif
 | 
						|
#if defined(INITENV) && defined(CONFIG_ENV_ADDR)
 | 
						|
	.init		= env_sf_init,
 | 
						|
#endif
 | 
						|
};
 |