2018.05 RC3
This commit is contained in:
Peter Robinson
parent
d8dcaeaa21
commit
18c86f4d2a
@ -1,35 +0,0 @@
|
||||
From patchwork Tue Mar 27 17:53:55 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot] mmc: mv_sdhci: zero out sdhci_host structure
|
||||
X-Patchwork-Submitter: Matt Pelland <mpelland@starry.com>
|
||||
X-Patchwork-Id: 891784
|
||||
Message-Id: <20180327175355.29633-1-mpelland@starry.com>
|
||||
To: u-boot@lists.denx.de
|
||||
Date: Tue, 27 Mar 2018 13:53:55 -0400
|
||||
From: Matt Pelland <mpelland@starry.com>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
The mv_sdhci driver was not zeroing the sdhci_host structure it
|
||||
allocates causing random access violations in parts of the mmc core
|
||||
where the "ops" member pointers are checked and called if not NULL.
|
||||
|
||||
Signed-off-by: Matt Pelland <mpelland@starry.com>
|
||||
---
|
||||
drivers/mmc/mv_sdhci.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
|
||||
index 69aa87babe..afc03f75a0 100644
|
||||
--- a/drivers/mmc/mv_sdhci.c
|
||||
+++ b/drivers/mmc/mv_sdhci.c
|
||||
@@ -74,6 +74,8 @@ int mv_sdh_init(unsigned long regbase, u32 max_clk, u32 min_clk, u32 quirks)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
+ memset(host, 0, sizeof(struct sdhci_host));
|
||||
+
|
||||
host->name = MVSDH_NAME;
|
||||
host->ioaddr = (void *)regbase;
|
||||
host->quirks = quirks;
|
||||
@ -1,37 +0,0 @@
|
||||
From e1f184f835291f46220d1fb6c0e54d62822803c0 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Wed, 25 Apr 2018 10:48:19 +0100
|
||||
Subject: [PATCH 2/2] config: evb-rk3399: enable make uboot.itb
|
||||
|
||||
Similar to firefly 3399 enable the ability to create a FIT image
|
||||
with combined arm-trusted-firmware.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
configs/evb-rk3399_defconfig | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
|
||||
index b36f232dcb..67ba0ce015 100644
|
||||
--- a/configs/evb-rk3399_defconfig
|
||||
+++ b/configs/evb-rk3399_defconfig
|
||||
@@ -11,6 +11,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb"
|
||||
CONFIG_DEBUG_UART=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_SPL_LOAD_FIT=y
|
||||
+CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
|
||||
# CONFIG_DISPLAY_CPUINFO is not set
|
||||
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||
CONFIG_SPL_STACK_R=y
|
||||
@@ -25,6 +26,8 @@ CONFIG_CMD_TIME=y
|
||||
CONFIG_SPL_OF_CONTROL=y
|
||||
CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
|
||||
CONFIG_SPL_OF_PLATDATA=y
|
||||
+CONFIG_SPL_ATF=y
|
||||
+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
|
||||
CONFIG_ENV_IS_IN_MMC=y
|
||||
CONFIG_NET_RANDOM_ETHADDR=y
|
||||
CONFIG_REGMAP=y
|
||||
--
|
||||
2.17.0
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From 72ba581632c53ad16d1b7174ac507fb7b0ee47c1 Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Uiterwijk <patrick@puiterwijk.org>
|
||||
Date: Wed, 14 Feb 2018 01:29:42 +0100
|
||||
Subject: [PATCH 1/2] arm: rockchip: make_fit_atf: remove unneeded imports
|
||||
|
||||
These imports are entirely unused in the entire script.
|
||||
|
||||
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
arch/arm/mach-rockchip/make_fit_atf.py | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py
|
||||
index 7c6dd57678..9a404d1d32 100755
|
||||
--- a/arch/arm/mach-rockchip/make_fit_atf.py
|
||||
+++ b/arch/arm/mach-rockchip/make_fit_atf.py
|
||||
@@ -13,8 +13,6 @@ import getopt
|
||||
|
||||
# pip install pyelftools
|
||||
from elftools.elf.elffile import ELFFile
|
||||
-from elftools.elf.sections import SymbolTableSection
|
||||
-from elftools.elf.segments import Segment, InterpSegment, NoteSegment
|
||||
|
||||
ELF_SEG_P_TYPE='p_type'
|
||||
ELF_SEG_P_PADDR='p_paddr'
|
||||
--
|
||||
2.17.0
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (u-boot-2018.05-rc2.tar.bz2) = 98db34f69d08f8e40cc2b1eb7c301b29cd82d638f8d93284aaf598eb8efafd7cf5af98449811bdc98164381451e815741ff95a6e10ad3335b038ab31de712bb4
|
||||
SHA512 (u-boot-2018.05-rc3.tar.bz2) = e612fd08d6ea7f6d0e440326a7a70f38c6621c164f50845410f50091ce8905f7f0501616324113a3c0afecf43ce6c4ecb39e727a27cbdd495e2cd42715b303b4
|
||||
|
||||
@ -1,128 +0,0 @@
|
||||
From patchwork Wed Mar 21 11:18:58 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Subject: [U-Boot] sunxi: improve throughput in the sunxi_mmc driver
|
||||
X-Patchwork-Submitter: Maxime Ripard <maxime.ripard@bootlin.com>
|
||||
X-Patchwork-Id: 888703
|
||||
X-Patchwork-Delegate: jagannadh.teki@gmail.com
|
||||
Message-Id: <20180321111858.16576-1-maxime.ripard@bootlin.com>
|
||||
To: Jaehoon Chung <jh80.chung@samsung.com>
|
||||
Cc: Mylene Josserand <mylene.josserand@bootlin.com>,
|
||||
Maxime Ripard <maxime.ripard@bootlin.com>, u-boot@lists.denx.de,
|
||||
Jagan Teki <jagan@openedev.com>
|
||||
Date: Wed, 21 Mar 2018 12:18:58 +0100
|
||||
From: Maxime Ripard <maxime.ripard@bootlin.com>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
From: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
|
||||
|
||||
Throughput tests have shown the sunxi_mmc driver to take over 10s to
|
||||
read 10MB from a fast eMMC device due to excessive delays in polling
|
||||
loops.
|
||||
|
||||
This commit restructures the main polling loops to use get_timer(...)
|
||||
to determine whether a (millisecond) timeout has expired. We choose
|
||||
not to use the wait_bit function, as we don't need interruptability
|
||||
with ctrl-c and have at least one case where two bits (one for an
|
||||
error condition and another one for completion) need to be read and
|
||||
using wait_bit would have not added to the clarity.
|
||||
|
||||
The observed speedup in testing on a A31 is greater than 10x (e.g. a
|
||||
10MB write decreases from 9.302s to 0.884s).
|
||||
|
||||
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
|
||||
Tested-by: Mylène Josserand <mylene.josserand@bootlin.com>
|
||||
---
|
||||
drivers/mmc/sunxi_mmc.c | 27 ++++++++++++++++-----------
|
||||
1 file changed, 16 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
|
||||
index 4edb4be46c81..d36c1689e7b1 100644
|
||||
--- a/drivers/mmc/sunxi_mmc.c
|
||||
+++ b/drivers/mmc/sunxi_mmc.c
|
||||
@@ -187,15 +187,16 @@ static int mmc_update_clk(struct sunxi_mmc_priv *priv)
|
||||
{
|
||||
unsigned int cmd;
|
||||
unsigned timeout_msecs = 2000;
|
||||
+ unsigned long start = get_timer(0);
|
||||
|
||||
cmd = SUNXI_MMC_CMD_START |
|
||||
SUNXI_MMC_CMD_UPCLK_ONLY |
|
||||
SUNXI_MMC_CMD_WAIT_PRE_OVER;
|
||||
+
|
||||
writel(cmd, &priv->reg->cmd);
|
||||
while (readl(&priv->reg->cmd) & SUNXI_MMC_CMD_START) {
|
||||
- if (!timeout_msecs--)
|
||||
+ if (get_timer(start) > timeout_msecs)
|
||||
return -1;
|
||||
- udelay(1000);
|
||||
}
|
||||
|
||||
/* clock update sets various irq status bits, clear these */
|
||||
@@ -276,18 +277,21 @@ static int mmc_trans_data_by_cpu(struct sunxi_mmc_priv *priv, struct mmc *mmc,
|
||||
unsigned i;
|
||||
unsigned *buff = (unsigned int *)(reading ? data->dest : data->src);
|
||||
unsigned byte_cnt = data->blocksize * data->blocks;
|
||||
- unsigned timeout_usecs = (byte_cnt >> 8) * 1000;
|
||||
- if (timeout_usecs < 2000000)
|
||||
- timeout_usecs = 2000000;
|
||||
+ unsigned timeout_msecs = byte_cnt >> 8;
|
||||
+ unsigned long start;
|
||||
+
|
||||
+ if (timeout_msecs < 2000)
|
||||
+ timeout_msecs = 2000;
|
||||
|
||||
/* Always read / write data through the CPU */
|
||||
setbits_le32(&priv->reg->gctrl, SUNXI_MMC_GCTRL_ACCESS_BY_AHB);
|
||||
|
||||
+ start = get_timer(0);
|
||||
+
|
||||
for (i = 0; i < (byte_cnt >> 2); i++) {
|
||||
while (readl(&priv->reg->status) & status_bit) {
|
||||
- if (!timeout_usecs--)
|
||||
+ if (get_timer(start) > timeout_msecs)
|
||||
return -1;
|
||||
- udelay(1);
|
||||
}
|
||||
|
||||
if (reading)
|
||||
@@ -303,16 +307,16 @@ static int mmc_rint_wait(struct sunxi_mmc_priv *priv, struct mmc *mmc,
|
||||
uint timeout_msecs, uint done_bit, const char *what)
|
||||
{
|
||||
unsigned int status;
|
||||
+ unsigned long start = get_timer(0);
|
||||
|
||||
do {
|
||||
status = readl(&priv->reg->rint);
|
||||
- if (!timeout_msecs-- ||
|
||||
+ if ((get_timer(start) > timeout_msecs) ||
|
||||
(status & SUNXI_MMC_RINT_INTERRUPT_ERROR_BIT)) {
|
||||
debug("%s timeout %x\n", what,
|
||||
status & SUNXI_MMC_RINT_INTERRUPT_ERROR_BIT);
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
- udelay(1000);
|
||||
} while (!(status & done_bit));
|
||||
|
||||
return 0;
|
||||
@@ -404,15 +408,16 @@ static int sunxi_mmc_send_cmd_common(struct sunxi_mmc_priv *priv,
|
||||
}
|
||||
|
||||
if (cmd->resp_type & MMC_RSP_BUSY) {
|
||||
+ unsigned long start = get_timer(0);
|
||||
timeout_msecs = 2000;
|
||||
+
|
||||
do {
|
||||
status = readl(&priv->reg->status);
|
||||
- if (!timeout_msecs--) {
|
||||
+ if (get_timer(start) > timeout_msecs) {
|
||||
debug("busy timeout\n");
|
||||
error = -ETIMEDOUT;
|
||||
goto out;
|
||||
}
|
||||
- udelay(1000);
|
||||
} while (status & SUNXI_MMC_STATUS_CARD_DATA_BUSY);
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
%global candidate rc2
|
||||
%global candidate rc3
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2018.05
|
||||
Release: 0.3%{?candidate:.%{candidate}}%{?dist}
|
||||
Release: 0.4%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
||||
URL: http://www.denx.de/wiki/U-Boot
|
||||
@ -20,18 +20,13 @@ Patch1: uefi-use-Fedora-specific-path-name.patch
|
||||
# general fixes
|
||||
Patch2: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
||||
Patch3: usb-kbd-fixes.patch
|
||||
Patch4: uefi-upstream-test.patch
|
||||
|
||||
# Board fixes and enablement
|
||||
Patch11: mx6cuboxi-add-support-for-detecting-Revision-1.5-SoM.patch
|
||||
Patch12: dragonboard-fixes.patch
|
||||
#Patch13: pi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
||||
Patch14: rk33xx-make_fit_atf-fix.patch
|
||||
Patch15: rk33xx-enable-make-itb.patch
|
||||
Patch16: rockchip-make_fit_atf-fix-warning-unit_address_vs_reg.patch
|
||||
Patch17: mmc-mv_sdhci-zero-out-sdhci_host-structure.patch
|
||||
Patch18: sunxi-improve-throughput-in-the-sunxi_mmc-driver.patch
|
||||
Patch19: tegra186-jetson-tx2-disable-onboard-emmc.patch
|
||||
Patch13: rockchip-make_fit_atf-fix-warning-unit_address_vs_reg.patch
|
||||
Patch14: tegra186-jetson-tx2-disable-onboard-emmc.patch
|
||||
#Patch15: pi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
||||
|
||||
# Patch99: mvebu-enable-generic-distro-boot-config.patch
|
||||
|
||||
@ -294,6 +289,9 @@ cp -p board/warp7/README builds/docs/README.warp7
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue May 1 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.05-0.4-rc3
|
||||
- 2018.05 RC3
|
||||
|
||||
* Thu Apr 26 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.05-0.3-rc2
|
||||
- uEFI improvements
|
||||
- Fixes for Rockchips rk33xx 64 bit devices
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user