eaf738559c
Sandbox unit tests in U-Boot proper load a test device tree to have some devices to work with. In order to do the same in SPL, we must enable SPL_OF_REAL. However, we already have SPL_OF_PLATDATA enabled. When generating platdata from a devicetree, it is expected that we will not need devicetree access functions (even though SPL_OF_CONTROL is enabled). This expectation does not hold for sandbox, so allow user control of SPL_OF_REAL. There are several places in the tree where conditions involving OF_PLATDATA or OF_REAL no longer function correctly when both of these options can be selected at the same time. Adjust these conditions accordingly. Signed-off-by: Sean Anderson <seanga2@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
141 lines
3.2 KiB
C
141 lines
3.2 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (c) 2015 Google, Inc
|
|
* Written by Simon Glass <sjg@chromium.org>
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <dm.h>
|
|
#include <errno.h>
|
|
#include <sysreset.h>
|
|
#include <asm/state.h>
|
|
#include <asm/test.h>
|
|
|
|
static int sandbox_warm_sysreset_request(struct udevice *dev,
|
|
enum sysreset_t type)
|
|
{
|
|
struct sandbox_state *state = state_get_current();
|
|
|
|
switch (type) {
|
|
case SYSRESET_WARM:
|
|
state->last_sysreset = type;
|
|
break;
|
|
default:
|
|
return -ENOSYS;
|
|
}
|
|
if (!state->sysreset_allowed[type])
|
|
return -EACCES;
|
|
|
|
return -EINPROGRESS;
|
|
}
|
|
|
|
int sandbox_warm_sysreset_get_status(struct udevice *dev, char *buf, int size)
|
|
{
|
|
strlcpy(buf, "Reset Status: WARM", size);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int sandbox_warm_sysreset_get_last(struct udevice *dev)
|
|
{
|
|
return SYSRESET_WARM;
|
|
}
|
|
|
|
static int sandbox_sysreset_request(struct udevice *dev, enum sysreset_t type)
|
|
{
|
|
struct sandbox_state *state = state_get_current();
|
|
|
|
/*
|
|
* If we have a device tree, the device we created from platform data
|
|
* (see the U_BOOT_DRVINFO() declaration below) should not do anything.
|
|
* If we are that device, return an error.
|
|
*/
|
|
if (state->fdt_fname && !dev_has_ofnode(dev))
|
|
return -ENODEV;
|
|
|
|
switch (type) {
|
|
case SYSRESET_COLD:
|
|
state->last_sysreset = type;
|
|
if (!state->sysreset_allowed[type])
|
|
return -EACCES;
|
|
sandbox_reset();
|
|
break;
|
|
case SYSRESET_POWER_OFF:
|
|
state->last_sysreset = type;
|
|
if (!state->sysreset_allowed[type])
|
|
return -EACCES;
|
|
sandbox_exit();
|
|
case SYSRESET_POWER:
|
|
if (!state->sysreset_allowed[type])
|
|
return -EACCES;
|
|
sandbox_exit();
|
|
default:
|
|
return -ENOSYS;
|
|
}
|
|
if (!state->sysreset_allowed[type])
|
|
return -EACCES;
|
|
|
|
return -EINPROGRESS;
|
|
}
|
|
|
|
int sandbox_sysreset_get_status(struct udevice *dev, char *buf, int size)
|
|
{
|
|
strlcpy(buf, "Reset Status: COLD", size);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int sandbox_sysreset_get_last(struct udevice *dev)
|
|
{
|
|
struct sandbox_state *state = state_get_current();
|
|
|
|
/*
|
|
* The first phase is a power reset, after that we assume we don't
|
|
* know.
|
|
*/
|
|
return state->jumped_fname ? SYSRESET_WARM : SYSRESET_POWER;
|
|
}
|
|
|
|
static struct sysreset_ops sandbox_sysreset_ops = {
|
|
.request = sandbox_sysreset_request,
|
|
.get_status = sandbox_sysreset_get_status,
|
|
.get_last = sandbox_sysreset_get_last,
|
|
};
|
|
|
|
static const struct udevice_id sandbox_sysreset_ids[] = {
|
|
{ .compatible = "sandbox,reset" },
|
|
{ }
|
|
};
|
|
|
|
U_BOOT_DRIVER(sysreset_sandbox) = {
|
|
.name = "sysreset_sandbox",
|
|
.id = UCLASS_SYSRESET,
|
|
.of_match = sandbox_sysreset_ids,
|
|
.ops = &sandbox_sysreset_ops,
|
|
};
|
|
|
|
static struct sysreset_ops sandbox_warm_sysreset_ops = {
|
|
.request = sandbox_warm_sysreset_request,
|
|
.get_status = sandbox_warm_sysreset_get_status,
|
|
.get_last = sandbox_warm_sysreset_get_last,
|
|
};
|
|
|
|
static const struct udevice_id sandbox_warm_sysreset_ids[] = {
|
|
{ .compatible = "sandbox,warm-reset" },
|
|
{ }
|
|
};
|
|
|
|
U_BOOT_DRIVER(warm_sysreset_sandbox) = {
|
|
.name = "warm_sysreset_sandbox",
|
|
.id = UCLASS_SYSRESET,
|
|
.of_match = sandbox_warm_sysreset_ids,
|
|
.ops = &sandbox_warm_sysreset_ops,
|
|
};
|
|
|
|
#if CONFIG_IS_ENABLED(OF_REAL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
|
|
/* This is here in case we don't have a device tree */
|
|
U_BOOT_DRVINFO(sysreset_sandbox_non_fdt) = {
|
|
.name = "sysreset_sandbox",
|
|
};
|
|
#endif
|