2016.07 GA

This commit is contained in:
Peter Robinson 2016-07-12 04:01:58 +01:00
parent 2b4b86896d
commit 3b15659436
4 changed files with 1139 additions and 3 deletions

View File

@ -0,0 +1,55 @@
From patchwork Fri Jul 8 10:40:14 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [U-Boot,
RESEND] sunxi: mmc: increase status register polling rate for data
transfers
From: Tobias Doerffel <tobias.doerffel@ed-chemnitz.de>
X-Patchwork-Id: 646568
X-Patchwork-Delegate: hdegoede@redhat.com
Message-Id: <1467974414-18845-1-git-send-email-tobias.doerffel@ed-chemnitz.de>
To: u-boot@lists.denx.de
Cc: Tobias Doerffel <tobias.doerffel@ed-chemnitz.de>, ijc@hellion.org.uk
Date: Fri, 8 Jul 2016 12:40:14 +0200
With a recent bunch of SD3.0 cards in our A20-based board we
experienced data transfer rates of about 250 KiB/s instead of 10 MiB/s
with previous cards from the same vendor (both 4 GB/class 10). By
increasing status register polling rate from 1 kHz to 1 MHz we were
able to reach the original transfer rates again. With the old cards
we now even reach about 16 MiB/s.
Signed-off-by: Tobias Doerffel <tobias.doerffel@ed-chemnitz.de>
---
drivers/mmc/sunxi_mmc.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index ce2dc4a..36da3b3 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -269,18 +269,18 @@ static int mmc_trans_data_by_cpu(struct mmc *mmc, struct mmc_data *data)
unsigned i;
unsigned *buff = (unsigned int *)(reading ? data->dest : data->src);
unsigned byte_cnt = data->blocksize * data->blocks;
- unsigned timeout_msecs = byte_cnt >> 8;
- if (timeout_msecs < 2000)
- timeout_msecs = 2000;
+ unsigned timeout_usecs = (byte_cnt >> 8) * 1000;
+ if (timeout_usecs < 2000000)
+ timeout_usecs = 2000000;
/* Always read / write data through the CPU */
setbits_le32(&mmchost->reg->gctrl, SUNXI_MMC_GCTRL_ACCESS_BY_AHB);
for (i = 0; i < (byte_cnt >> 2); i++) {
while (readl(&mmchost->reg->status) & status_bit) {
- if (!timeout_msecs--)
+ if (!timeout_usecs--)
return -1;
- udelay(1000);
+ udelay(1);
}
if (reading)

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
78f339300a811e7a70dec42520d14110 u-boot-2016.07-rc3.tar.bz2
425a3fa610a7d972e5092a0e92276c70 u-boot-2016.07.tar.bz2

View File

@ -1,8 +1,8 @@
%global candidate rc3
#global candidate rc3
Name: uboot-tools
Version: 2016.07
Release: 0.4%{?candidate:.%{candidate}}%{?dist}
Release: 1%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities
Group: Development/Tools
@ -16,6 +16,8 @@ Patch1: copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch
Patch2: add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
Patch3: port-utilite-to-distro-generic-boot-commands.patch
Patch4: mvebu-enable-generic-distro-boot-config.patch
Patch5: RESEND-sunxi-mmc-increase-status-register-polling-rate-for-data-transfers.patch
Patch6: net-Add-EMAC-driver-for-H3-A83T-A64-SoCs..patch
BuildRequires: bc
BuildRequires: dtc
@ -192,6 +194,9 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
%endif
%changelog
* Tue Jul 12 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.07-1
- Update to 2016.07 GA
* Thu Jul 7 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.07-0.4rc3
- Minor updates and cleanups