mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-14 19:23:53 +02:00
cddd459140
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 91c2f372e3f70ab5b5afff5af60348fd5656d739 Mon Sep 17 00:00:00 2001
|
|
From: Camelia Groza <camelia.groza@nxp.com>
|
|
Date: Wed, 10 Oct 2018 17:30:18 +0300
|
|
Subject: [PATCH] staging/fsl_qbman: stop using current_kernel_time()
|
|
|
|
The current_kernel_time() call was removed in [1] in order to avoid
|
|
overflows in 2038. Use ktime_get_coarse_real_ts64() instead.
|
|
|
|
[1] 9765164 ("y2038: remove unused time interfaces")
|
|
|
|
Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
|
|
---
|
|
drivers/staging/fsl_qbman/qbman_driver.c | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/staging/fsl_qbman/qbman_driver.c
|
|
+++ b/drivers/staging/fsl_qbman/qbman_driver.c
|
|
@@ -57,7 +57,10 @@ static __init int qbman_init(void)
|
|
};
|
|
struct qm_mcr_queryfq_np np;
|
|
int err, retry = CONFIG_FSL_QMAN_INIT_TIMEOUT;
|
|
- struct timespec nowts, diffts, startts = current_kernel_time();
|
|
+ struct timespec64 nowts, diffts, startts;
|
|
+
|
|
+ ktime_get_coarse_real_ts64(&startts);
|
|
+
|
|
/* Loop while querying given fqid succeeds or time out */
|
|
while (1) {
|
|
err = qman_query_fq_np(&fq, &np);
|
|
@@ -68,8 +71,8 @@ static __init int qbman_init(void)
|
|
pr_err("QMan: I/O error, continuing anyway\n");
|
|
break;
|
|
}
|
|
- nowts = current_kernel_time();
|
|
- diffts = timespec_sub(nowts, startts);
|
|
+ ktime_get_coarse_real_ts64(&nowts);
|
|
+ diffts = timespec64_sub(nowts, startts);
|
|
if (diffts.tv_sec > 0) {
|
|
if (!retry--) {
|
|
pr_err("QMan: time out, control-plane"
|