January 2022 - U-Boot

[PATCH 1/1] configs: disable UEFI for Colibri VF610
by Heinrich Schuchardt 25 Jan '22

25 Jan '22

The size of the board file is limited to 520192 bytes. This conflicts with the size requirement for the UEFI code. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- configs/colibri_vf_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 350e1cf30e..c0a7e11a62 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -106,4 +106,4 @@ CONFIG_VIDEO_FSL_DCU_FB=y CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y -# CONFIG_EFI_UNICODE_CAPITALIZATION is not set +# CONFIG_EFI_LOADER is not set -- 2.33.1

2 1

[RFC PATCH] efi_loader: clean up uefi secure boot image verification logic
by Ilias Apalodimas 25 Jan '22

25 Jan '22

From: Ilias Apalodimas <apalos(a)gmail.com> We currently distinguish between signed and non signed PE/COFF executables while trying to authenticate signatures and/or sha256 hashes in db and dbx. That code duplication can be avoided. On sha256 hashes we don't really care if the image is signed or not. The logic can be implemented in 1. Is the sha256 of the image in dbx 2. Is the image signed with a certificate that's found in db and not in dbx 3. The image carries a cert which is signed by a cert in db (and not in dbx, and the image can be verified against the former) 4. Is the sha256 of the image in db So weed out the 'special' case handling unsigned images. While at it move the checking of a hash outside the certificate verification loop which isn't really needed and check for the hash only once. Also allow a mix of signatures and hashes in db instead of explicitly breaking out the sha verification loop if a signature happens to be added first. It's worth noting that (2) only works if the certificate is self signed, but that canb be fixed in a following patch. Signed-off-by: Ilias Apalodimas <apalos(a)gmail.com> --- lib/efi_loader/efi_image_loader.c | 84 ++++++------------------------- lib/efi_loader/efi_signature.c | 2 +- 2 files changed, 15 insertions(+), 71 deletions(-) diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 255613eb72ba..53d54ca42f5c 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -516,63 +516,16 @@ err: } #ifdef CONFIG_EFI_SECURE_BOOT -/** - * efi_image_unsigned_authenticate() - authenticate unsigned image with - * SHA256 hash - * @regs: List of regions to be verified - * - * If an image is not signed, it doesn't have a signature. In this case, - * its message digest is calculated and it will be compared with one of - * hash values stored in signature databases. - * - * Return: true if authenticated, false if not - */ -static bool efi_image_unsigned_authenticate(struct efi_image_regions *regs) -{ - struct efi_signature_store *db = NULL, *dbx = NULL; - bool ret = false; - - dbx = efi_sigstore_parse_sigdb(L"dbx"); - if (!dbx) { - EFI_PRINT("Getting signature database(dbx) failed\n"); - goto out; - } - - db = efi_sigstore_parse_sigdb(L"db"); - if (!db) { - EFI_PRINT("Getting signature database(db) failed\n"); - goto out; - } - - /* try black-list first */ - if (efi_signature_lookup_digest(regs, dbx)) { - EFI_PRINT("Image is not signed and its digest found in \"dbx\"\n"); - goto out; - } - - /* try white-list */ - if (efi_signature_lookup_digest(regs, db)) - ret = true; - else - EFI_PRINT("Image is not signed and its digest not found in \"db\" or \"dbx\"\n"); - -out: - efi_sigstore_free(db); - efi_sigstore_free(dbx); - - return ret; -} - /** * efi_image_authenticate() - verify a signature of signed image * @efi: Pointer to image * @efi_size: Size of @efi * - * A signed image should have its signature stored in a table of its PE header. + * An image should have its signature stored in a table of its PE header. * So if an image is signed and only if if its signature is verified using - * signature databases, an image is authenticated. - * If an image is not signed, its validity is checked by using - * efi_image_unsigned_authenticated(). + * signature databases or if it's sha256 is found in db an image is + * authenticated. + * * TODO: * When AuditMode==0, if the image's signature is not found in * the authorized database, or is found in the forbidden database, @@ -608,14 +561,7 @@ static bool efi_image_authenticate(void *efi, size_t efi_size) if (!efi_image_parse(new_efi, efi_size, &regs, &wincerts, &wincerts_len)) { EFI_PRINT("Parsing PE executable image failed\n"); - goto err; - } - - if (!wincerts) { - /* The image is not signed */ - ret = efi_image_unsigned_authenticate(regs); - - goto err; + goto out; } /* @@ -624,18 +570,18 @@ static bool efi_image_authenticate(void *efi, size_t efi_size) db = efi_sigstore_parse_sigdb(L"db"); if (!db) { EFI_PRINT("Getting signature database(db) failed\n"); - goto err; + goto out; } dbx = efi_sigstore_parse_sigdb(L"dbx"); if (!dbx) { EFI_PRINT("Getting signature database(dbx) failed\n"); - goto err; + goto out; } if (efi_signature_lookup_digest(regs, dbx)) { EFI_PRINT("Image's digest was found in \"dbx\"\n"); - goto err; + goto out; } /* @@ -729,20 +675,18 @@ static bool efi_image_authenticate(void *efi, size_t efi_size) /* try white-list */ if (efi_signature_verify(regs, msg, db, dbx)) { ret = true; - break; + goto out; } EFI_PRINT("Signature was not verified by \"db\"\n"); - if (efi_signature_lookup_digest(regs, db)) { - ret = true; - break; - } - - EFI_PRINT("Image's digest was not found in \"db\" or \"dbx\"\n"); } -err: + if (efi_signature_lookup_digest(regs, db)) + ret = true; + else + EFI_PRINT("Image's digest was not found in \"db\" or \"dbx\"\n"); +out: efi_sigstore_free(db); efi_sigstore_free(dbx); pkcs7_free_message(msg); diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c index 3243e2c60de0..8fa82f8cea4c 100644 --- a/lib/efi_loader/efi_signature.c +++ b/lib/efi_loader/efi_signature.c @@ -176,7 +176,7 @@ bool efi_signature_lookup_digest(struct efi_image_regions *regs, if (guidcmp(&siglist->sig_type, &efi_guid_sha256)) { EFI_PRINT("Digest algorithm is not supported: %pUs\n", &siglist->sig_type); - break; + continue; } if (!efi_hash_regions(regs->reg, regs->num, &hash, &size)) { -- 2.30.2

