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>
100 lines
3.3 KiB
Diff
100 lines
3.3 KiB
Diff
From 350201cc09a58dcf5c49f636238b01637f5ee06d Mon Sep 17 00:00:00 2001
|
|
From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
|
|
Date: Fri, 13 Apr 2018 11:35:10 +0300
|
|
Subject: [PATCH] bus: fsl-mc: Add dprc-reset-container support
|
|
|
|
DPRC-reset is required for VFIO and is missing from
|
|
mc-bus support.
|
|
This patch added reset-container support.
|
|
|
|
Signed-off-by: Bharat Bhushan <Bharat.Bhushan@nxp.com>
|
|
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
|
|
---
|
|
drivers/bus/fsl-mc/dprc.c | 41 +++++++++++++++++++++++++++++++++++++
|
|
drivers/bus/fsl-mc/fsl-mc-private.h | 10 +++++++++
|
|
2 files changed, 51 insertions(+)
|
|
|
|
--- a/drivers/bus/fsl-mc/dprc.c
|
|
+++ b/drivers/bus/fsl-mc/dprc.c
|
|
@@ -73,6 +73,47 @@ int dprc_close(struct fsl_mc_io *mc_io,
|
|
EXPORT_SYMBOL_GPL(dprc_close);
|
|
|
|
/**
|
|
+ * dprc_reset_container - Reset child container.
|
|
+ * @mc_io: Pointer to MC portal's I/O object
|
|
+ * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_'
|
|
+ * @token: Token of DPRC object
|
|
+ * @child_container_id: ID of the container to reset
|
|
+ *
|
|
+ * In case a software context crashes or becomes non-responsive, the parent
|
|
+ * may wish to reset its resources container before the software context is
|
|
+ * restarted.
|
|
+ *
|
|
+ * This routine informs all objects assigned to the child container that the
|
|
+ * container is being reset, so they may perform any cleanup operations that are
|
|
+ * needed. All objects handles that were owned by the child container shall be
|
|
+ * closed.
|
|
+ *
|
|
+ * Note that such request may be submitted even if the child software context
|
|
+ * has not crashed, but the resulting object cleanup operations will not be
|
|
+ * aware of that.
|
|
+ *
|
|
+ * Return: '0' on Success; Error code otherwise.
|
|
+ */
|
|
+int dprc_reset_container(struct fsl_mc_io *mc_io,
|
|
+ u32 cmd_flags,
|
|
+ u16 token,
|
|
+ int child_container_id)
|
|
+{
|
|
+ struct fsl_mc_command cmd = { 0 };
|
|
+ struct dprc_cmd_reset_container *cmd_params;
|
|
+
|
|
+ /* prepare command */
|
|
+ cmd.header = mc_encode_cmd_header(DPRC_CMDID_RESET_CONT,
|
|
+ cmd_flags, token);
|
|
+ cmd_params = (struct dprc_cmd_reset_container *)cmd.params;
|
|
+ cmd_params->child_container_id = cpu_to_le32(child_container_id);
|
|
+
|
|
+ /* send command to mc*/
|
|
+ return mc_send_command(mc_io, &cmd);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(dprc_reset_container);
|
|
+
|
|
+/**
|
|
* dprc_set_irq() - Set IRQ information for the DPRC to trigger an interrupt.
|
|
* @mc_io: Pointer to MC portal's I/O object
|
|
* @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_'
|
|
--- a/drivers/bus/fsl-mc/fsl-mc-private.h
|
|
+++ b/drivers/bus/fsl-mc/fsl-mc-private.h
|
|
@@ -93,6 +93,7 @@ int dpmcp_reset(struct fsl_mc_io *mc_io,
|
|
#define DPRC_CMDID_GET_API_VERSION DPRC_CMD(0xa05)
|
|
|
|
#define DPRC_CMDID_GET_ATTR DPRC_CMD(0x004)
|
|
+#define DPRC_CMDID_RESET_CONT DPRC_CMD(0x005)
|
|
|
|
#define DPRC_CMDID_SET_IRQ DPRC_CMD(0x010)
|
|
#define DPRC_CMDID_SET_IRQ_ENABLE DPRC_CMD(0x012)
|
|
@@ -111,6 +112,10 @@ struct dprc_cmd_open {
|
|
__le32 container_id;
|
|
};
|
|
|
|
+struct dprc_cmd_reset_container {
|
|
+ __le32 child_container_id;
|
|
+};
|
|
+
|
|
struct dprc_cmd_set_irq {
|
|
/* cmd word 0 */
|
|
__le32 irq_val;
|
|
@@ -394,6 +399,11 @@ int dprc_get_container_id(struct fsl_mc_
|
|
u32 cmd_flags,
|
|
int *container_id);
|
|
|
|
+int dprc_reset_container(struct fsl_mc_io *mc_io,
|
|
+ u32 cmd_flags,
|
|
+ u16 token,
|
|
+ int child_container_id);
|
|
+
|
|
/*
|
|
* Data Path Buffer Pool (DPBP) API
|
|
*/
|