05b8e84362
Manually merged:
backport-5.4
011-kbuild-export-SUBARCH.patch
layerscape
701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch
All other modifications made by update_kernel.sh
Build-tested: x86/64, lantiq/xrx200, ramips/mt7621
Run-tested: ipq806x (R7800), lantiq/xrx200, x86/64, ramips (RT-AC57U)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[minor commit message adjustments]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
87 lines
2.3 KiB
Diff
87 lines
2.3 KiB
Diff
From c2939a719ebc7b39453f47ad2d8d30fc06ef4be6 Mon Sep 17 00:00:00 2001
|
|
From: Ioana Ciornei <ioana.ciornei@nxp.com>
|
|
Date: Tue, 13 Mar 2018 13:57:00 +0200
|
|
Subject: [PATCH] bus: fsl-mc: move fsl_mc_command struct in a uapi header
|
|
|
|
Define "struct fsl_mc_command" as a structure that can cross the
|
|
user/kernel boundary.
|
|
|
|
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
|
|
---
|
|
MAINTAINERS | 2 ++
|
|
include/linux/fsl/mc.h | 8 +-------
|
|
include/uapi/linux/fsl_mc.h | 25 +++++++++++++++++++++++++
|
|
3 files changed, 28 insertions(+), 7 deletions(-)
|
|
create mode 100644 include/uapi/linux/fsl_mc.h
|
|
|
|
--- a/MAINTAINERS
|
|
+++ b/MAINTAINERS
|
|
@@ -13437,6 +13437,8 @@ S: Maintained
|
|
F: drivers/bus/fsl-mc/
|
|
F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
|
|
F: Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
|
|
+F: Documentation/networking/dpaa2/overview.rst
|
|
+F: include/uapi/linux/fsl_mc.h
|
|
|
|
QT1010 MEDIA DRIVER
|
|
M: Antti Palosaari <crope@iki.fi>
|
|
--- a/include/linux/fsl/mc.h
|
|
+++ b/include/linux/fsl/mc.h
|
|
@@ -12,6 +12,7 @@
|
|
#include <linux/device.h>
|
|
#include <linux/mod_devicetable.h>
|
|
#include <linux/interrupt.h>
|
|
+#include <uapi/linux/fsl_mc.h>
|
|
|
|
#define FSL_MC_VENDOR_FREESCALE 0x1957
|
|
|
|
@@ -199,8 +200,6 @@ struct fsl_mc_device {
|
|
#define to_fsl_mc_device(_dev) \
|
|
container_of(_dev, struct fsl_mc_device, dev)
|
|
|
|
-#define MC_CMD_NUM_OF_PARAMS 7
|
|
-
|
|
struct mc_cmd_header {
|
|
u8 src_id;
|
|
u8 flags_hw;
|
|
@@ -210,11 +209,6 @@ struct mc_cmd_header {
|
|
__le16 cmd_id;
|
|
};
|
|
|
|
-struct fsl_mc_command {
|
|
- __le64 header;
|
|
- __le64 params[MC_CMD_NUM_OF_PARAMS];
|
|
-};
|
|
-
|
|
enum mc_cmd_status {
|
|
MC_CMD_STATUS_OK = 0x0, /* Completed successfully */
|
|
MC_CMD_STATUS_READY = 0x1, /* Ready to be processed */
|
|
--- /dev/null
|
|
+++ b/include/uapi/linux/fsl_mc.h
|
|
@@ -0,0 +1,25 @@
|
|
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
|
+/*
|
|
+ * Management Complex (MC) userspace public interface
|
|
+ *
|
|
+ * Copyright 2018 NXP
|
|
+ *
|
|
+ */
|
|
+#ifndef _UAPI_FSL_MC_H_
|
|
+#define _UAPI_FSL_MC_H_
|
|
+
|
|
+#include <linux/types.h>
|
|
+
|
|
+#define MC_CMD_NUM_OF_PARAMS 7
|
|
+
|
|
+/**
|
|
+ * struct fsl_mc_command - Management Complex (MC) command structure
|
|
+ * @header: MC command header
|
|
+ * @params: MC command parameters
|
|
+ */
|
|
+struct fsl_mc_command {
|
|
+ __le64 header;
|
|
+ __le64 params[MC_CMD_NUM_OF_PARAMS];
|
|
+};
|
|
+
|
|
+#endif /* _UAPI_FSL_MC_H_ */
|