3 3

Re: [PATCH 3/3] riscv: qemu: Implement is_flash_available() for MTD NOR
by Rick Chen 25 Jan '22

25 Jan '22

> From: Anup Patel <apatel(a)ventanamicro.com> > Sent: Saturday, January 15, 2022 12:20 AM > To: Rick Jian-Zhi Chen(陳建志) <rick(a)andestech.com>; Bin Meng <bmeng.cn(a)gmail.com> > Cc: Atish Patra <atishp(a)atishpatra.org>; Alistair Francis <Alistair.Francis(a)wdc.com>; Anup Patel <anup(a)brainfault.org>; U-Boot Mailing List <u-boot(a)lists.denx.de>; Anup Patel <apatel(a)ventanamicro.com> > Subject: [PATCH 3/3] riscv: qemu: Implement is_flash_available() for MTD NOR > > Currently, if MTD NOR is enabled then U-Boot tries to issue flash commands even when CFI flash DT node is not present. This causes access fault on RISC-V emulators or ISS which do not emulate CFI flash. To handle this issue, we implement is_flash_available() for qemu-riscv board which will return 1 only if CFI flash DT node is present. > > Fixes: d248627f9d42 ("riscv: qemu: Enable MTD NOR flash support") > Signed-off-by: Anup Patel <apatel(a)ventanamicro.com> > --- > board/emulation/qemu-riscv/qemu-riscv.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) Reviewed-by: Rick Chen <rick(a)andestech.com>

1 0

Re: [PATCH 2/3] riscv: qemu: Enable HTIF console support
by Rick Chen 25 Jan '22

25 Jan '22

> From: Anup Patel <apatel(a)ventanamicro.com> > Sent: Saturday, January 15, 2022 12:20 AM > To: Rick Jian-Zhi Chen(陳建志) <rick(a)andestech.com>; Bin Meng <bmeng.cn(a)gmail.com> > Cc: Atish Patra <atishp(a)atishpatra.org>; Alistair Francis <Alistair.Francis(a)wdc.com>; Anup Patel <anup(a)brainfault.org>; U-Boot Mailing List <u-boot(a)lists.denx.de>; Anup Patel <apatel(a)ventanamicro.com>; Philipp Tomsich <philipp.tomsich(a)vrull.eu> > Subject: [PATCH 2/3] riscv: qemu: Enable HTIF console support > > Enable support for HTIF console so that we can use QEMU RISC-V U-Boot on RISC-V emulators and ISS having it. > > Signed-off-by: Anup Patel <apatel(a)ventanamicro.com> > Reviewed-by: Philipp Tomsich <philipp.tomsich(a)vrull.eu> > --- > board/emulation/qemu-riscv/Kconfig | 1 + > 1 file changed, 1 insertion(+) Reviewed-by: Rick Chen <rick(a)andestech.com>

