mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
9f0575a130
Revert the SDC "CLK_SET_RATE_GATE" changes to the SDC clock regulator
structures.
See https://elinux.org/images/b/b8/Elc2013_Clement.pdf
> if ((clk->flags & CLK_SET_RATE_GATE) && clk->prepare_count) {
>
> For this particular clock, setting its rate is possible only if the
> clock is ungated (not yet prepared)
This fixes the MMC failing to initialize on newer ZyXEL NBG6817
hardware revisions with Kingston MMC. Older revisions should
hopefully be unaffected.
Check MMC hardware details with:
cd /sys/block/mmcblk0/device/ && \
tail -v cid date name manfid fwrev hwrev oemid rev
Known problematic MMC names (broken before this commit):
* M62704 (dated 12/2018) via myself
* M62704 (dated 11/2018) via Drake Stefani
Known unaffected MMC names (already working without this commit):
* S10004 (dated 12/2015) via slh
Without enabling dynamic debugging, this error manifests in the kernel
hardware serial console as the following:
[ 2.746605] mmc0: error -110 whilst initialising MMC card
[…trimmed other messages…]
[ 2.877832] Waiting for root device /dev/mmcblk0p5...
Enabling Linux dynamic kernel debugging provides additional messages.
For guidance, see the Linux kernel documentation:
https://www.kernel.org/doc/html/latest/admin-guide/dynamic-debug-howto.html
First, enable dynamic debugging in OpenWRT's configuration:
1. Run "make menuconfig"
2. Select "Global build settings --->"
3. Select "Kernel build options --->"
4. Enable "Compile the kernel with dynamic printk" via spacebar
5. Save and exit (arrow key to "Exit" until prompted to save, save)
Alternatively, set "CONFIG_KERNEL_DYNAMIC_DEBUG=y" in your .config.
Then, turn on dynamic debugging at boot:
Modify bootargs in
target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
to add…
bootargs = "[…existing bootargs…] dyndbg=\"file drivers/mmc/* +p\" dynamic_debug.verbose=1 loglevel=8";
For example:
chosen {
- bootargs = "rootfstype=squashfs,ext4 rootwait noinitrd fstools_ignore_partname=1";
+ bootargs = "rootfstype=squashfs,ext4 rootwait noinitrd fstools_ignore_partname=1 dyndbg=\"file drivers/mmc/* +p\" dynamic_debug.verbose=1 loglevel=8";
append-rootblock = "root=/dev/mmcblk0p";
Then, compile and flash the resulting build. If you are testing
before this commit on newer MMC hardware, be prepared to recover!
NOTE: If you have hardware serial console access, you don't need to
use TFTP recovery to change the active boot partition.
Reboot to working alternative partition via serial console:
1. Connect to hardware serial console
* See https://openwrt.org/toh/zyxel/nbg6817#serial
2. Interrupt boot at "Hit any key to stop autoboot:"
3. Run "ATSE NBG6817"
4. Copy the result (e.g. "001976FE4B04")
* Changes with **every boot** - can't reuse this
5. On your local system, run
"./zyxel-uboot-password-tool.sh <copied value here>"
* Example: "./zyxel-uboot-password-tool.sh 001976FE4B04"
6. Run the command provided by the password tool
* Example: "ATEN 1,910F129B"
* Changes with **every boot** - can't reuse this
7. Run "ATGU"
* You now have full u-boot shell until next boot - unlocking is
not remembered
8. Run either "run boot_mmc" (for booting partition set "FF") or
"run boot_mmc_1" (for booting partition set "01")
* These commands are not affected by dual-boot partition flags
NOTE: This will NOT set the dual-boot partition flag. You'll need to
fix that manually. The "nbg6817-dualboot" script may help:
https://github.com/pkgadd/nbg6817/blob/master/nbg6817-dualboot
zyxel-uboot-password-tool.sh - sourced from
commit
|
||
|---|---|---|
| .. | ||
| 082-ipq8064-dtsi-tweaks.patch | ||
| 083-ipq8064-dtsi-additions.patch | ||
| 084-ipq8064-v1.0-dtsi-cleanup.patch | ||
| 085-ipq8064-v1.0-dtsi-additions.patch | ||
| 086-ipq8064-fix-duplicate-node.patch | ||
| 093-drivers-cpufreq-qcom-cpufreq-nvmem-support-specific-.patch | ||
| 097-1-ipq806x-gcc-add-missing-clk-flag.patch | ||
| 097-2-ipq806x-lcc-add-missing-reset.patch | ||
| 097-3-clk-qcom-krait-add-missing-enable-disable.patch | ||
| 097-4-ipq806x-gcc-add-missing-clk-and-reset-for-crypto-eng.patch | ||
| 098-1-cpufreq-add-Krait-dedicated-scaling-driver.patch | ||
| 098-2-Documentation-cpufreq-add-qcom-krait-cpufreq-binding.patch | ||
| 098-3-add-fab-scaling-support-with-cpufreq.patch | ||
| 099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch | ||
| 099-2-Documentation-devicetree-mtd-qcom_nandc-document-qco.patch | ||
| 100-v5.11-dmaengine-qcom-add_ADM_driver.patch | ||
| 101-5.12-mtd-parsers-Add-Qcom-SMEM-parser.patch | ||
| 101-dwmac-ipq806x-qsgmii-pcs-all-ch-ctl.patch | ||
| 102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch | ||
| 103-ARM-dts-qcom-reduce-pci-IO-size-to-64K.patch | ||
| 104-1-drivers-thermal-tsens-Add-VER_0-tsens-version.patch | ||
| 104-2-drivers-thermal-tsens-Don-t-hardcode-sensor-slope.patch | ||
| 104-3-drivers-thermal-tsens-Convert-msm8960-to-reg_field.patch | ||
| 104-4-drivers-thermal-tsens-Use-init_common-for-msm8960.patch | ||
| 104-5-drivers-thermal-tsens-Fix-bug-in-sensor-enable-for-m.patch | ||
| 104-6-drivers-thermal-tsens-Replace-custom-8960-apis-with-.patch | ||
| 104-7-drivers-thermal-tsens-Drop-unused-define-for-msm8960.patch | ||
| 104-8-drivers-thermal-tsens-Add-support-for-ipq8064-tsens.patch | ||
| 104-9-dt-bindings-thermal-tsens-Document-ipq8064-bindings.patch | ||
| 105-10-drivers-thermal-tsens-Fix-wrong-slope-on-msm-8960.patch | ||
| 107-1-thermal-qcom-tsens-init-debugfs-only-with-successful.patch | ||
| 107-2-thermal-qcom-tsens-simplify-debugfs-init-function.patch | ||
| 108-v5.14-net-stmmac-explicitly-deassert-gmac-ahb-reset.patch | ||
| 109-v5.15-arm-dts-qcom-add-ahb-reset-to-ipq806x-gmac.patch | ||
| 850-soc-add-qualcomm-syscon.patch | ||
| 900-arm-add-cmdline-override.patch | ||
| 997-device_tree_cmdline.patch | ||
| 0001-dtbindings-qcom_adm-Fix-channel-specifiers.patch | ||
| 0033-ARM-qcom-automatically-select-PCI_DOMAINS-if-PCI-is-.patch | ||
| 0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch | ||
| 0065-arm-override-compiler-flags.patch | ||
| 0067-generic-Mangle-bootloader-s-kernel-arguments.patch | ||
| 0069-arm-boot-add-dts-files.patch | ||
| 0072-add-ipq806x-with-no-clocks.patch | ||