July 2021 - U-Boot

[PATCH 1/1] tpm2: Add a TPMv2 MMIO TIS driver
by Ilias Apalodimas 05 Jul '21

05 Jul '21

Add a TPMv2 TIS MMIO compatible driver. This useful for a couple of reasons. First of all we can support a TPMv2 on devices that have this hardware (e.g the newly added SynQuacer box). We can also use the driver in our QEMU setups and test the EFI TCG2 protocol, which cannot be tested with our sandbox. Ideally we should create an abstraction for all TIS compatible TPMs we support. Let's plug in the mmio driver first. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- drivers/tpm/Kconfig | 9 + drivers/tpm/Makefile | 1 + drivers/tpm/tpm2_tis_mmio.c | 516 ++++++++++++++++++++++++++++++++++++ drivers/tpm/tpm_tis.h | 8 + include/tpm-v2.h | 1 + 5 files changed, 535 insertions(+) create mode 100644 drivers/tpm/tpm2_tis_mmio.c diff --git a/drivers/tpm/Kconfig b/drivers/tpm/Kconfig index 9eebab5cfd90..406ee8716e1e 100644 --- a/drivers/tpm/Kconfig +++ b/drivers/tpm/Kconfig @@ -161,6 +161,15 @@ config TPM2_FTPM_TEE help This driver supports firmware TPM running in TEE. +config TPM2_MMIO + bool "MMIO based TPM2 Interface" + depends on TPM_V2 + help + This driver supports firmware TPM2.0 MMIO interface. + The usual TPM operations and the 'tpm' command can be used to talk + to the device using the standard TPM Interface Specification (TIS) + protocol. + endif # TPM_V2 endmenu diff --git a/drivers/tpm/Makefile b/drivers/tpm/Makefile index f64d20067f88..42fca3315bff 100644 --- a/drivers/tpm/Makefile +++ b/drivers/tpm/Makefile @@ -14,3 +14,4 @@ obj-$(CONFIG_$(SPL_TPL_)TPM2_CR50_I2C) += cr50_i2c.o obj-$(CONFIG_TPM2_TIS_SANDBOX) += tpm2_tis_sandbox.o obj-$(CONFIG_TPM2_TIS_SPI) += tpm2_tis_spi.o obj-$(CONFIG_TPM2_FTPM_TEE) += tpm2_ftpm_tee.o +obj-$(CONFIG_TPM2_MMIO) += tpm2_tis_mmio.o diff --git a/drivers/tpm/tpm2_tis_mmio.c b/drivers/tpm/tpm2_tis_mmio.c new file mode 100644 index 000000000000..422af4ff0b51 --- /dev/null +++ b/drivers/tpm/tpm2_tis_mmio.c @@ -0,0 +1,516 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * swtpm driver for TCG/TIS TPM (trusted platform module). + * Specifications at www.trustedcomputinggroup.org + */ + +#include <common.h> +#include <dm.h> +#include <log.h> +#include <tpm-v2.h> +#include <linux/bitops.h> +#include <linux/compiler.h> +#include <linux/delay.h> +#include <linux/errno.h> +#include <linux/types.h> +#include <linux/io.h> +#include <linux/unaligned/be_byteshift.h> +#include "tpm_tis.h" +#include "tpm_internal.h" + +enum tis_int_flags { + TPM_GLOBAL_INT_ENABLE = 0x80000000, + TPM_INTF_BURST_COUNT_STATIC = 0x100, + TPM_INTF_CMD_READY_INT = 0x080, + TPM_INTF_INT_EDGE_FALLING = 0x040, + TPM_INTF_INT_EDGE_RISING = 0x020, + TPM_INTF_INT_LEVEL_LOW = 0x010, + TPM_INTF_INT_LEVEL_HIGH = 0x008, + TPM_INTF_LOCALITY_CHANGE_INT = 0x004, + TPM_INTF_STS_VALID_INT = 0x002, + TPM_INTF_DATA_AVAIL_INT = 0x001, +}; + +struct tpm_tis_chip_data { + unsigned int pcr_count; + unsigned int pcr_select_min; + unsigned int time_before_first_cmd_ms; + void __iomem *iobase; +}; + +static int tpm_tis_read_bytes(struct udevice *udev, u32 addr, u16 len, + u8 *result) +{ + struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(udev); + + while (len--) + *result++ = ioread8(drv_data->iobase + addr); + return 0; +} + +static int tpm_tis_write_bytes(struct udevice *udev, u32 addr, u16 len, + const u8 *value) +{ + struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(udev); + + while (len--) + iowrite8(*value++, drv_data->iobase + addr); + return 0; +} + +static __maybe_unused int tpm_tis_read16(struct udevice *udev, u32 addr, + u16 *result) +{ + struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(udev); + + *result = ioread16(drv_data->iobase + addr); + return 0; +} + +static int tpm_tis_read32(struct udevice *udev, u32 addr, u32 *result) +{ + struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(udev); + + *result = ioread32(drv_data->iobase + addr); + return 0; +} + +static int tpm_tis_write32(struct udevice *udev, u32 addr, u32 value) +{ + struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(udev); + + iowrite32(value, drv_data->iobase + addr); + return 0; +} + +static int tpm_tis_get_desc(struct udevice *udev, char *buf, int size) +{ + struct tpm_chip *chip = dev_get_priv(udev); + + if (size < 80) + return -ENOSPC; + + return snprintf(buf, size, + "%s v2.0: VendorID 0x%04x, DeviceID 0x%04x, RevisionID 0x%02x [%s]", + udev->name, chip->vend_dev & 0xFFFF, + chip->vend_dev >> 16, chip->rid, + (chip->is_open ? "open" : "closed")); +} + +static bool tpm_tis_check_locality(struct udevice *udev, int loc) +{ + struct tpm_chip *chip = dev_get_priv(udev); + u8 locality; + + tpm_tis_read_bytes(udev, TPM_ACCESS(loc), 1, &locality); + if ((locality & (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID | + TPM_ACCESS_REQUEST_USE)) == + (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) { + chip->locality = loc; + return true; + } + + return false; +} + +static int tpm_tis_request_locality(struct udevice *udev, int loc) +{ + struct tpm_chip *chip = dev_get_priv(udev); + u8 buf = TPM_ACCESS_REQUEST_USE; + unsigned long start, stop; + + if (tpm_tis_check_locality(udev, loc)) + return 0; + + tpm_tis_write_bytes(udev, TPM_ACCESS(loc), 1, &buf); + start = get_timer(0); + stop = chip->timeout_a; + do { + if (tpm_tis_check_locality(udev, loc)) + return 0; + mdelay(TPM_TIMEOUT_MS); + } while (get_timer(start) < stop); + + return -1; +} + +static int tpm_tis_status(struct udevice *udev, u8 *status) +{ + struct tpm_chip *chip = dev_get_priv(udev); + + if (chip->locality < 0) + return -EINVAL; + + tpm_tis_read_bytes(udev, TPM_STS(chip->locality), 1, status); + + if ((*status & TPM_STS_READ_ZERO)) { + log_err("TPM returned invalid status\n"); + return -EINVAL; + } + + return 0; +} + +static int tpm_tis_release_locality(struct udevice *udev, int loc) +{ + struct tpm_chip *chip = dev_get_priv(udev); + u8 buf = TPM_ACCESS_ACTIVE_LOCALITY; + int ret; + + if (chip->locality < 0) + return 0; + + ret = tpm_tis_write_bytes(udev, TPM_ACCESS(loc), 1, &buf); + chip->locality = -1; + + return ret; +} + +static int tpm_tis_wait_for_stat(struct udevice *udev, u8 mask, + unsigned long timeout, u8 *status) +{ + unsigned long start = get_timer(0); + unsigned long stop = timeout; + int ret; + + do { + mdelay(TPM_TIMEOUT_MS); + ret = tpm_tis_status(udev, status); + if (ret) + return ret; + + if ((*status & mask) == mask) + return 0; + } while (get_timer(start) < stop); + + return -ETIMEDOUT; +} + +static int tpm_tis_get_burstcount(struct udevice *udev, size_t *burstcount) +{ + struct tpm_chip *chip = dev_get_priv(udev); + unsigned long start, stop; + u32 burst; + + if (chip->locality < 0) + return -EINVAL; + + /* wait for burstcount */ + start = get_timer(0); + /* + * This is the TPMv2 defined timeout. Change this in case you want to + * make the driver compatile to TPMv1 + */ + stop = chip->timeout_a; + do { + tpm_tis_read32(udev, TPM_STS(chip->locality), &burst); + *burstcount = (burst >> 8) & 0xFFFF; + if (*burstcount) + return 0; + + mdelay(TPM_TIMEOUT_MS); + } while (get_timer(start) < stop); + + return -ETIMEDOUT; +} + +static int tpm_tis_ready(struct udevice *udev) +{ + struct tpm_chip *chip = dev_get_priv(udev); + u8 data = TPM_STS_COMMAND_READY; + + /* This will cancel any pending commands */ + return tpm_tis_write_bytes(udev, TPM_STS(chip->locality), 1, &data); +} + +static int tpm_tis_send(struct udevice *udev, const u8 *buf, size_t len) +{ + struct tpm_chip *chip = dev_get_priv(udev); + size_t burstcnt, wr_size, sent = 0; + u8 data = TPM_STS_GO; + u8 status; + int ret; + + if (!chip) + return -ENODEV; + + ret = tpm_tis_request_locality(udev, 0); + if (ret < 0) + return -EBUSY; + + ret = tpm_tis_status(udev, &status); + if (ret) + goto release_locality; + + if (!(status & TPM_STS_COMMAND_READY)) { + ret = tpm_tis_ready(udev); + if (ret) { + log_err("Can't cancel previous TPM operation\n"); + goto release_locality; + } + ret = tpm_tis_wait_for_stat(udev, TPM_STS_COMMAND_READY, + chip->timeout_b, &status); + if (ret) { + log_err("TPM not ready\n"); + goto release_locality; + } + } + + while (len > 0) { + ret = tpm_tis_get_burstcount(udev, &burstcnt); + if (ret) + goto release_locality; + + wr_size = min(len, burstcnt); + ret = tpm_tis_write_bytes(udev, TPM_DATA_FIFO(chip->locality), + wr_size, buf + sent); + if (ret < 0) + goto release_locality; + + ret = tpm_tis_wait_for_stat(udev, TPM_STS_VALID, + chip->timeout_c, &status); + if (ret) + goto release_locality; + + sent += wr_size; + len -= wr_size; + /* make sure the TPM expects more data */ + if (len && !(status & TPM_STS_DATA_EXPECT)) { + ret = -EIO; + goto release_locality; + } + } + + /* + * Make a final check ensuring everything is ok and the TPM expects no + * more data + */ + ret = tpm_tis_wait_for_stat(udev, TPM_STS_VALID, chip->timeout_c, + &status); + if (ret) + goto release_locality; + + if (status & TPM_STS_DATA_EXPECT) { + ret = -EIO; + goto release_locality; + } + + ret = tpm_tis_write_bytes(udev, TPM_STS(chip->locality), 1, &data); + if (ret) + goto release_locality; + + tpm_tis_release_locality(udev, chip->locality); + return sent; + +release_locality: + tpm_tis_ready(udev); + tpm_tis_release_locality(udev, chip->locality); + + return ret; +} + +static int tpm_tis_recv_data(struct udevice *udev, u8 *buf, size_t count) +{ + struct tpm_chip *chip = dev_get_priv(udev); + int size = 0, len, ret; + size_t burstcnt; + u8 status; + + while (size < count && + tpm_tis_wait_for_stat(udev, TPM_STS_DATA_AVAIL | TPM_STS_VALID, + chip->timeout_c, &status) == 0) { + ret = tpm_tis_get_burstcount(udev, &burstcnt); + if (ret) + return burstcnt; + + len = min_t(int, burstcnt, count - size); + ret = tpm_tis_read_bytes(udev, TPM_DATA_FIFO(chip->locality), + len, buf + size); + if (ret < 0) + return ret; + + size += len; + } + + return size; +} + +static int tpm_tis_recv(struct udevice *udev, u8 *buf, size_t count) +{ + struct tpm_chip *chip = dev_get_priv(udev); + int ret; + int size, expected; + + if (!chip) + return -ENODEV; + + if (count < TPM_HEADER_SIZE) + return -E2BIG; + + ret = tpm_tis_request_locality(udev, 0); + if (ret < 0) + return -EBUSY; + + size = tpm_tis_recv_data(udev, buf, TPM_HEADER_SIZE); + if (size < TPM_HEADER_SIZE) { + log_err("TPM error, unable to read header\n"); + goto out; + } + + expected = get_unaligned_be32(buf + TPM_CMD_COUNT_OFFSET); + if (expected > count) { + size = -EIO; + log_warning("Too much data: %d > %zu\n", expected, count); + goto out; + } + + size += tpm_tis_recv_data(udev, &buf[TPM_HEADER_SIZE], + expected - TPM_HEADER_SIZE); + if (size < expected) { + log(LOGC_NONE, LOGL_ERR, + "TPM error, unable to read remaining bytes of result\n"); + size = -EIO; + goto out; + } + +out: + tpm_tis_ready(udev); + tpm_tis_release_locality(udev, chip->locality); + + return size; +} + +static int tpm_tis_probe(struct udevice *udev) +{ + struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(udev); + struct tpm_chip_priv *priv = dev_get_uclass_priv(udev); + struct tpm_chip *chip = dev_get_priv(udev); + int ret = 0; + fdt_addr_t ioaddr; + u32 tmp; + u64 sz; + + ioaddr = dev_read_addr(udev); + if (ioaddr == FDT_ADDR_T_NONE) + return -EINVAL; + + ret = dev_read_u64(udev, "reg", &sz); + if (ret) + return -EINVAL; + + drv_data->iobase = ioremap(ioaddr, sz); + log_info("Remapped TPM2 base: 0x%llx size: 0x%llx\n", ioaddr, sz); + + ret = tpm_tis_request_locality(udev, 0); + if (ret) + goto iounmap; + + chip->timeout_a = TIS_SHORT_TIMEOUT_MS; + chip->timeout_b = TIS_LONG_TIMEOUT_MS; + chip->timeout_c = TIS_SHORT_TIMEOUT_MS; + chip->timeout_d = TIS_SHORT_TIMEOUT_MS; + priv->pcr_count = drv_data->pcr_count; + priv->pcr_select_min = drv_data->pcr_select_min; + + /* Disable interrupts */ + tpm_tis_read32(udev, TPM_INT_ENABLE(chip->locality), &tmp); + tmp |= TPM_INTF_CMD_READY_INT | TPM_INTF_LOCALITY_CHANGE_INT | + TPM_INTF_DATA_AVAIL_INT | TPM_INTF_STS_VALID_INT; + tmp &= ~TPM_GLOBAL_INT_ENABLE; + tpm_tis_write32(udev, TPM_INT_ENABLE(chip->locality), tmp); + + /* + * Although the driver probably works with a TPMv1 our Kconfig + * limits the driver to TPMv2 only + */ + priv->version = TPM_V2; + tpm_tis_read_bytes(udev, TPM_RID(chip->locality), 1, &chip->rid); + tpm_tis_read32(udev, TPM_DID_VID(chip->locality), &chip->vend_dev); + + tpm_tis_release_locality(udev, chip->locality); + + return ret; + +iounmap: + iounmap(drv_data->iobase); + return -EINVAL; +} + +static int tpm_tis_remove(struct udevice *udev) +{ + struct tpm_chip *chip = dev_get_priv(udev); + struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(udev); + + iounmap(drv_data->iobase); + return tpm_tis_release_locality(udev, chip->locality); +} + +static int tpm_tis_cleanup(struct udevice *udev) +{ + struct tpm_chip *chip = dev_get_priv(udev); + + tpm_tis_ready(udev); + tpm_tis_release_locality(udev, chip->locality); + + return 0; +} + +static int tpm_tis_open(struct udevice *udev) +{ + struct tpm_chip *chip = dev_get_priv(udev); + int ret; + + if (chip->is_open) + return -EBUSY; + + ret = tpm_tis_request_locality(udev, 0); + if (!ret) + chip->is_open = 1; + + return ret; +} + +static int tpm_tis_close(struct udevice *udev) +{ + struct tpm_chip *chip = dev_get_priv(udev); + int ret = 0; + + if (chip->is_open) { + ret = tpm_tis_release_locality(udev, chip->locality); + chip->is_open = 0; + } + + return ret; +} + +static const struct tpm_ops tpm_tis_ops = { + .open = tpm_tis_open, + .close = tpm_tis_close, + .get_desc = tpm_tis_get_desc, + .send = tpm_tis_send, + .recv = tpm_tis_recv, + .cleanup = tpm_tis_cleanup, +}; + +static const struct tpm_tis_chip_data tpm_tis_std_chip_data = { + .pcr_count = 24, + .pcr_select_min = 3, +}; + +static const struct udevice_id tpm_tis_ids[] = { + { + .compatible = "tcg,tpm-tis-mmio", + .data = (ulong)&tpm_tis_std_chip_data, + }, + { } +}; + +U_BOOT_DRIVER(tpm_tis_mmio) = { + .name = "tpm_tis_mmio", + .id = UCLASS_TPM, + .of_match = tpm_tis_ids, + .ops = &tpm_tis_ops, + .probe = tpm_tis_probe, + .remove = tpm_tis_remove, + .priv_auto = sizeof(struct tpm_chip), +}; diff --git a/drivers/tpm/tpm_tis.h b/drivers/tpm/tpm_tis.h index 2a160fe05c9a..a561aa37d45a 100644 --- a/drivers/tpm/tpm_tis.h +++ b/drivers/tpm/tpm_tis.h @@ -29,6 +29,14 @@ enum tpm_timeout { SLEEP_DURATION_LONG_US = 210, }; +#define TPM_ACCESS(l) (0x0000 | ((l) << 12)) +#define TPM_INT_ENABLE(l) (0x0008 | ((l) << 12)) +#define TPM_STS(l) (0x0018 | ((l) << 12)) +#define TPM_DATA_FIFO(l) (0x0024 | ((l) << 12)) +#define TPM_DID_VID(l) (0x0F00 | ((l) << 12)) +#define TPM_RID(l) (0x0F04 | ((l) << 12)) +#define TPM_INTF_CAPS(l) (0x0014 | ((l) << 12)) + /* Size of external transmit buffer (used in tpm_transmit)*/ #define TPM_BUFSIZE 4096 diff --git a/include/tpm-v2.h b/include/tpm-v2.h index 7de7d6a57dca..b1710f28f5ad 100644 --- a/include/tpm-v2.h +++ b/include/tpm-v2.h @@ -360,6 +360,7 @@ enum { TPM_STS_DATA_EXPECT = 1 << 3, TPM_STS_SELF_TEST_DONE = 1 << 2, TPM_STS_RESPONSE_RETRY = 1 << 1, + TPM_STS_READ_ZERO = 0x23 }; enum { -- 2.32.0.rc0