1 0

Re: [PATCH 1/3] serial: Add RISC-V HTIF console driver
by Rick Chen 25 Jan '22

25 Jan '22

> From: Anup Patel <apatel(a)ventanamicro.com> > Sent: Saturday, January 15, 2022 12:20 AM > To: Rick Jian-Zhi Chen(陳建志) <rick(a)andestech.com>; Bin Meng <bmeng.cn(a)gmail.com> > Cc: Atish Patra <atishp(a)atishpatra.org>; Alistair Francis <Alistair.Francis(a)wdc.com>; Anup Patel <anup(a)brainfault.org>; U-Boot Mailing List <u-boot(a)lists.denx.de>; Anup Patel <apatel(a)ventanamicro.com>; Philipp Tomsich <philipp.tomsich(a)vrull.eu> > Subject: [PATCH 1/3] serial: Add RISC-V HTIF console driver > > Quite a few RISC-V emulators and ISS (including Spike) have host transfer interface (HTIF) based console. This patch adds HTIF based console driver for RISC-V platforms which depends totally on DT node for HTIF register base address. > > Signed-off-by: Anup Patel <apatel(a)ventanamicro.com> > Reviewed-by: Philipp Tomsich <philipp.tomsich(a)vrull.eu> > --- > drivers/serial/Kconfig | 8 ++ > drivers/serial/Makefile | 1 + > drivers/serial/serial_htif.c | 178 +++++++++++++++++++++++++++++++++++ > 3 files changed, 187 insertions(+) Reviewed-by: Rick Chen <rick(a)andestech.com>

1 0

[PATCH 0/8] efi_loader: simplify printing GUIDs
by Heinrich Schuchardt 25 Jan '22

25 Jan '22

In different places text representations are used for GUIDs, e.g. * command efidebug * command printenv -e * command part list for GPT partitions Introduce a new printf code %pUs and use it to deduplicate the coding. Heinrich Schuchardt (8): lib: compile uuid_guid_get_str if CONFIG_LIB_UUID=y lib: printf code %pUs for GUID text representation disk: simplify part_print_efi() sandbox: imply PARTITION_TYPE_GUID test: add test for %pUs cmd: efidebug: simplify printing GUIDs efi_loader: user %pUs for printing GUIDs cmd: printenv: simplify printing GUIDs arch/Kconfig | 1 + cmd/efidebug.c | 160 +----------------------------- cmd/nvedit_efi.c | 39 +------- disk/part_efi.c | 21 ++-- include/efi_api.h | 8 ++ include/efi_dt_fixup.h | 4 - include/efi_rng.h | 4 - lib/efi_loader/efi_boottime.c | 26 ++--- lib/efi_loader/efi_capsule.c | 6 +- lib/efi_loader/efi_esrt.c | 6 +- lib/efi_loader/efi_file.c | 4 +- lib/efi_loader/efi_hii.c | 14 +-- lib/efi_loader/efi_hii_config.c | 2 +- lib/efi_loader/efi_image_loader.c | 2 +- lib/efi_loader/efi_rng.c | 2 +- lib/efi_loader/efi_signature.c | 2 +- lib/efi_loader/efi_var_common.c | 6 +- lib/uuid.c | 144 ++++++++++++++++++++++++++- lib/vsprintf.c | 11 +- test/print_ut.c | 20 +++- 20 files changed, 226 insertions(+), 256 deletions(-) -- 2.33.1

4 20

[PATCH V2] mkimage: fix segfault on MacOS arm64
by Sergey V. Lobanov 25 Jan '22

25 Jan '22

mkimage segfaults due ASLR mechasim on MacOS arm64 It is required to use _dyld_get_image_vmaddr_slide() to prevent segfault on MacOS arm64 This patch ased on the discussion https://github.com/u-boot/u-boot/commit/3b142045e8a7f0ab17b6099e9226296af45… Thanks to Ronny Kotzschmar and ptpt52 github user Signed-off-by: Sergey V. Lobanov <sergey(a)lobanov.in> --- tools/imagetool.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/imagetool.h b/tools/imagetool.h index e229a34ffc..a0985d93d2 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -271,11 +271,13 @@ int rockchip_copy_image(int fd, struct image_tool_params *mparams); * b) we need a API call to get the respective section symbols */ #if defined(__MACH__) #include <mach-o/getsect.h> +#include <mach-o/dyld.h> #define INIT_SECTION(name) do { \ unsigned long name ## _len; \ char *__cat(pstart_, name) = getsectdata("__DATA", \ #name, &__cat(name, _len)); \ + __cat(pstart_, name) += _dyld_get_image_vmaddr_slide(0);\ char *__cat(pstop_, name) = __cat(pstart_, name) + \ __cat(name, _len); \ __cat(__start_, name) = (void *)__cat(pstart_, name); \ -- 2.32.0 (Apple Git-132)

