diff options
author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/701-net-0406-sdk_qbman-Only-create-debugfs-entries-when-QBMan-is-.patch | |
parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
download | upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2 upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip |
layerscape: add patches-5.4
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>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0406-sdk_qbman-Only-create-debugfs-entries-when-QBMan-is-.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0406-sdk_qbman-Only-create-debugfs-entries-when-QBMan-is-.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0406-sdk_qbman-Only-create-debugfs-entries-when-QBMan-is-.patch b/target/linux/layerscape/patches-5.4/701-net-0406-sdk_qbman-Only-create-debugfs-entries-when-QBMan-is-.patch new file mode 100644 index 0000000000..889aecc383 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/701-net-0406-sdk_qbman-Only-create-debugfs-entries-when-QBMan-is-.patch @@ -0,0 +1,69 @@ +From f34c01773d5dbd2db04200079bb4d32ecb0cd847 Mon Sep 17 00:00:00 2001 +From: Roy Pledge <roy.pledge@nxp.com> +Date: Tue, 18 Feb 2020 14:02:21 -0500 +Subject: [PATCH] sdk_qbman: Only create debugfs entries when QBMan is part of + device tree + +Only create debugfs entries if the QBMan nodes exist in the device +tree. + +Signed-off-by: Roy Pledge <roy.pledge@nxp.com> +Acked-by: Madalin Bucur <madalin.bucur@nxp.com> +Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> +--- + drivers/staging/fsl_qbman/bman_debugfs.c | 8 +++++++- + drivers/staging/fsl_qbman/qman_debugfs.c | 17 ++++++++++------- + 2 files changed, 17 insertions(+), 8 deletions(-) + +--- a/drivers/staging/fsl_qbman/bman_debugfs.c ++++ b/drivers/staging/fsl_qbman/bman_debugfs.c +@@ -33,6 +33,7 @@ + #include <linux/debugfs.h> + #include <linux/seq_file.h> + #include <linux/uaccess.h> ++#include <linux/of.h> + + static struct dentry *dfs_root; /* debugfs root directory */ + +@@ -83,9 +84,14 @@ static int __init bman_debugfs_module_in + { + int ret = 0; + struct dentry *d; ++ struct device_node *dn; + ++ dn = of_find_compatible_node(NULL, NULL, "fsl,bman"); ++ if (!dn) { ++ pr_debug("No fsl,bman node\n"); ++ return 0; ++ } + dfs_root = debugfs_create_dir("bman", NULL); +- + if (dfs_root == NULL) { + ret = -ENOMEM; + pr_err("Cannot create bman debugfs dir\n"); +--- a/drivers/staging/fsl_qbman/qman_debugfs.c ++++ b/drivers/staging/fsl_qbman/qman_debugfs.c +@@ -1457,13 +1457,16 @@ static int __init qman_debugfs_module_in + + fqid_max = 0; + init_ccsrmempeek(); +- if (qman_ccsr_start) { +- if (!qman_ccsrmempeek(®, QM_FQD_AR)) { +- /* extract the size of the FQD window */ +- reg = reg & 0x3f; +- /* calculate valid frame queue descriptor range */ +- fqid_max = (1 << (reg + 1)) / QM_FQD_BLOCK_SIZE; +- } ++ if (!qman_ccsr_start) { ++ /* No QMan node found in device tree */ ++ return 0; ++ } ++ ++ if (!qman_ccsrmempeek(®, QM_FQD_AR)) { ++ /* extract the size of the FQD window */ ++ reg = reg & 0x3f; ++ /* calculate valid frame queue descriptor range */ ++ fqid_max = (1 << (reg + 1)) / QM_FQD_BLOCK_SIZE; + } + dfs_root = debugfs_create_dir("qman", NULL); + fqd_root = debugfs_create_dir("fqd", dfs_root); |