3 4

[RFC] Start using guestfish for U-Boot fs tests
by Tom Rini 05 Jul '21

05 Jul '21

Hey all, I started taking a look at moving to guestfish to see if this resolves the latest problem I've run in to: https://source.denx.de/u-boot/u-boot/-/jobs/284763#L307 which I think is due to guestmount not being done in time for the test. So I started converting things to use guestfish directly: diff --git a/test/py/tests/test_fs/conftest.py b/test/py/tests/test_fs/conftest.py index 7325486cdb1a..e8899cfdd118 100644 --- a/test/py/tests/test_fs/conftest.py +++ b/test/py/tests/test_fs/conftest.py @@ -265,10 +265,10 @@ def fs_obj_basic(request, u_boot_config): fs_ubtype = fstype_to_ubname(fs_type) check_ubconfig(u_boot_config, fs_ubtype) - mount_dir = u_boot_config.persistent_data_dir + '/mnt' + data_dir = u_boot_config.persistent_data_dir + '/data' - small_file = mount_dir + '/' + SMALL_FILE - big_file = mount_dir + '/' + BIG_FILE + small_file = data_dir + '/' + SMALL_FILE + big_file = data_dir + '/' + BIG_FILE try: @@ -279,26 +279,14 @@ def fs_obj_basic(request, u_boot_config): return try: - check_call('mkdir -p %s' % mount_dir, shell=True) + check_call('mkdir -p %s' % data_dir, shell=True) except CalledProcessError as err: pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err)) call('rm -f %s' % fs_img, shell=True) return try: - # Mount the image so we can populate it. - mount_fs(fs_type, fs_img, mount_dir) - except CalledProcessError as err: - pytest.skip('Mounting to folder failed for filesystem: ' + fs_type + '. {}'.format(err)) - call('rmdir %s' % mount_dir, shell=True) - call('rm -f %s' % fs_img, shell=True) - return - - try: - # Create a subdirectory. - check_call('mkdir %s/SUBDIR' % mount_dir, shell=True) - - # Create big file in this image. + # Create big file to copy in to the image. # Note that we work only on the start 1MB, couple MBs in the 2GB range # and the last 1 MB of the huge 2.5GB file. # So, just put random values only in those areas. @@ -309,10 +297,14 @@ def fs_obj_basic(request, u_boot_config): check_call('dd if=/dev/urandom of=%s bs=1M count=1 seek=2499' % big_file, shell=True) - # Create a small file in this image. + # Create a small file to copy in to the image. check_call('dd if=/dev/urandom of=%s bs=1M count=1' % small_file, shell=True) + # Copy the files in to the image and add a subdirectory. + # Create a subdirectory. + check_call('guestfish add %s : run : mount /dev/sda / : mkdir /SUBDIR : copy-in %s %s /' + % (fs_img, big_file, small_file), shell=True) # Delete the small file copies which possibly are written as part of a # previous test. # check_call('rm -f "%s.w"' % MB1, shell=True) @@ -357,13 +349,11 @@ def fs_obj_basic(request, u_boot_config): except CalledProcessError as err: pytest.skip('Setup failed for filesystem: ' + fs_type + '. {}'.format(err)) - umount_fs(mount_dir) return else: - umount_fs(mount_dir) yield [fs_ubtype, fs_img, md5val] finally: - call('rmdir %s' % mount_dir, shell=True) + call('rmdir %s' % data_dir, shell=True) call('rm -f %s' % fs_img, shell=True) # The problem here is that a test run went from taking about 5 minutes to taking about 17 minutes. I can reduce this to closer to 15 minutes with LIBGUESTFS_BACKEND=direct and using libguestfs-make-fixed-appliance to make an appliance we reuse. But that's still too long to be usable. I'm hoping someone has some ideas here on how to improve things. -- Tom