2 3

[PATCH] scripts: setlocalversion: remove quotes around localversion from config
by Nikita Maslov 24 Jan '22

24 Jan '22

From: Nikita Maslov <wkernelteam(a)gmail.com> Date: Fri, 14 Jan 2022 00:13:39 +0300 Subject: [PATCH] scripts: setlocalversion: remove quotes around localversion from config After replacing of include/config/auto.conf sourcing with extraction of CONFIG_LOCALVERSION, resulting version string contains quotes around localversion part which are always present in auto.conf (even if localversion is empty). This patch fixes this script so it removes quotes now. Signed-off-by: Nikita Maslov <wkernelteam(a)gmail.com> Cc: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> Cc: Tom Rini <trini(a)konsulko.com> --- scripts/setlocalversion | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index c1c0435267..4a63143706 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -153,8 +153,9 @@ if test -e include/config/auto.conf; then # We are interested only in CONFIG_LOCALVERSION and # CONFIG_LOCALVERSION_AUTO, so extract these in a safe # way (i.e. w/o sourcing auto.conf) - CONFIG_LOCALVERSION=`cat include/config/auto.conf | awk -F '=' '/^CONFIG_LOCALVERSION=/ {print $2}'` - CONFIG_LOCALVERSION_AUTO=`cat include/config/auto.conf | awk -F '=' '/^CONFIG_LOCALVERSION_AUTO=/ {print $2}'` + # xargs echo removes quotes + CONFIG_LOCALVERSION=`cat include/config/auto.conf | awk -F '=' '/^CONFIG_LOCALVERSION=/ {print $2}' | xargs echo` + CONFIG_LOCALVERSION_AUTO=`cat include/config/auto.conf | awk -F '=' '/^CONFIG_LOCALVERSION_AUTO=/ {print $2}' | xargs echo` else echo "Error: kernelrelease not valid - run 'make prepare' to update it" >&2 exit 1 --

3 2

[PATCH v2 1/2] cmd: source: Use script from default config
by Sven Schwermer 24 Jan '22

24 Jan '22

