aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.9
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-05-13 10:54:43 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-05-15 11:28:40 +0200
commitf053a8ce415da2e276dfd54288a02a98a819d09e (patch)
tree40194814144c7543fb3f8f3d4c1cdfa7ceee4d2c /target/linux/layerscape/patches-4.9
parent412d80cdb7a3a9fc610dbdd29529b06c63c36a62 (diff)
downloadupstream-f053a8ce415da2e276dfd54288a02a98a819d09e.tar.gz
upstream-f053a8ce415da2e276dfd54288a02a98a819d09e.tar.bz2
upstream-f053a8ce415da2e276dfd54288a02a98a819d09e.zip
kernel: bump 4.9 to 4.9.175
Refreshed all patches. Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape/patches-4.9')
-rw-r--r--target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch2
-rw-r--r--target/linux/layerscape/patches-4.9/818-vfio-support-layerscape.patch8
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch
index 310104de7c..953f02de6c 100644
--- a/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch
@@ -1710,7 +1710,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
#define BCSR5_INT_USB (0x02)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
-@@ -362,6 +362,7 @@ struct usb_bus {
+@@ -360,6 +360,7 @@ struct usb_bus {
* for control transfers?
*/
u8 otg_port; /* 0, or number of OTG/HNP port */
diff --git a/target/linux/layerscape/patches-4.9/818-vfio-support-layerscape.patch b/target/linux/layerscape/patches-4.9/818-vfio-support-layerscape.patch
index 05806a98d0..84eda53467 100644
--- a/target/linux/layerscape/patches-4.9/818-vfio-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/818-vfio-support-layerscape.patch
@@ -1086,7 +1086,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
#define DRIVER_VERSION "0.2"
#define DRIVER_AUTHOR "Alex Williamson <alex.williamson@redhat.com>"
-@@ -720,6 +722,27 @@ static void vfio_test_domain_fgsp(struct
+@@ -733,6 +735,27 @@ static void vfio_test_domain_fgsp(struct
__free_pages(pages, order);
}
@@ -1114,7 +1114,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
static int vfio_iommu_type1_attach_group(void *iommu_data,
struct iommu_group *iommu_group)
{
-@@ -728,6 +751,8 @@ static int vfio_iommu_type1_attach_group
+@@ -741,6 +764,8 @@ static int vfio_iommu_type1_attach_group
struct vfio_domain *domain, *d;
struct bus_type *bus = NULL;
int ret;
@@ -1123,7 +1123,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
mutex_lock(&iommu->lock);
-@@ -774,11 +799,15 @@ static int vfio_iommu_type1_attach_group
+@@ -787,11 +812,15 @@ static int vfio_iommu_type1_attach_group
if (ret)
goto out_domain;
@@ -1141,7 +1141,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
pr_warn("%s: No interrupt remapping support. Use the module param \"allow_unsafe_interrupts\" to enable VFIO IOMMU support on this platform\n",
__func__);
ret = -EPERM;
-@@ -820,6 +849,12 @@ static int vfio_iommu_type1_attach_group
+@@ -833,6 +862,12 @@ static int vfio_iommu_type1_attach_group
if (ret)
goto out_detach;