4 13

[PATCH 1/1] smbios: error handling for invalid addresses
by Heinrich Schuchardt 05 Jul '21

05 Jul '21

SMBIOS tables only support 32bit addresses. If we don't have memory here handle the error gracefully: * on x86_64 fail to start U-Boot * during UEFI booting ignore the missing table Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/x86/lib/tables.c | 13 +++++++++++-- lib/efi_loader/efi_smbios.c | 15 ++++++++------- lib/smbios.c | 4 +++- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c index 1779bb3e11..ea834a5035 100644 --- a/arch/x86/lib/tables.c +++ b/arch/x86/lib/tables.c @@ -3,6 +3,8 @@ * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ +#define LOG_CATEGORY LOGC_BOARD + #include <common.h> #include <bloblist.h> #include <log.h> @@ -96,13 +98,20 @@ int write_tables(void) return log_msg_ret("bloblist", -ENOBUFS); } rom_table_end = table->write(rom_table_start); - rom_table_end = ALIGN(rom_table_end, ROM_TABLE_ALIGN); + if (!rom_table_end) { + log_err("Can't create configuration table %d\n", i); + return -EINTR; + } if (IS_ENABLED(CONFIG_SEABIOS)) { table_size = rom_table_end - rom_table_start; high_table = (u32)(ulong)high_table_malloc(table_size); if (high_table) { - table->write(high_table); + if (!table->write(high_table)) { + log_err("Can't create configuration table %d\n", + i); + return -EINTR; + } cfg_tables[i].start = high_table; cfg_tables[i].size = table_size; diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c index 719d3e8880..2eb4cb1c1a 100644 --- a/lib/efi_loader/efi_smbios.c +++ b/lib/efi_loader/efi_smbios.c @@ -5,6 +5,8 @@ * Copyright (c) 2016 Alexander Graf */ +#define LOG_CATEGORY LOGC_EFI + #include <common.h> #include <efi_loader.h> #include <log.h> @@ -43,14 +45,13 @@ efi_status_t efi_smbios_register(void) * Generate SMBIOS tables - we know that efi_allocate_pages() returns * a 4k-aligned address, so it is safe to assume that * write_smbios_table() will write the table at that address. - * - * Note that on sandbox, efi_allocate_pages() unfortunately returns a - * pointer even though it uses a uint64_t type. Convert it. */ assert(!(dmi_addr & 0xf)); dmi = (void *)(uintptr_t)dmi_addr; - write_smbios_table(map_to_sysmem(dmi)); - - /* And expose them to our EFI payload */ - return efi_install_configuration_table(&smbios_guid, dmi); + if (write_smbios_table(map_to_sysmem(dmi))) + /* Install SMBIOS information as configuration table */ + return efi_install_configuration_table(&smbios_guid, dmi); + efi_free_pages(dmi_addr, 1); + log_err("Cannot create SMBIOS table\n"); + return EFI_SUCCESS; } diff --git a/lib/smbios.c b/lib/smbios.c index 9eb226ec9f..cb65304470 100644 --- a/lib/smbios.c +++ b/lib/smbios.c @@ -497,7 +497,8 @@ ulong write_smbios_table(ulong addr) */ printf("WARNING: SMBIOS table_address overflow %llx\n", (unsigned long long)table_addr); - table_addr = 0; + addr = 0; + goto out; } se->struct_table_address = table_addr; @@ -508,6 +509,7 @@ ulong write_smbios_table(ulong addr) isize = sizeof(struct smbios_entry) - SMBIOS_INTERMEDIATE_OFFSET; se->intermediate_checksum = table_compute_checksum(istart, isize); se->checksum = table_compute_checksum(se, sizeof(struct smbios_entry)); +out: unmap_sysmem(se); return addr; -- 2.30.2