When sourcing FIT images, source the script node from the "bootscr" property within the default configuration. If board_fit_config_name_match is overridden, this will determine the selected configuration rather than the default one. The old behaviour is inconsistent with the FIT image specification which does not mention a "default" property in the "/images" node. Signed-off-by: Sven Schwermer <sven(a)svenschwermer.de> --- (no changes since v1) boot/Makefile | 8 ++------ cmd/source.c | 22 +++++++++++++--------- include/image.h | 1 + 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/boot/Makefile b/boot/Makefile index 2938c3f145..51181b10fc 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -24,14 +24,10 @@ obj-$(CONFIG_ANDROID_AB) += android_ab.o obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o image-android-dt.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += fdt_region.o -obj-$(CONFIG_$(SPL_TPL_)FIT) += image-fit.o -obj-$(CONFIG_$(SPL_)MULTI_DTB_FIT) += boot_fit.o common_fit.o +obj-$(CONFIG_$(SPL_TPL_)FIT) += common_fit.o image-fit.o +obj-$(CONFIG_$(SPL_)MULTI_DTB_FIT) += boot_fit.o obj-$(CONFIG_$(SPL_TPL_)IMAGE_SIGN_INFO) += image-sig.o obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += image-fit-sig.o obj-$(CONFIG_$(SPL_TPL_)FIT_CIPHER) += image-cipher.o obj-$(CONFIG_CMD_ADTIMG) += image-android-dt.o - -ifdef CONFIG_SPL_BUILD -obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o -endif diff --git a/cmd/source.c b/cmd/source.c index 81e015b64e..b78cac7d5c 100644 --- a/cmd/source.c +++ b/cmd/source.c @@ -26,19 +26,23 @@ #if defined(CONFIG_FIT) /** - * get_default_image() - Return default property from /images + * get_default_bootscr() - Return default boot script unit name. * - * Return: Pointer to value of default property (or NULL) + * The default configuration is used unless board_fit_config_name_match + * is overridden. + * + * Return: Pointer to value of bootscr property (or NULL) */ -static const char *get_default_image(const void *fit) +static const char *get_default_bootscr(const void *fit) { - int images_noffset; + int noffset; - images_noffset = fdt_path_offset(fit, FIT_IMAGES_PATH); - if (images_noffset < 0) + /* get default or board-specific configuration node */ + noffset = fit_find_config_node(fit); + if (noffset < 0) return NULL; - return fdt_getprop(fit, images_noffset, FIT_DEFAULT_PROP, NULL); + return fdt_getprop(fit, noffset, FIT_BOOTSCR_PROP, NULL); } #endif @@ -113,7 +117,7 @@ int image_source_script(ulong addr, const char *fit_uname) } if (!fit_uname) - fit_uname = get_default_image(fit_hdr); + fit_uname = get_default_bootscr(fit_hdr); if (!fit_uname) { puts("No FIT subimage unit name\n"); @@ -128,7 +132,7 @@ int image_source_script(ulong addr, const char *fit_uname) } if (!fit_image_check_type (fit_hdr, noffset, IH_TYPE_SCRIPT)) { - puts ("Not a image image\n"); + puts("Not a script image\n"); return 1; } diff --git a/include/image.h b/include/image.h index fd662e74b4..67c70952bd 100644 --- a/include/image.h +++ b/include/image.h @@ -936,6 +936,7 @@ int booti_setup(ulong image, ulong *relocated_addr, ulong *size, #define FIT_KERNEL_PROP "kernel" #define FIT_RAMDISK_PROP "ramdisk" #define FIT_FDT_PROP "fdt" +#define FIT_BOOTSCR_PROP "bootscr" #define FIT_LOADABLE_PROP "loadables" #define FIT_DEFAULT_PROP "default" #define FIT_SETUP_PROP "setup" -- 2.34.1

2 5

[PATCH v2 1/1] serial: npcm: Add support for Nuvoton NPCM SoCs
by Stanley Chu 24 Jan '22

24 Jan '22

