Your message dated Tue, 29 Mar 2016 03:52:34 +0000
with message-id <[email protected]>
and subject line Bug#818621: fixed in u-boot 2016.03+dfsg1-2
has caused the Debian Bug report #818621,
regarding Important upstream fixes for the Debian u-boot 2016.03 package
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
818621: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818621
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: u-boot-sunxi
Version: 2016.03+dfsg1-1
Severity: important
Tags: patch
Hello,
plain upstream u-boot v2016.03 and in consequence the u-boot
package in unstable and the daily armhf d-i builds are partially
broken on sunxi-based systems:
- Changes to the generic ethernet initialization code have caused
problems with the ethernet controller on sunxi-based systems.
(http://lists.denx.de/pipermail/u-boot/2016-March/248923.html)
- On certain A23-based systems u-boot doesn't boot due to problems
with the RAM setup.
(http://lists.denx.de/pipermail/u-boot/2016-March/247736.html)
Attached are two upstream patches addressing these two issues
which should be included in the Debian u-boot package. They are
queued up by the upstream sunxi platform maintainer for the next
upstream u-boot release.
I have successfully tested the ethernet init patch. Without the
patch:
=> run bootcmd_dhcp
ethernet@01c50000 Waiting for PHY auto negotiation to complete.........
TIMEOUT !
ethernet@01c50000: No link.
With the patch:
=> run bootcmd_dhcp
Speed: 1000, full duplex
BOOTP broadcast 1
DHCP client bound to address [...]
Unfortunately I cannot test the RAM init patch as I lack
A23-based hardware.
Regards,
Karsten
--
Gem. Par. 28 Abs. 4 Bundesdatenschutzgesetz widerspreche ich der Nutzung
sowie der Weitergabe meiner personenbezogenen Daten für Zwecke der
Werbung sowie der Markt- oder Meinungsforschung.
>From 22f2f6dd2a0e835f329f87b5349130300fc46e42 Mon Sep 17 00:00:00 2001
From: Hans de Goede <[email protected]>
Date: Fri, 4 Mar 2016 10:57:34 +0100
Subject: [PATCH 1/2] sunxi: A23: Fix some revisions needing a different magic
sram poke
I've had this one a23 tablet which would not boot and I've finally
figured out what the problem is by looking at the released boot0 code,
it seems the magic sram controller poke which we need to do in s_init()
depends on the revision of the a23.
Specifically this change is needed to get the A23 SoC I have with the
following serial to boot: "E6071AB 26Y7".
Signed-off-by: Hans de Goede <[email protected]>
Acked-by: Ian Campbell <[email protected]>
---
arch/arm/cpu/armv7/sunxi/board.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c
index eb5f4b6..e80785b 100644
--- a/arch/arm/cpu/armv7/sunxi/board.c
+++ b/arch/arm/cpu/armv7/sunxi/board.c
@@ -113,11 +113,27 @@ int spl_board_load_image(void)
void s_init(void)
{
-#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_A23
- /* Magic (undocmented) value taken from boot0, without this DRAM
- * access gets messed up (seems cache related) */
+ /*
+ * Undocumented magic taken from boot0, without this DRAM
+ * access gets messed up (seems cache related).
+ * The boot0 sources describe this as: "config ema for cache sram"
+ */
+#if defined CONFIG_MACH_SUN6I
setbits_le32(SUNXI_SRAMC_BASE + 0x44, 0x1800);
+#elif defined CONFIG_MACH_SUN8I_A23
+ uint version;
+
+ /* Unlock sram version info reg, read it, relock */
+ setbits_le32(SUNXI_SRAMC_BASE + 0x24, (1 << 15));
+ version = readl(SUNXI_SRAMC_BASE + 0x24);
+ clrbits_le32(SUNXI_SRAMC_BASE + 0x24, (1 << 15));
+
+ if ((version & 0xffff0000) == 0x16500000)
+ setbits_le32(SUNXI_SRAMC_BASE + 0x44, 0x1800);
+ else /* 0x1661 ? */
+ setbits_le32(SUNXI_SRAMC_BASE + 0x44, 0xc0);
#endif
+
#if defined CONFIG_MACH_SUN6I || \
defined CONFIG_MACH_SUN7I || \
defined CONFIG_MACH_SUN8I
--
2.7.3
>From befbbcca23f862a441d8a73f1a1fbe586185576d Mon Sep 17 00:00:00 2001
From: Hans de Goede <[email protected]>
Date: Thu, 17 Mar 2016 13:53:03 +0100
Subject: [PATCH 2/2] sunxi: Fix gmac not working due to cpu_eth_init no longer
being called
cpu_eth_init is no longer called for dm enabled eth drivers, this
was causing the sunxi gmac eth controller to no longer work in u-boot.
This commit fixes this by moving the gpio setup to gpio_init() and by
calling the clock, reset and pinmux setup function from s_init().
Note that the mdelay is dropped as the phy gets enabled much earlier
now, so it is no longer needed.
Signed-off-by: Hans de Goede <[email protected]>
---
arch/arm/cpu/armv7/sunxi/board.c | 32 +++++------------------------
arch/arm/include/asm/arch-sunxi/sys_proto.h | 6 +++++-
board/sunxi/gmac.c | 14 +------------
3 files changed, 11 insertions(+), 41 deletions(-)
diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c
index e80785b..9a97049 100644
--- a/arch/arm/cpu/armv7/sunxi/board.c
+++ b/arch/arm/cpu/armv7/sunxi/board.c
@@ -100,6 +100,10 @@ static int gpio_init(void)
#error Unsupported console port number. Please fix pin mux settings in board.c
#endif
+#ifdef CONFIG_MACPWR
+ gpio_request(CONFIG_MACPWR, "macpwr");
+ gpio_direction_output(CONFIG_MACPWR, 1);
+#endif
return 0;
}
@@ -152,6 +156,7 @@ void s_init(void)
timer_init();
gpio_init();
i2c_init_board();
+ eth_init_board();
}
#ifdef CONFIG_SPL_BUILD
@@ -259,30 +264,3 @@ void enable_caches(void)
dcache_enable();
}
#endif
-
-#ifdef CONFIG_CMD_NET
-/*
- * Initializes on-chip ethernet controllers.
- * to override, implement board_eth_init()
- */
-int cpu_eth_init(bd_t *bis)
-{
- __maybe_unused int rc;
-
-#ifdef CONFIG_MACPWR
- gpio_request(CONFIG_MACPWR, "macpwr");
- gpio_direction_output(CONFIG_MACPWR, 1);
- mdelay(200);
-#endif
-
-#ifdef CONFIG_SUNXI_GMAC
- rc = sunxi_gmac_initialize(bis);
- if (rc < 0) {
- printf("sunxi: failed to initialize gmac\n");
- return rc;
- }
-#endif
-
- return 0;
-}
-#endif
diff --git a/arch/arm/include/asm/arch-sunxi/sys_proto.h b/arch/arm/include/asm/arch-sunxi/sys_proto.h
index 9df3744..a373319 100644
--- a/arch/arm/include/asm/arch-sunxi/sys_proto.h
+++ b/arch/arm/include/asm/arch-sunxi/sys_proto.h
@@ -24,6 +24,10 @@ void sdelay(unsigned long);
void return_to_fel(uint32_t lr, uint32_t sp);
/* Board / SoC level designware gmac init */
-int sunxi_gmac_initialize(bd_t *bis);
+#if !defined CONFIG_SPL_BUILD && defined CONFIG_SUNXI_GMAC
+void eth_init_board(void);
+#else
+static inline void eth_init_board(void) {}
+#endif
#endif
diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c
index 4e222d8..69eb8ff 100644
--- a/board/sunxi/gmac.c
+++ b/board/sunxi/gmac.c
@@ -6,7 +6,7 @@
#include <asm/arch/clock.h>
#include <asm/arch/gpio.h>
-int sunxi_gmac_initialize(bd_t *bis)
+void eth_init_board(void)
{
int pin;
struct sunxi_ccm_reg *const ccm =
@@ -79,16 +79,4 @@ int sunxi_gmac_initialize(bd_t *bis)
for (pin = SUNXI_GPA(26); pin <= SUNXI_GPA(27); pin++)
sunxi_gpio_set_cfgpin(pin, SUN6I_GPA_GMAC);
#endif
-
-#ifdef CONFIG_DM_ETH
- return 0;
-#else
-# ifdef CONFIG_RGMII
- return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_RGMII);
-# elif defined CONFIG_GMII
- return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_GMII);
-# else
- return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_MII);
-# endif
-#endif
}
--
2.7.3
--- End Message ---
--- Begin Message ---
Source: u-boot
Source-Version: 2016.03+dfsg1-2
We believe that the bug you reported is fixed in the latest version of
u-boot, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Vagrant Cascadian <[email protected]> (supplier of updated u-boot package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Mon, 28 Mar 2016 19:52:45 -0700
Source: u-boot
Binary: u-boot u-boot-imx u-boot-tegra u-boot-omap u-boot-sunxi u-boot-exynos
u-boot-rockchip u-boot-rpi u-boot-tools
Architecture: source
Version: 2016.03+dfsg1-2
Distribution: unstable
Urgency: medium
Maintainer: Vagrant Cascadian <[email protected]>
Changed-By: Vagrant Cascadian <[email protected]>
Description:
u-boot - A boot loader for embedded systems
u-boot-exynos - A boot loader for exynos systems
u-boot-imx - A boot loader for imx systems
u-boot-omap - A boot loader for omap systems
u-boot-rockchip - A boot loader for rockchip systems
u-boot-rpi - A boot loader for Raspberry PI systems
u-boot-sunxi - A boot loader for sunxi systems
u-boot-tegra - A boot loader for tegra systems
u-boot-tools - companion tools for Das U-Boot bootloader
Closes: 818621
Changes:
u-boot (2016.03+dfsg1-2) unstable; urgency=medium
.
* Apply patch from upstream to fix gmac ethernet on sunxi
systems. (Closes: #818621). Thanks to Karsten Merker for the report.
Checksums-Sha1:
e9d9c8dea68d93ca0ac5b90b84cbe6cec606d4cb 2549 u-boot_2016.03+dfsg1-2.dsc
8359d4a7e608cf913f7c0ce3708cf95a81170e88 47444
u-boot_2016.03+dfsg1-2.debian.tar.xz
Checksums-Sha256:
677025f10c6b1cb77afc7b572a7a5363d319c1ff33448ac790deadbc4539ddbc 2549
u-boot_2016.03+dfsg1-2.dsc
67c83f95df588e588cc481b3930ac2c25f2e7eb6b5d05bdaf9e59c78e825124e 47444
u-boot_2016.03+dfsg1-2.debian.tar.xz
Files:
59b26ffbe995835a906e31a3f32c859f 2549 admin optional u-boot_2016.03+dfsg1-2.dsc
89d0b681f7da1630c0d5f4c87b9c836c 47444 admin optional
u-boot_2016.03+dfsg1-2.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCgAGBQJW+e5+AAoJELeLgtSBS5G2bdgP/RFwfd3AlIl9VfEc3GLSNd7R
UWDQjH1yqkYNAXi6M/jLdbYGYeqPyKywlvjEKkZC+ekBf+c479ArFOQ8qNCRdjGw
HBENT32+MFui05/poOPOy/p9o1mGgDyWq10QnE+ks1TmYtRvNBmAUQ+PNhi83Vvc
yHBGYr6i/9s3cvQaBbH6GBuqezap+jW9sd7iCq70x6+D/MCrPestA4ArT2pzOgEm
aNX/+khUzKeub1EC8mzIHzdOiwQVI4o5VEdNMWpma7733/0DHBo3dJAjzaeJ5wdC
a8u2h7L24EEIfVe1Y+YeT/pHoPAHG9fWzuZXCPXsuhTNAnkbzQJ+OODeZ1n/BYGr
VlyxbI6vxwrnX9GQJPYiZTmEHa3kq6H07WB6EzFgFMWtqAc+FqItn1/Zdu62d7NW
2a3AsIGTeL21jqGa1peihdQT9huLXe235HRWEAB41MClmWDJi8xK++6M+FkgNtxB
SplKW7CYzV2KqgVatTZJ8Bi8xIMAeXFLlIptw0VLKAsCzgnqW5eKab/bhkNK2wXZ
xcbyh4p1ftsJ64l2qdmC7lp3rrfUUxqZMDaG3cg2vEe3osWAt1a67U8l/RBDsOkI
3RiUBqe0BhieVgVSdCFuqRVxyRBUAhMXuf8vDP/iJnLN/zXGy8PxGYEBAjXFzjee
rRnT+8WkSgKirgo1FDif
=DBfD
-----END PGP SIGNATURE-----
--- End Message ---