2 1

[PATCH 1/1] smbios: convert function descriptions to Sphinx style
by Heinrich Schuchardt 05 Jul '21

05 Jul '21

Use 'Return:' instead of '@return:'. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/smbios.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/smbios.c b/lib/smbios.c index 9eb226ec9f..26df2bf123 100644 --- a/lib/smbios.c +++ b/lib/smbios.c @@ -47,7 +47,7 @@ struct smbios_ctx { * @addr: start address to write the structure * @handle: the structure's handle, a unique 16-bit number * @ctx: context for writing the tables - * @return: size of the structure + * Return: size of the structure */ typedef int (*smbios_write_type)(ulong *addr, int handle, struct smbios_ctx *ctx); @@ -72,7 +72,7 @@ struct smbios_write_method { * * @ctx: SMBIOS context * @str: string to add - * @return: string number in the string area (1 or more) + * Return: string number in the string area (1 or more) */ static int smbios_add_string(struct smbios_ctx *ctx, const char *str) { @@ -111,7 +111,7 @@ static int smbios_add_string(struct smbios_ctx *ctx, const char *str) * * @ctx: context for writing the tables * @prop: property to write - * @return 0 if not found, else SMBIOS string number (1 or more) + * Return: 0 if not found, else SMBIOS string number (1 or more) */ static int smbios_add_prop_si(struct smbios_ctx *ctx, const char *prop, int sysinfo_id) @@ -139,7 +139,7 @@ static int smbios_add_prop_si(struct smbios_ctx *ctx, const char *prop, * smbios_add_prop() - Add a property from the devicetree * * @prop: property to write - * @return 0 if not found, else SMBIOS string number (1 or more) + * Return: 0 if not found, else SMBIOS string number (1 or more) */ static int smbios_add_prop(struct smbios_ctx *ctx, const char *prop) { @@ -187,7 +187,7 @@ int smbios_update_version(const char *version) * This computes the size of the string area including the string terminator. * * @ctx: SMBIOS context - * @return: string area size + * Return: string area size */ static int smbios_string_table_len(const struct smbios_ctx *ctx) { -- 2.30.2

2 1

[PATCH] rockchip: rk3328: fix booting error for nanopi-r2s
by jason416 05 Jul '21

05 Jul '21

devices can not boot properly during SPL stage by using microSD card which model is SDSQUNC-032G-ZN6MA. U-Boot SPL 2021.04 (Jul 02 2021 - 19:50:12 +0000) Trying to boot from MMC1 mmc_load_image_raw_sector: mmc block read error SPL: failed to boot from all boot devices change dts and config to support booting from ultra high speed microSD card on nanopi-r2s. Signed-off-by: jason416 <jason416.gm(a)gmail.com> --- arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 4 ++++ arch/arm/dts/rk3328-nanopi-r2s.dts | 2 +- configs/nanopi-r2s-rk3328_defconfig | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi index 9e2ced1541..d5469748a2 100644 --- a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi +++ b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi @@ -33,6 +33,10 @@ u-boot,dm-spl; }; +&vcc_io_sdio { + u-boot,dm-spl; +}; + &gmac2io { snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; snps,reset-active-low; diff --git a/arch/arm/dts/rk3328-nanopi-r2s.dts b/arch/arm/dts/rk3328-nanopi-r2s.dts index 5445c5cb3d..452e4764e6 100644 --- a/arch/arm/dts/rk3328-nanopi-r2s.dts +++ b/arch/arm/dts/rk3328-nanopi-r2s.dts @@ -323,7 +323,7 @@ bus-width = <4>; cap-sd-highspeed; disable-wp; - pinctrl-0 = <&sdmmc0_clk>, <&sdmmc0_cmd>, <&sdmmc0_dectn>, <&sdmmc0_bus4>; + pinctrl-0 = <&sdmmc0_clk>, <&sdmmc0_cmd>, <&sdmmc0_dectn>, <&sdmmc0_bus4>, <&sdmmc0m1_gpio>; pinctrl-names = "default"; sd-uhs-sdr12; sd-uhs-sdr25; diff --git a/configs/nanopi-r2s-rk3328_defconfig b/configs/nanopi-r2s-rk3328_defconfig index 52996266a1..a7969bd7ab 100644 --- a/configs/nanopi-r2s-rk3328_defconfig +++ b/configs/nanopi-r2s-rk3328_defconfig @@ -56,6 +56,10 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_SPL_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_SPL_MMC_UHS_SUPPORT=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_SF_DEFAULT_SPEED=20000000 -- 2.17.1

1 0

[PATCH] sysinfo: rcar3: Add Renesas R-Car Gen3 sysinfo driver
by Marek Vasut 05 Jul '21

05 Jul '21

The Renesas R-Car Gen3 development kits contain board ID EEPROM. This driver parses out the board ID and revision out of that EEPROM and exports it e.g. for the board-info print on boot. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Sean Anderson <sean.anderson(a)seco.com> Cc: Simon Glass <sjg(a)chromium.org> --- drivers/sysinfo/Kconfig | 7 ++ drivers/sysinfo/Makefile | 1 + drivers/sysinfo/rcar3.c | 197 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 205 insertions(+) create mode 100644 drivers/sysinfo/rcar3.c diff --git a/drivers/sysinfo/Kconfig b/drivers/sysinfo/Kconfig index 381dcd8844..e35f7cb179 100644 --- a/drivers/sysinfo/Kconfig +++ b/drivers/sysinfo/Kconfig @@ -17,6 +17,13 @@ config SYSINFO_GAZERBEAM help Support querying device information for the gdsys Gazerbeam board. +config SYSINFO_RCAR3 + bool "Enable sysinfo driver for the Renesas R-Car Gen3" + depends on RCAR_GEN3 && I2C_EEPROM + default y if RCAR_GEN3 + help + Support querying SoC version information for Renesas R-Car Gen3. + config SYSINFO_SANDBOX bool "Enable sysinfo driver for the Sandbox board" help diff --git a/drivers/sysinfo/Makefile b/drivers/sysinfo/Makefile index d9f708b7ea..680dde77fe 100644 --- a/drivers/sysinfo/Makefile +++ b/drivers/sysinfo/Makefile @@ -5,5 +5,6 @@ obj-y += sysinfo-uclass.o obj-$(CONFIG_SYSINFO_GAZERBEAM) += gazerbeam.o obj-$(CONFIG_SYSINFO_GPIO) += gpio.o +obj-$(CONFIG_SYSINFO_RCAR3) += rcar3.o obj-$(CONFIG_SYSINFO_SANDBOX) += sandbox.o obj-$(CONFIG_SYSINFO_SMBIOS) += smbios.o diff --git a/drivers/sysinfo/rcar3.c b/drivers/sysinfo/rcar3.c new file mode 100644 index 0000000000..c2f4ddfbbe --- /dev/null +++ b/drivers/sysinfo/rcar3.c @@ -0,0 +1,197 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2021 Marek Vasut <marek.vasut+renesas(a)gmail.com> + */ + +#include <common.h> +#include <dm.h> +#include <i2c_eeprom.h> +#include <log.h> +#include <sysinfo.h> + +#define BOARD_CODE_MASK 0xF8 +#define BOARD_REV_MASK 0x07 +#define BOARD_CODE_SHIFT 0x03 + +#define BOARD_SALVATOR_X 0x0 +#define BOARD_KRIEK 0x1 +#define BOARD_STARTER_KIT 0x2 +#define BOARD_SALVATOR_XS 0x4 +#define BOARD_EBISU 0x8 +#define BOARD_STARTER_KIT_PRE 0xB +#define BOARD_EBISU_4D 0xD +#define BOARD_DRAAK 0xE +#define BOARD_EAGLE 0xF + +/** + * struct sysinfo_rcar_priv - sysinfo private data + * @boardname: board model and revision + * @val: board ID value from eeprom + */ +struct sysinfo_rcar_priv { + char boardmodel[64]; + u8 val; +}; + +static int sysinfo_rcar_detect(struct udevice *dev) +{ + struct sysinfo_rcar_priv *priv = dev_get_priv(dev); + + return priv->val == 0xff; +} + +static int sysinfo_rcar_get_str(struct udevice *dev, int id, size_t size, char *val) +{ + struct sysinfo_rcar_priv *priv = dev_get_priv(dev); + + switch (id) { + case SYSINFO_ID_BOARD_MODEL: + strncpy(val, priv->boardmodel, size); + val[size - 1] = '\0'; + return 0; + default: + return -EINVAL; + }; +} + +static const struct sysinfo_ops sysinfo_rcar_ops = { + .detect = sysinfo_rcar_detect, + .get_str = sysinfo_rcar_get_str, +}; + +static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv) +{ + const u8 board_id = (priv->val & BOARD_CODE_MASK) >> BOARD_CODE_SHIFT; + const u8 board_rev = priv->val & BOARD_REV_MASK; + bool salvator_xs = false; + bool ebisu_4d = false; + char rev_major = '?'; + char rev_minor = '?'; + + switch (board_id) { + case BOARD_SALVATOR_XS: + salvator_xs = true; + fallthrough; + case BOARD_SALVATOR_X: + if (!(board_rev & ~1)) { /* Only rev 0 and 1 is valid */ + rev_major = '1'; + rev_minor = '0' + (board_rev & BIT(0)); + } + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas Salvator-X%s board rev %c.%c", + salvator_xs ? "S" : "", rev_major, rev_minor); + return; + case BOARD_STARTER_KIT: + if (!(board_rev & ~1)) { /* Only rev 0 and 1 is valid */ + rev_major = (board_rev & BIT(0)) ? '3' : '1'; + rev_minor = '0'; + } + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas Starter Kit board rev %c.%c", + rev_major, rev_minor); + return; + case BOARD_STARTER_KIT_PRE: + if (!(board_rev & ~3)) { /* Only rev 0..3 is valid */ + rev_major = (board_rev & BIT(1)) ? '2' : '1'; + rev_minor = (board_rev == 3) ? '1' : '0'; + } + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas Starter Kit Premier board rev %c.%c", + rev_major, rev_minor); + return; + case BOARD_EAGLE: + if (!board_rev) { /* Only rev 0 is valid */ + rev_major = '1'; + rev_minor = '0'; + } + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas Eagle board rev %c.%c", + rev_major, rev_minor); + return; + case BOARD_EBISU_4D: + ebisu_4d = true; + fallthrough; + case BOARD_EBISU: + if (!board_rev) { /* Only rev 0 is valid */ + rev_major = '1'; + rev_minor = '0'; + } + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas Ebisu%s board rev %c.%c", + ebisu_4d ? "-4D" : "", rev_major, rev_minor); + return; + case BOARD_DRAAK: + if (!board_rev) { /* Only rev 0 is valid */ + rev_major = '1'; + rev_minor = '0'; + } + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas Draak board rev %c.%c", + rev_major, rev_minor); + return; + case BOARD_KRIEK: + if (!board_rev) { /* Only rev 0 is valid */ + rev_major = '1'; + rev_minor = '0'; + } + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas Kriek board rev %c.%c", + rev_major, rev_minor); + return; + default: + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas -Unknown- board rev ?.?"); + priv->val = 0xff; + return; + } +} + +static int sysinfo_rcar_probe(struct udevice *dev) +{ + struct sysinfo_rcar_priv *priv = dev_get_priv(dev); + struct ofnode_phandle_args phandle_args; + struct udevice *i2c_eeprom; + u32 offset; + int ret; + + offset = dev_read_u32_default(dev, "offset", 0x70); + + ret = dev_read_phandle_with_args(dev, "i2c-eeprom", NULL, + 0, 0, &phandle_args); + if (ret) { + debug("%s: i2c-eeprom backing device not specified\n", + dev->name); + return ret; + } + + ret = uclass_get_device_by_ofnode(UCLASS_I2C_EEPROM, phandle_args.node, + &i2c_eeprom); + if (ret) { + debug("%s: could not get backing device\n", dev->name); + return ret; + } + + ret = i2c_eeprom_read(i2c_eeprom, offset, &priv->val, 1); + if (ret < 0) { + debug("%s: read failed\n", __func__); + return -EIO; + } + + sysinfo_rcar_parse(priv); + + return 0; +} + +static const struct udevice_id sysinfo_rcar_ids[] = { + { .compatible = "renesas,rcar-sysinfo" }, + { /* sentinel */ } +}; + +U_BOOT_DRIVER(sysinfo_rcar) = { + .name = "sysinfo_rcar", + .id = UCLASS_SYSINFO, + .of_match = sysinfo_rcar_ids, + .ops = &sysinfo_rcar_ops, + .priv_auto = sizeof(struct sysinfo_rcar_priv), + .probe = sysinfo_rcar_probe, +}; -- 2.30.2

2 1

[PATCH 0/3] cmd: setexpr: add fmt format string operation
by Roland Gaudig 05 Jul '21

05 Jul '21

From: Roland Gaudig <roland.gaudig(a)weidmueller.com> This patch series is the revised version of the previos proposal [PATCH v1 0/1] cmd: setexpr: add dec operation for converting variable to decimal In contrast to version 1, the "dec" operator has been replaced by a more flexible "fmt" operator to handle format strings. U-Boot uses almost everywhere hexadecimal numbers. But some bootargs passed to Linux are expecting decimal numbers. As long as the values are in the range 0 to 9 it is sufficient to just strip 0x from the number. But for greater values a method for converting numbers to decimal is needed. This patch adds C like format string capabilities to the setexpr command. Here are some examples: => setexpr foo fmt %d 0x100 => echo $foo 256 => => setexpr foo fmt 0x%08x 63 => echo $foo 0x00000063 => => setexpr foo fmt %%%o 8 => echo $foo %10 => In contrast to the original C format strings the number of parameters is limited to one. As the get_arg() function returns unsigned long type, the format string commands are limited to those which are operating on unsigned long type. Patman insisted adding a maintainer to for the doc/usage/setexpr.rst, but I am not sure if chose the correct section and person. Roland Gaudig (3): cmd: setexpr: add fmt format string operation doc: usage: add description for setexpr command test: cmd: setexpr: add tests for format string operations MAINTAINERS | 6 ++ cmd/setexpr.c | 102 ++++++++++++++++++++++++++++++++- doc/usage/index.rst | 1 + doc/usage/setexpr.rst | 130 ++++++++++++++++++++++++++++++++++++++++++ test/cmd/setexpr.c | 33 +++++++++++ 5 files changed, 271 insertions(+), 1 deletion(-) create mode 100644 doc/usage/setexpr.rst -- 2.25.1

8 18

[PATCH v2 00/10] handling all DM watchdogs in watchdog_reset()
by Rasmus Villemoes 05 Jul '21

05 Jul '21

This series is an attempt at expanding the wdt-uclass provided watchdog_reset() to handle all DM watchdogs, not just the first one. As a sort of nice side effect, it turns out that doing that makes wdt-uclass fit better into the uclass model, in that we now do the work that was previously done in the ad hoc initr_watchdog for one device in .pre_probe and .post_probe hooks instead. It also includes a patch adding a driver for a gpio-petted watchdog device (and a sandbox test of that) - it is included here because that also gives a relatively easy way to have more than one (kind of) watchdog device in the sandbox, which is then used at the end to test that watchdog_reset() behaves as expected. It's called v2 merely because the gpio driver and associated test has been sent before; all but those two patches (8 and 9) are new. As for the changes in those compared to the first submission, they are mostly cosmetic - functionally, the only change is that it now requires the always-running property in DT. Rasmus Villemoes (10): watchdog: wdt-uclass.c: use wdt_start() in wdt_expire_now() watchdog: wdt-uclass.c: introduce struct wdt_priv watchdog: wdt-uclass.c: neaten UCLASS_DRIVER definition watchdog: wdt-uclass.c: refactor initr_watchdog() watchdog: wdt-uclass.c: keep track of each device's running state sandbox: disable CONFIG_WATCHDOG_AUTOSTART watchdog: wdt-uclass.c: handle all DM watchdogs in watchdog_reset() watchdog: add gpio watchdog driver sandbox: add test of wdt_gpio driver sandbox: add test of wdt-uclass' watchdog_reset() arch/sandbox/dts/test.dts | 8 + configs/sandbox64_defconfig | 2 + configs/sandbox_defconfig | 2 + .../watchdog/gpio-wdt.txt | 19 +++ drivers/watchdog/Kconfig | 9 + drivers/watchdog/Makefile | 1 + drivers/watchdog/gpio_wdt.c | 69 ++++++++ drivers/watchdog/wdt-uclass.c | 154 +++++++++++------- include/asm-generic/global_data.h | 6 - test/dm/wdt.c | 90 +++++++++- 10 files changed, 298 insertions(+), 62 deletions(-) create mode 100644 doc/device-tree-bindings/watchdog/gpio-wdt.txt create mode 100644 drivers/watchdog/gpio_wdt.c -- 2.31.1

3 39

[PATCH] arm64: rk3399: Optimize performance and cleanup
by Xiaobo Tian 05 Jul '21

05 Jul '21

1. Delete unused Ethernet aliases 2. Modify the label of the LEDS lamp 3. Inherit the definition of the system status lamp in DSTI 4. Removed error 3.3V incorrect use of 5V supply Signed-off-by: Xiaobo Tian <peterwillcn(a)gmail.com> --- arch/arm/dts/rk3399-nanopi-r4s.dts | 40 +++++++++--------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts index 6f2cf17bf1..a85f4bf491 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s.dts +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -17,10 +17,6 @@ model = "FriendlyElec NanoPi R4S"; compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399"; - aliases { - ethernet1 = &r8169; - }; - vdd_5v: vdd-5v { compatible = "regulator-fixed"; regulator-name = "vdd_5v"; @@ -30,6 +26,10 @@ fan: pwm-fan { compatible = "pwm-fan"; + /* + * With 20KHz PWM and an EVERCOOL EC4007H12SA fan, these levels + * work out to 0, ~1200, ~3000, and 5000RPM respectively. + */ cooling-levels = <0 12 18 255>; #cooling-cells = <2>; fan-supply = <&vdd_5v>; @@ -73,40 +73,32 @@ status = "disabled"; }; +&i2c4 { + status = "disabled"; +}; + &leds { lan_led: led-1 { gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; - label = "nanopi-r4s:green:lan"; + label = "green:lan"; }; wan_led: led-2 { gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; - label = "nanopi-r4s:green:wan"; + label = "green:wan"; }; }; &leds_gpio { rockchip,pins = - <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, - <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, - <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; + <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>, + <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; }; &pcie0 { max-link-speed = <1>; num-lanes = <1>; vpcie3v3-supply = <&vcc3v3_sys>; - - pcie@0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - - r8169: pcie@0,0 { - reg = <0x000000 0 0 0 0>; - local-mac-address = [ 00 00 00 00 00 00 ]; - }; - }; }; &sdhci { @@ -117,10 +109,6 @@ status = "disabled"; }; -&sdmmc { - host-index-min = <1>; -}; - &u2phy0_host { phy-supply = <&vdd_5v>; }; @@ -132,7 +120,3 @@ &usbdrd_dwc3_0 { dr_mode = "host"; }; - -&vcc3v3_sys { - vin-supply = <&vcc5v0_sys>; -}; -- 2.32.0

1 0

[PATCH] arm64: rk3399: Optimize performance and cleanup
by Xiaobo Tian 05 Jul '21

05 Jul '21

Signed-off-by: Xiaobo Tian <peterwillcn(a)gmail.com> --- arch/arm/dts/rk3399-nanopi-r4s.dts | 40 +++++++++--------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts index 6f2cf17bf1..a85f4bf491 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s.dts +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -17,10 +17,6 @@ model = "FriendlyElec NanoPi R4S"; compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399"; - aliases { - ethernet1 = &r8169; - }; - vdd_5v: vdd-5v { compatible = "regulator-fixed"; regulator-name = "vdd_5v"; @@ -30,6 +26,10 @@ fan: pwm-fan { compatible = "pwm-fan"; + /* + * With 20KHz PWM and an EVERCOOL EC4007H12SA fan, these levels + * work out to 0, ~1200, ~3000, and 5000RPM respectively. + */ cooling-levels = <0 12 18 255>; #cooling-cells = <2>; fan-supply = <&vdd_5v>; @@ -73,40 +73,32 @@ status = "disabled"; }; +&i2c4 { + status = "disabled"; +}; + &leds { lan_led: led-1 { gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; - label = "nanopi-r4s:green:lan"; + label = "green:lan"; }; wan_led: led-2 { gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; - label = "nanopi-r4s:green:wan"; + label = "green:wan"; }; }; &leds_gpio { rockchip,pins = - <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, - <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, - <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; + <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>, + <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; }; &pcie0 { max-link-speed = <1>; num-lanes = <1>; vpcie3v3-supply = <&vcc3v3_sys>; - - pcie@0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - - r8169: pcie@0,0 { - reg = <0x000000 0 0 0 0>; - local-mac-address = [ 00 00 00 00 00 00 ]; - }; - }; }; &sdhci { @@ -117,10 +109,6 @@ status = "disabled"; }; -&sdmmc { - host-index-min = <1>; -}; - &u2phy0_host { phy-supply = <&vdd_5v>; }; @@ -132,7 +120,3 @@ &usbdrd_dwc3_0 { dr_mode = "host"; }; - -&vcc3v3_sys { - vin-supply = <&vcc5v0_sys>; -}; -- 2.32.0

2 1