Add Nuvoton BMC NPCM7xx/NPCM8xx uart driver Signed-off-by: Stanley Chu <yschu(a)nuvoton.com> --- Changes in v2: Drop unnecessary outer brackets. Return -EAGAIN if not ready for tx/rx. Add comments. --- drivers/serial/Kconfig | 9 +++ drivers/serial/Makefile | 1 + drivers/serial/serial_npcm.c | 150 +++++++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+) create mode 100644 drivers/serial/serial_npcm.c diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 6c8fdda9a0..e67a76a424 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -920,6 +920,15 @@ config MPC8XX_CONS depends on MPC8xx default y +config NPCM_SERIAL + bool "UART driver for Nuvoton NPCM BMC" + depends on DM_SERIAL + help + Select this to enable UART support for Nuvoton BMCs + (NPCM7xx and NPCM8xx). + The driver enables the onboard serial port with 8-N-1 + configuration. + config XEN_SERIAL bool "XEN serial support" depends on XEN diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 8168af640f..866495e416 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -73,6 +73,7 @@ obj-$(CONFIG_OWL_SERIAL) += serial_owl.o obj-$(CONFIG_OMAP_SERIAL) += serial_omap.o obj-$(CONFIG_MTK_SERIAL) += serial_mtk.o obj-$(CONFIG_MT7620_SERIAL) += serial_mt7620.o +obj-$(CONFIG_NPCM_SERIAL) += serial_npcm.o obj-$(CONFIG_SIFIVE_SERIAL) += serial_sifive.o obj-$(CONFIG_XEN_SERIAL) += serial_xen.o diff --git a/drivers/serial/serial_npcm.c b/drivers/serial/serial_npcm.c new file mode 100644 index 0000000000..0c6f0410cf --- /dev/null +++ b/drivers/serial/serial_npcm.c @@ -0,0 +1,150 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2021 Nuvoton Technology Corp. + */ + +#include <common.h> +#include <clk.h> +#include <dm.h> +#include <serial.h> + +struct npcm_uart { + union { + u32 rbr; /* Receive Buffer Register */ + u32 thr; /* Transmit Holding Register */ + u32 dll; /* Divisor Latch (Low Byte) Register */ + }; + union { + u32 ier; /* Interrupt Enable Register */ + u32 dlm; /* Divisor Latch (Low Byte) Register */ + }; + union { + u32 iir; /* Interrupt Identification Register */ + u32 fcr; /* FIFO Control Register */ + }; + u32 lcr; /* Line Control Register */ + u32 mcr; /* Modem Control Register */ + u32 lsr; /* Line Status Control Register */ + u32 msr; /* Modem Status Register */ + u32 tor; /* Timeout Register */ +}; + +#define LCR_WLS_8BITS 3 /* 8-bit word length select */ +#define FCR_TFR BIT(2) /* TxFIFO reset */ +#define FCR_RFR BIT(1) /* RxFIFO reset */ +#define FCR_FME BIT(0) /* FIFO mode enable */ +#define LSR_THRE BIT(5) /* Status of TxFIFO empty */ +#define LSR_RFDR BIT(0) /* Status of RxFIFO data ready */ +#define LCR_DLAB BIT(7) /* Divisor latch access bit */ + +struct npcm_serial_plat { + struct npcm_uart *reg; + u32 uart_clk; /* frequency of uart clock source */ +}; + +static int npcm_serial_pending(struct udevice *dev, bool input) +{ + struct npcm_serial_plat *plat = dev_get_plat(dev); + struct npcm_uart *uart = plat->reg; + + if (input) + return readb(&uart->lsr) & LSR_RFDR ? 1 : 0; + else + return readb(&uart->lsr) & LSR_THRE ? 0 : 1; +} + +static int npcm_serial_putc(struct udevice *dev, const char ch) +{ + struct npcm_serial_plat *plat = dev_get_plat(dev); + struct npcm_uart *uart = plat->reg; + + if (!(readb(&uart->lsr) & LSR_THRE)) + return -EAGAIN; + + writeb(ch, &uart->thr); + + return 0; +} + +static int npcm_serial_getc(struct udevice *dev) +{ + struct npcm_serial_plat *plat = dev_get_plat(dev); + struct npcm_uart *uart = plat->reg; + + if (!(readb(&uart->lsr) & LSR_RFDR)) + return -EAGAIN; + + return readb(&uart->rbr); +} + +static int npcm_serial_setbrg(struct udevice *dev, int baudrate) +{ + struct npcm_serial_plat *plat = dev_get_plat(dev); + struct npcm_uart *uart = plat->reg; + u16 divisor; + + /* BaudOut = UART Clock / (16 * [Divisor + 2]) */ + divisor = DIV_ROUND_CLOSEST(plat->uart_clk, 16 * baudrate + 2) - 2; + + setbits_8(&uart->lcr, LCR_DLAB); + writeb(divisor & 0xff, &uart->dll); + writeb(divisor >> 8, &uart->dlm); + clrbits_8(&uart->lcr, LCR_DLAB); + + return 0; +} + +static int npcm_serial_probe(struct udevice *dev) +{ + struct npcm_serial_plat *plat = dev_get_plat(dev); + struct npcm_uart *uart = plat->reg; + struct clk clk; + u32 freq; + int ret; + + plat->reg = dev_read_addr_ptr(dev); + freq = dev_read_u32_default(dev, "clock-frequency", 0); + + ret = clk_get_by_index(dev, 0, &clk); + if (ret < 0) + return ret; + + ret = clk_set_rate(&clk, freq); + if (ret < 0) + return ret; + plat->uart_clk = ret; + + /* Disable all interrupt */ + writeb(0, &uart->ier); + + /* Set 8 bit, 1 stop, no parity */ + writeb(LCR_WLS_8BITS, &uart->lcr); + + /* Reset RX/TX FIFO */ + writeb(FCR_FME | FCR_RFR | FCR_TFR, &uart->fcr); + + return 0; +} + +static const struct dm_serial_ops npcm_serial_ops = { + .getc = npcm_serial_getc, + .setbrg = npcm_serial_setbrg, + .putc = npcm_serial_putc, + .pending = npcm_serial_pending, +}; + +static const struct udevice_id npcm_serial_ids[] = { + { .compatible = "nuvoton,npcm750-uart" }, + { .compatible = "nuvoton,npcm845-uart" }, + { } +}; + +U_BOOT_DRIVER(serial_npcm) = { + .name = "serial_npcm", + .id = UCLASS_SERIAL, + .of_match = npcm_serial_ids, + .plat_auto = sizeof(struct npcm_serial_plat), + .probe = npcm_serial_probe, + .ops = &npcm_serial_ops, + .flags = DM_FLAG_PRE_RELOC, +}; -- 2.17.1

2 1