14 Dec, 2021
1 commit
12 Mar, 2021
1 commit
-
* origin/imx_v2020.04:
MA-18775 system will hang about 3s when boot up kernel
MA-18680-2 Support derive rpmb key from BKEK
MA-18680-1 Support BKEK generation
MLK-25287 imx8mq/mp: Use index parameter of gadget interrupt handler
MLK-25271: new qspihdr subsystem for u-boot q(f)spi boot
10 Mar, 2021
5 commits
-
system will hang at line 1834 which will hold console_waiter
1833 /* Owner will clear console_waiter on hand off */
1834 while (READ_ONCE(console_waiter))
1835 cpu_relax();
1836 spin_release(&console_owner_dep_map, _THIS_IP_);It means console_lock_spinning_disable_and_check is not called in time.
So console_unlock may not called in time.
remove earlycon as workaround.Change-Id: I5742c0ade6e289d1a96a67b27b4e55f2e1732187
Signed-off-by: zhang sanshan
(cherry picked from commit 74938a70b5fece2d1f3f60e74596f393a40e5713) -
The BKEK will bind to the soc chip and we don't need to
store the encapsulated keyslot after using BKEK as the
rpmb key, which reduces the risk of losing the rpmb key.This commit adds two commands to support derive the rpmb
key from BKEK and erase the rpmb storage (for debug purpose,
need support from trusty):
$ fastboot oem set-rpmb-hardware-key
$ fastboot oem erase-rpmbLegacy keyslot way is still supported and boards programed
with keyslot can still work in compatible way. Command
to set provisioned rpmb key is changed to:
$ fastboot stage
$ fastboot oem set-rpmb-staged-keyTest: Key set and boot on imx8mn/imx8qxp.
Change-Id: Ifc88010fe8802d3550e42dff0bbd5a5e5ad922a3
Signed-off-by: Ji Luo
(cherry picked from commit 0fd1b5e41645ac3f5c05ad82258df1645c59fb5a) -
Add support for generating BKEK, this is necessary
to support derive the rpmb key from bkek.Test: BKEK generation.
Change-Id: I4c192a3e1d080ca49655537705d31678d1ca689a
Signed-off-by: Ji Luo
(cherry picked from commit 048934cebaa2035bf54dbd9bd32de3f782cb07df) -
The latest declare of usb_gadget_handle_interrupts has a parameter
to pass the USB controller index. We can use this index for DWC3
interrupt handler to avoid hard code for USB controller 0.
This will save a change when porting to second USB controller.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit 6a678c46b01c620755dc4eb4334caf475faf0ee8) -
qspihdr is a new subsystem in u-boot to check/updat q(f)spi boot config
headers. It's already integrated with uuu and can be used to burn
q(f)spi boot images for i.MX6/7/8 families.Basic usage:
check [addr]: check if exists valid q(f)spi boot config header at
spcified memory addr, or check the nor chip without addr
dump [addr] : dump q(f)spi boot config header content from spcified
memory addr, or from nor chip without addr
init addr len safe: burn boot image from memory addr with size of len to
q(f)spi, with safe boot config header
update safe : only update header in q(f)spi to a safe boot configSigned-off-by: Han Xu
(cherry picked from commit dc0ba70f5ba04425e9562c1dd4f6dcb7db322f4b)
05 Mar, 2021
2 commits
-
* origin/ls_v2020.04:
arm64: gic-v3-its: Clear the Pending table before enabling LPIs -
The GICv3 RM requires "The first 1KB of memory for the LPI Pending tables
must contain only zeros on initial allocation, and this must be visible
to the Redistributors, or else the effect is UNPREDICTABLE".And as the following statement, we here clear the whole Pending tables
instead of the first 1KB.
"An LPI Pending table that contains only zeros, including in the first 1KB,
indicates that there are no pending LPIs.
The first 1KB of the LPI Pending table is IMPLEMENTATION DEFINED. However,
if the first 1KB of the LPI Pending table and the rest of the table contain
only zeros, this must indicate that there are no pending LPIs."And there isn't any pending LPI under U-Boot, so it's unnecessary to
loading the contents of the Pending table during the enablement, then set
the GICR_PENDBASER.PTZ flag.Signed-off-by: Hou Zhiqiang
Tested-by: Vladimir Oltean
01 Mar, 2021
1 commit
-
* origin/imx_v2020.04:
MLK-25320 video: imx_lcdifv3: Add memory priority threshold setting
27 Feb, 2021
1 commit
-
Add the panic control from kernel for lcdifv3 to increase the memory
request priority to resolve QoS issue.
User can adjust the thresholds by using 'thres-low' and 'thres-high'
properties in DTS.Signed-off-by: Ye Li
Reviewed-by: Jian Li
(cherry picked from commit f81e7caa100940206550ee4e2f64b5b799a5d92e)
23 Feb, 2021
1 commit
-
* origin/imx_v2020.04:
MLK-25310 imx8m: ddr: Disable CA VREF Training for LPDDR4
21 Feb, 2021
1 commit
-
Users reported LPDDR4 MR12 value is set to 0 during PHY training,
not the value from FSP timing structure, which cause compliance test failed.
The root cause is the CATrainOpt[0] is set to 1 in 2D FSP timing
but not set in 1D. According to PHY training application node,
to enable the feature both 1D and 2D need set this field to 1,
otherwise the training result will be incorrect.
The PHY training doc also recommends to set CATrainOpt[0] to 0 to use
MR12 value from message block (FSP structure). So update the LPDDR4
scripts of all mscale to clear CATrainOpt[0].Signed-off-by: Ye Li
Reviewed-by: Jacky Bai
(cherry picked from commit 2c98fb859258478e0f8bb8df980a96edff19d359)
05 Feb, 2021
13 commits
-
* origin/imx_v2020.04:
MLK-25291-3 imx8mq_evk: Applying default LPDDR4 script for B2
MLK-25291-2 misc: ocotp: Update OCOTP driver for iMX8MQ B2
MLK-25291-1 iMX8MQ: Recognize the B2 revision -
Both i.MX8MQ B1 and B2 should use default LPDDR4 script, while B0
has another dedicated script.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit 2beb72ddfd5416be7d8fa6e9fb36b1e29a0f0cb7) -
i.MX8MQ B2 also has fixed value in OCOTP_READ_FUSE_DATA register,
so it does not support "fuse sense" command like B1.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit 357cf646bc3b9fc8d3b4f760e030545e83df2cdf) -
i.MX8MQ B2 is using same value in OCOTP_READ_FUSE_DATA like B1, so
we have to check the ROM verision to distinguish the revision.As we have checked the B1 rev for sticky bits work around in
secure boot. So it won't apply on B2.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit 1ac96bde4920fa3e2a3bb4a79b342ca4f5adb4a5) -
* origin/ls_v2020.04: (8 commits)
configs: ls208xa: Enable GIC_V3_ITS config
configs: ls1028a: Enable GIC_V3_ITS config
configs: ls1088a: Enable GIC_V3_ITS config
arm64: layerscape: Move GIC RD tables initialization to CPU setup function
fsl-layerscape: Kconfig: Select RESV_RAM config if GIC_V3_ITS is enabled
... -
Enable GIC_V3_ITS config to initialize the GIC redistributor
tables.Signed-off-by: Hou Zhiqiang
-
Enable GIC_V3_ITS config to initialize the GIC redistributor
tables.Signed-off-by: Hou Zhiqiang
-
Enable GIC_V3_ITS config to initialize the GIC redistributor
tables.Signed-off-by: Hou Zhiqiang
-
Move GIC redistributor tables initialization to CPU setup function.
This patch introduces a GIC redistributor tables init function, and
moves the function of reserving memory for GIC redistributor tables
to soc.c and adds a argument for the memory size to reserve, BTW
rename the function so that it is more readable.Signed-off-by: Hou Zhiqiang
-
The GIC redistributor tables initialization depends on RESV_RAM config,
so select RESV_RAM if GIC_V3_ITS is enabled.Signed-off-by: Hou Zhiqiang
-
As the lower 16bit of the redistributor pending table is reserved
for describing the memory attributes, we must give a 64KB aligned
address to the GIC LPI initialization function.Signed-off-by: Hou Zhiqiang
-
Program the GIC redistributor tables only when succeeded to reserve memory
for them, otherwise kernel will lose the chance to program them using
allocated memory.Signed-off-by: Hou Zhiqiang
-
The initialization of gd->arch.resv_ram pointer should depend on if the
RESV_RAM config is enabled.Signed-off-by: Hou Zhiqiang
28 Jan, 2021
3 commits
-
* origin/imx_v2020.04:
MA-18635 Android: eliminate build warnings
MA-18634-2 Android: sync config change
MA-18634-1 Android: refine config dependency -
* origin/ls_v2020.04:
arm: dts: ls1028a: define QDS networking protocol combinations -
Includes DT definition for the following serdes protocols using various
PHY cards: 85xx, 13xx, 65xx, 9999, 7777.Note that the default device tree for QDS now uses 85xx.
Enabling any of the others requires patching the fsl-ls1028a-qds.dtsi
file (the includes at the bottom of the file).Signed-off-by: Alex Marginean
Signed-off-by: Vladimir Oltean
27 Jan, 2021
3 commits
-
* origin/ls_v2020.04:
net: memac_phy: add a timeout to MDIO operations
armv8: lx2: SVR_SOC_VER: Mask CAN_FD and security bit -
We have encountered circumstances when a board design does not include
pull-up resistors on the external MDIO buses which are not used. This
leads to the MDIO data line not being pulled-up, thus the MDIO controller
will always see the line as busy.Without a timeout in the MDIO bus driver, the execution is stuck in an
infinite loop when any access is initiated on that external bus.Add a timeout in the driver so that we are protected in this
circumstance. This is similar to what is being done in the Linux
xgmac_mdio driver.Signed-off-by: Ioana Ciornei
-
Multiple LX2(LX2160A/LX2162A SoC) personality variants
exists based on CAN-FD and security bit in SVR.Currenly SVR_SOC_VER mask only security bit.
Update SVR_SOC_VER to mask CAN_FD and security bit
for LX2 products.Signed-off-by: Wasim Khan
17 Jan, 2021
3 commits
-
Fix warning: unused variable 'status'.
Test: build.
Change-Id: I948a33686892f940d6be0e315756c23e0ae561ae
Signed-off-by: Ji Luo
(cherry picked from commit 0bb05e819f427780a3a74b95a78f12b6dd0acaa7) -
Sync config change after refining the config
dependency.Test: builds.
Change-Id: I32c36e822458c8eea9dde4ba4d874a65475f3a26
Signed-off-by: Ji Luo
(cherry picked from commit 45cd8014f7e81ed7b9ed7766e5d5911384eb3de4) -
Refine the dependency of some configs to make it
easier to add/modify android config files.Test: builds.
Change-Id: Iccb044dadc7ce1e0b839bf83e2e9157e718f286c
Signed-off-by: Ji Luo
(cherry picked from commit 86f4f99a367bbc0ef99d4ab2a0b4078babfbfbd2)
14 Jan, 2021
3 commits
-
* origin/imx_v2020.04:
LF-3161-2 mx6ul: bee: Remove XN bit for bee enabled region
LF-3161-1 arm: imx: Fix speculative instruction prefetch issue -
We will test a program on BEE enabled region, so remove XN bit
to allow execution when current MMU domain is changed to client.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit e4bd1734bcba2012d4d7dea7598635256f155c96) -
Default ARM32 MMU setting in u-boot sets XN bit to entire 4GB space no
matter which DCACHE option is used, and set domain permission to manager.
This causes MMU ignores the access check and XN bit, so speculative
instruction can fetch from entire space.This patch sets the DDR, ROM, OCRAM without XN bit, and set domain to client
to enable the XN and access check. So speculative instruction fetch can only
happens on these 3 regions to avoid prefetch from peripherals and invalid
regions.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit 25d70768c460bad91aa65f367203af41122399cd)
13 Jan, 2021
2 commits
-
* origin/ls_v2020.04:
armv8: ls1028a: fix stream id allocation
configs: ls1088aqds: add COMMON_ENV to fix distroboot
board: fsl: ls2088ardb: Program GIC LPI configuration table -
When A-050382 errata is enabled, ECAM and EDMA have
conflicting stream id 40. This patch fixes the same.Signed-off-by: Nipun Gupta