Skip to content

Commit 8d3d7f6

Browse files
committed
kernel: update kernel 4.4 to 4.4.74
Refresh patches. Compile-tested on ar71xx, octeon. Runtime-tested on ar71xx, octeon. Signed-off-by: Stijn Tintel <[email protected]>
1 parent 53eba6f commit 8d3d7f6

11 files changed

+31
-31
lines changed

include/kernel-version.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
LINUX_RELEASE?=1
44

55
LINUX_VERSION-3.18 = .43
6-
LINUX_VERSION-4.4 = .71
6+
LINUX_VERSION-4.4 = .74
77

88
LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
9-
LINUX_KERNEL_HASH-4.4.71 = 44cd5532d6df32197fd0f89e6f8c542fcfb76b52155a4d3a609ef4898522e6ab
9+
LINUX_KERNEL_HASH-4.4.74 = c319ad6150d112bd4f8c9d1427868eeafd3ab461becf9457f814e4ba7c57808e
1010

1111
ifdef KERNEL_PATCHVER
1212
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))

target/linux/apm821xx/patches-4.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter <[email protected]>
4444

4545
#include "xhci.h"
4646
#include "xhci-trace.h"
47-
@@ -221,6 +223,458 @@ static void xhci_pme_acpi_rtd3_enable(st
47+
@@ -224,6 +226,458 @@ static void xhci_pme_acpi_rtd3_enable(st
4848
static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
4949
#endif /* CONFIG_ACPI */
5050

@@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter <[email protected]>
503503
/* called during probe() after chip reset completes */
504504
static int xhci_pci_setup(struct usb_hcd *hcd)
505505
{
506-
@@ -260,6 +714,22 @@ static int xhci_pci_probe(struct pci_dev
506+
@@ -263,6 +717,22 @@ static int xhci_pci_probe(struct pci_dev
507507
struct hc_driver *driver;
508508
struct usb_hcd *hcd;
509509

@@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter <[email protected]>
526526
driver = (struct hc_driver *)id->driver_data;
527527

528528
/* Prevent runtime suspending between USB-2 and USB-3 initialization */
529-
@@ -317,6 +787,16 @@ static void xhci_pci_remove(struct pci_d
529+
@@ -320,6 +790,16 @@ static void xhci_pci_remove(struct pci_d
530530
{
531531
struct xhci_hcd *xhci;
532532

target/linux/brcm2708/patches-4.4/0029-Add-dwc_otg-driver.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ dwc_otg: Remove duplicate gadget probe/unregister function
659659
}
660660
--- a/drivers/usb/core/hub.c
661661
+++ b/drivers/usb/core/hub.c
662-
@@ -4967,7 +4967,7 @@ static void port_event(struct usb_hub *h
662+
@@ -4973,7 +4973,7 @@ static void port_event(struct usb_hub *h
663663
if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
664664
u16 status = 0, unused;
665665

target/linux/brcm2708/patches-4.4/0044-Added-hwmon-thermal-driver-for-reporting-core-temper.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Signed-off-by: Noralf Trønnes <[email protected]>
3939
depends on X86_THERMAL_VECTOR
4040
--- a/drivers/thermal/Makefile
4141
+++ b/drivers/thermal/Makefile
42-
@@ -38,6 +38,7 @@ obj-$(CONFIG_ARMADA_THERMAL) += armada_t
42+
@@ -39,6 +39,7 @@ obj-$(CONFIG_ARMADA_THERMAL) += armada_t
4343
obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o
4444
obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o
4545
obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o

target/linux/brcm2708/patches-4.4/0111-mm-Remove-the-PFN-busy-warning.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt <[email protected]>
1414

1515
--- a/mm/page_alloc.c
1616
+++ b/mm/page_alloc.c
17-
@@ -6785,8 +6785,6 @@ int alloc_contig_range(unsigned long sta
17+
@@ -6804,8 +6804,6 @@ int alloc_contig_range(unsigned long sta
1818

1919
/* Make sure the range is really isolated. */
2020
if (test_pages_isolated(outer_start, end, false)) {

target/linux/generic/patches-4.4/103-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Signed-off-by: Tobias Wolf <[email protected]>
7575

7676
--- a/mm/page_alloc.c
7777
+++ b/mm/page_alloc.c
78-
@@ -5326,7 +5326,7 @@ static void __init_refok alloc_node_mem_
78+
@@ -5345,7 +5345,7 @@ static void __init_refok alloc_node_mem_
7979
mem_map = NODE_DATA(0)->node_mem_map;
8080
#if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
8181
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)

target/linux/generic/patches-4.4/160-usb-gadget-udc-net2280-add-usb2380-support.patch

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Signed-off-by: Felipe Balbi <[email protected]>
121121
defect7374_enable_data_eps_zero(dev);
122122

123123
ep0_start(dev);
124-
@@ -3063,7 +3063,7 @@ static void handle_stat0_irqs(struct net
124+
@@ -3060,7 +3060,7 @@ static void handle_stat0_irqs(struct net
125125
}
126126
ep->stopped = 0;
127127
dev->protocol_stall = 0;
@@ -130,7 +130,7 @@ Signed-off-by: Felipe Balbi <[email protected]>
130130
if (ep->dev->quirks & PLX_2280)
131131
tmp = BIT(FIFO_OVERFLOW) |
132132
BIT(FIFO_UNDERFLOW);
133-
@@ -3090,7 +3090,7 @@ static void handle_stat0_irqs(struct net
133+
@@ -3087,7 +3087,7 @@ static void handle_stat0_irqs(struct net
134134
cpu_to_le32s(&u.raw[0]);
135135
cpu_to_le32s(&u.raw[1]);
136136

@@ -139,7 +139,7 @@ Signed-off-by: Felipe Balbi <[email protected]>
139139
defect7374_workaround(dev, u.r);
140140

141141
tmp = 0;
142-
@@ -3173,7 +3173,7 @@ static void handle_stat0_irqs(struct net
142+
@@ -3170,7 +3170,7 @@ static void handle_stat0_irqs(struct net
143143
} else {
144144
ep_vdbg(dev, "%s clear halt\n", e->ep.name);
145145
clear_halt(e);
@@ -148,7 +148,7 @@ Signed-off-by: Felipe Balbi <[email protected]>
148148
!list_empty(&e->queue) && e->td_dma)
149149
restart_dma(e);
150150
}
151-
@@ -3195,7 +3195,7 @@ static void handle_stat0_irqs(struct net
151+
@@ -3192,7 +3192,7 @@ static void handle_stat0_irqs(struct net
152152
if (e->ep.name == ep0name)
153153
goto do_stall;
154154
set_halt(e);
@@ -157,7 +157,7 @@ Signed-off-by: Felipe Balbi <[email protected]>
157157
abort_dma(e);
158158
allow_status(ep);
159159
ep_vdbg(dev, "%s set halt\n", ep->ep.name);
160-
@@ -3234,7 +3234,7 @@ do_stall:
160+
@@ -3231,7 +3231,7 @@ do_stall:
161161
#undef w_length
162162

163163
next_endpoints:
@@ -166,7 +166,7 @@ Signed-off-by: Felipe Balbi <[email protected]>
166166
u32 mask = (BIT(ENDPOINT_0_INTERRUPT) |
167167
USB3380_IRQSTAT0_EP_INTR_MASK_IN |
168168
USB3380_IRQSTAT0_EP_INTR_MASK_OUT);
169-
@@ -3399,7 +3399,7 @@ __acquires(dev->lock)
169+
@@ -3392,7 +3392,7 @@ static void handle_stat1_irqs(struct net
170170
writel(tmp, &dma->dmastat);
171171

172172
/* dma sync*/
@@ -175,7 +175,7 @@ Signed-off-by: Felipe Balbi <[email protected]>
175175
u32 r_dmacount = readl(&dma->dmacount);
176176
if (!ep->is_in && (r_dmacount & 0x00FFFFFF) &&
177177
(tmp & BIT(DMA_TRANSACTION_DONE_INTERRUPT)))
178-
@@ -3468,7 +3468,7 @@ static irqreturn_t net2280_irq(int irq,
178+
@@ -3461,7 +3461,7 @@ static irqreturn_t net2280_irq(int irq,
179179
/* control requests and PIO */
180180
handle_stat0_irqs(dev, readl(&dev->regs->irqstat0));
181181

@@ -184,7 +184,7 @@ Signed-off-by: Felipe Balbi <[email protected]>
184184
/* re-enable interrupt to trigger any possible new interrupt */
185185
u32 pciirqenb1 = readl(&dev->regs->pciirqenb1);
186186
writel(pciirqenb1 & 0x7FFFFFFF, &dev->regs->pciirqenb1);
187-
@@ -3513,7 +3513,7 @@ static void net2280_remove(struct pci_de
187+
@@ -3506,7 +3506,7 @@ static void net2280_remove(struct pci_de
188188
}
189189
if (dev->got_irq)
190190
free_irq(pdev->irq, dev);
@@ -193,7 +193,7 @@ Signed-off-by: Felipe Balbi <[email protected]>
193193
pci_disable_msi(pdev);
194194
if (dev->regs)
195195
iounmap(dev->regs);
196-
@@ -3593,7 +3593,7 @@ static int net2280_probe(struct pci_dev
196+
@@ -3586,7 +3586,7 @@ static int net2280_probe(struct pci_dev
197197
dev->dep = (struct net2280_dep_regs __iomem *) (base + 0x0200);
198198
dev->epregs = (struct net2280_ep_regs __iomem *) (base + 0x0300);
199199

@@ -202,7 +202,7 @@ Signed-off-by: Felipe Balbi <[email protected]>
202202
u32 fsmvalue;
203203
u32 usbstat;
204204
dev->usb_ext = (struct usb338x_usb_ext_regs __iomem *)
205-
@@ -3637,7 +3637,7 @@ static int net2280_probe(struct pci_dev
205+
@@ -3630,7 +3630,7 @@ static int net2280_probe(struct pci_dev
206206
goto done;
207207
}
208208

@@ -211,7 +211,7 @@ Signed-off-by: Felipe Balbi <[email protected]>
211211
if (pci_enable_msi(pdev))
212212
ep_err(dev, "Failed to enable MSI mode\n");
213213

214-
@@ -3755,10 +3755,19 @@ static const struct pci_device_id pci_id
214+
@@ -3748,10 +3748,19 @@ static const struct pci_device_id pci_id
215215
.class = ((PCI_CLASS_SERIAL_USB << 8) | 0xfe),
216216
.class_mask = ~0,
217217
.vendor = PCI_VENDOR_ID_PLX,
@@ -232,7 +232,7 @@ Signed-off-by: Felipe Balbi <[email protected]>
232232
},
233233
{
234234
.class = ((PCI_CLASS_SERIAL_USB << 8) | 0xfe),
235-
@@ -3767,7 +3776,7 @@ static const struct pci_device_id pci_id
235+
@@ -3760,7 +3769,7 @@ static const struct pci_device_id pci_id
236236
.device = 0x3382,
237237
.subvendor = PCI_ANY_ID,
238238
.subdevice = PCI_ANY_ID,

target/linux/generic/patches-4.4/655-increase_skb_pad.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/include/linux/skbuff.h
22
+++ b/include/linux/skbuff.h
3-
@@ -2180,7 +2180,7 @@ static inline int pskb_network_may_pull(
3+
@@ -2177,7 +2177,7 @@ static inline int pskb_network_may_pull(
44
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
55
*/
66
#ifndef NET_SKB_PAD

target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
1717

1818
--- a/net/core/dev.c
1919
+++ b/net/core/dev.c
20-
@@ -4246,6 +4246,9 @@ static enum gro_result dev_gro_receive(s
20+
@@ -4248,6 +4248,9 @@ static enum gro_result dev_gro_receive(s
2121
enum gro_result ret;
2222
int grow;
2323

@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
2727
if (!(skb->dev->features & NETIF_F_GRO))
2828
goto normal;
2929

30-
@@ -5405,6 +5408,48 @@ static void __netdev_adjacent_dev_unlink
30+
@@ -5404,6 +5407,48 @@ static void __netdev_adjacent_dev_unlink
3131
&upper_dev->adj_list.lower);
3232
}
3333

@@ -76,23 +76,23 @@ Signed-off-by: Felix Fietkau <[email protected]>
7676
static int __netdev_upper_dev_link(struct net_device *dev,
7777
struct net_device *upper_dev, bool master,
7878
void *private)
79-
@@ -5476,6 +5521,7 @@ static int __netdev_upper_dev_link(struc
79+
@@ -5475,6 +5520,7 @@ static int __netdev_upper_dev_link(struc
8080
goto rollback_lower_mesh;
8181
}
8282

8383
+ netdev_update_addr_mask(dev);
8484
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
8585
&changeupper_info.info);
8686
return 0;
87-
@@ -5602,6 +5648,7 @@ void netdev_upper_dev_unlink(struct net_
87+
@@ -5601,6 +5647,7 @@ void netdev_upper_dev_unlink(struct net_
8888
list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
8989
__netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr);
9090

9191
+ netdev_update_addr_mask(dev);
9292
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
9393
&changeupper_info.info);
9494
}
95-
@@ -6142,6 +6189,7 @@ int dev_set_mac_address(struct net_devic
95+
@@ -6141,6 +6188,7 @@ int dev_set_mac_address(struct net_devic
9696
if (err)
9797
return err;
9898
dev->addr_assign_type = NET_ADDR_SET;

target/linux/generic/patches-4.4/721-phy_packets.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*/
4242
--- a/include/linux/skbuff.h
4343
+++ b/include/linux/skbuff.h
44-
@@ -2211,6 +2211,10 @@ static inline int pskb_trim(struct sk_bu
44+
@@ -2208,6 +2208,10 @@ static inline int pskb_trim(struct sk_bu
4545
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
4646
}
4747

@@ -52,7 +52,7 @@
5252
/**
5353
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
5454
* @skb: buffer to alter
55-
@@ -2315,16 +2319,6 @@ static inline struct sk_buff *dev_alloc_
55+
@@ -2312,16 +2316,6 @@ static inline struct sk_buff *dev_alloc_
5656
}
5757

5858

target/linux/generic/patches-4.4/903-debloat_direct_io.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
endif
2727
--- a/include/linux/fs.h
2828
+++ b/include/linux/fs.h
29-
@@ -2717,6 +2717,7 @@ enum {
29+
@@ -2722,6 +2722,7 @@ enum {
3030
DIO_SKIP_DIO_COUNT = 0x08,
3131
};
3232

3333
+#ifdef CONFIG_DIRECT_IO
3434
void dio_end_io(struct bio *bio, int error);
3535

3636
ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
37-
@@ -2724,6 +2725,18 @@ ssize_t __blockdev_direct_IO(struct kioc
37+
@@ -2729,6 +2730,18 @@ ssize_t __blockdev_direct_IO(struct kioc
3838
loff_t offset, get_block_t get_block,
3939
dio_iodone_t end_io, dio_submit_t submit_io,
4040
int flags);

0 commit comments

Comments
 (0)