From 83ce31d3d88429b094f3436446294a17fa7041d4 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 25 Dec 2019 17:56:52 +0100 Subject: kernel: bump 4.9 to 4.9.207 Refreshed all patches. Compile-tested on: lantiq Runtime-tested on: none Signed-off-by: Hauke Mehrtens --- .../patches-4.9/202-core-linux-support-layerscape.patch | 8 ++++---- .../layerscape/patches-4.9/809-i2c-support-layerscape.patch | 2 +- .../layerscape/patches-4.9/817-usb-support-layerscape.patch | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'target/linux/layerscape') diff --git a/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch index 2ffe1b20f0..aa77780309 100644 --- a/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch @@ -365,9 +365,9 @@ Signed-off-by: Yangbo Lu * @type: Interface hardware type * @hard_header_len: Maximum hardware header length. * @min_header_len: Minimum hardware header length -@@ -1738,6 +1740,8 @@ struct net_device { - unsigned char dma; - +@@ -1743,6 +1745,8 @@ struct net_device { + * and to use WRITE_ONCE() to annotate the writes. + */ unsigned int mtu; + unsigned int min_mtu; + unsigned int max_mtu; @@ -421,7 +421,7 @@ Signed-off-by: Yangbo Lu * These are the defined Ethernet Protocol ID's. --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -6659,9 +6659,18 @@ int dev_set_mtu(struct net_device *dev, +@@ -6660,9 +6660,18 @@ int dev_set_mtu(struct net_device *dev, if (new_mtu == dev->mtu) return 0; diff --git a/target/linux/layerscape/patches-4.9/809-i2c-support-layerscape.patch b/target/linux/layerscape/patches-4.9/809-i2c-support-layerscape.patch index ffb95cc342..b01ab98400 100644 --- a/target/linux/layerscape/patches-4.9/809-i2c-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/809-i2c-support-layerscape.patch @@ -257,7 +257,7 @@ Signed-off-by: Yangbo Lu /* Get I2C clock */ i2c_imx->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(i2c_imx->clk)) { -@@ -1099,7 +1292,7 @@ static int i2c_imx_probe(struct platform +@@ -1100,7 +1293,7 @@ static int i2c_imx_probe(struct platform } /* Request IRQ */ 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 126829ad3b..ddfbc4a652 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 @@ -1418,7 +1418,7 @@ Signed-off-by: Yangbo Lu --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -1859,14 +1859,17 @@ static int finish_td(struct xhci_hcd *xh +@@ -1855,14 +1855,17 @@ static int finish_td(struct xhci_hcd *xh union xhci_trb *event_trb, struct xhci_transfer_event *event, struct xhci_virt_ep *ep, int *status, bool skip) { @@ -1436,7 +1436,7 @@ Signed-off-by: Yangbo Lu u32 trb_comp_code; slot_id = TRB_TO_SLOT_ID(le32_to_cpu(event->flags)); -@@ -1892,13 +1895,29 @@ static int finish_td(struct xhci_hcd *xh +@@ -1888,13 +1891,29 @@ static int finish_td(struct xhci_hcd *xh if (trb_comp_code == COMP_STALL || xhci_requires_manual_halt_cleanup(xhci, ep_ctx, trb_comp_code)) { @@ -1473,7 +1473,7 @@ Signed-off-by: Yangbo Lu while (ep_ring->dequeue != td->last_trb) --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1619,14 +1619,38 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1616,14 +1616,38 @@ int xhci_urb_dequeue(struct usb_hcd *hcd ret = -ENOMEM; goto done; } @@ -1521,7 +1521,7 @@ Signed-off-by: Yangbo Lu spin_unlock_irqrestore(&xhci->lock, flags); --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1626,7 +1626,7 @@ struct xhci_hcd { +@@ -1627,7 +1627,7 @@ struct xhci_hcd { #define XHCI_STATE_REMOVING (1 << 2) /* Statistics */ int error_bitmask; @@ -1530,7 +1530,7 @@ Signed-off-by: Yangbo Lu #define XHCI_LINK_TRB_QUIRK (1 << 0) #define XHCI_RESET_EP_QUIRK (1 << 1) #define XHCI_NEC_HOST (1 << 2) -@@ -1662,6 +1662,9 @@ struct xhci_hcd { +@@ -1663,6 +1663,9 @@ struct xhci_hcd { #define XHCI_SSIC_PORT_UNUSED (1 << 22) #define XHCI_NO_64BIT_SUPPORT (1 << 23) #define XHCI_MISSING_CAS (1 << 24) -- cgit v1.2.3