kernel: bump to 4.9.105
Refresh patches. Drop patches that have been upstreamed: target/linux/ar71xx/patches-4.9/106-01-MIPS-ath79-fix-AR724X_PLL_REG_PCIE_CONFIG-offset.patch target/linux/generic/backport-4.9/095-v4.12-ipv6-Need-to-export-ipv6_push_frag_opts-for-tunnelin.patch target/linux/generic/pending-4.9/180-net-phy-at803x-add-support-for-AT8032.patch target/linux/generic/pending-4.9/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch target/linux/generic/pending-4.9/182-net-qmi_wwan-add-BroadMobi-BM806U-2020-2033.patch Compile & run tested: ar71xx Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
committed by
John Crispin
parent
5b0c899bfd
commit
7dca1bae82
@@ -411,7 +411,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
#endif /* __SOC_BUS_H */
|
||||
--- a/include/uapi/linux/if_ether.h
|
||||
+++ b/include/uapi/linux/if_ether.h
|
||||
@@ -35,6 +35,7 @@
|
||||
@@ -36,6 +36,7 @@
|
||||
#define ETH_DATA_LEN 1500 /* Max. octets in payload */
|
||||
#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */
|
||||
#define ETH_FCS_LEN 4 /* Octets in the FCS */
|
||||
|
||||
@@ -2060,7 +2060,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
}
|
||||
--- a/drivers/pci/quirks.c
|
||||
+++ b/drivers/pci/quirks.c
|
||||
@@ -4654,3 +4654,11 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IN
|
||||
@@ -4659,3 +4659,11 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IN
|
||||
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2031, quirk_no_aersid);
|
||||
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2032, quirk_no_aersid);
|
||||
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2033, quirk_no_aersid);
|
||||
|
||||
@@ -8267,7 +8267,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
.msi_prepare = its_fsl_mc_msi_prepare,
|
||||
};
|
||||
|
||||
@@ -95,8 +95,8 @@ int __init its_fsl_mc_msi_init(void)
|
||||
@@ -97,8 +97,8 @@ int __init its_fsl_mc_msi_init(void)
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -995,7 +995,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
};
|
||||
|
||||
struct dmar_atsr_unit {
|
||||
@@ -4252,27 +4253,40 @@ static inline void init_iommu_pm_ops(voi
|
||||
@@ -4251,27 +4252,40 @@ static inline void init_iommu_pm_ops(voi
|
||||
int __init dmar_parse_one_rmrr(struct acpi_dmar_header *header, void *arg)
|
||||
{
|
||||
struct acpi_dmar_reserved_memory *rmrr;
|
||||
@@ -1041,7 +1041,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
}
|
||||
|
||||
static struct dmar_atsr_unit *dmar_find_atsr(struct acpi_dmar_atsr *atsr)
|
||||
@@ -4486,6 +4500,7 @@ static void intel_iommu_free_dmars(void)
|
||||
@@ -4485,6 +4499,7 @@ static void intel_iommu_free_dmars(void)
|
||||
list_for_each_entry_safe(rmrru, rmrr_n, &dmar_rmrr_units, list) {
|
||||
list_del(&rmrru->list);
|
||||
dmar_free_dev_scope(&rmrru->devices, &rmrru->devices_cnt);
|
||||
@@ -1049,7 +1049,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
kfree(rmrru);
|
||||
}
|
||||
|
||||
@@ -5221,6 +5236,45 @@ static void intel_iommu_remove_device(st
|
||||
@@ -5220,6 +5235,45 @@ static void intel_iommu_remove_device(st
|
||||
iommu_device_unlink(iommu->iommu_dev, dev);
|
||||
}
|
||||
|
||||
@@ -1095,7 +1095,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
#ifdef CONFIG_INTEL_IOMMU_SVM
|
||||
#define MAX_NR_PASID_BITS (20)
|
||||
static inline unsigned long intel_iommu_get_pts(struct intel_iommu *iommu)
|
||||
@@ -5351,19 +5405,21 @@ struct intel_iommu *intel_svm_device_to_
|
||||
@@ -5350,19 +5404,21 @@ struct intel_iommu *intel_svm_device_to_
|
||||
#endif /* CONFIG_INTEL_IOMMU_SVM */
|
||||
|
||||
static const struct iommu_ops intel_iommu_ops = {
|
||||
|
||||
@@ -117,12 +117,16 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1899,9 +1922,13 @@ static int lpuart_probe(struct platform_
|
||||
@@ -1899,13 +1922,13 @@ static int lpuart_probe(struct platform_
|
||||
|
||||
ret = of_alias_get_id(np, "serial");
|
||||
if (ret < 0) {
|
||||
- dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
|
||||
- return ret;
|
||||
- }
|
||||
- if (ret >= ARRAY_SIZE(lpuart_ports)) {
|
||||
- dev_err(&pdev->dev, "serial%d out of range\n", ret);
|
||||
- return -EINVAL;
|
||||
+ ret = find_first_zero_bit(linemap, UART_NR);
|
||||
+ if (ret >= UART_NR) {
|
||||
+ dev_err(&pdev->dev, "port line is full, add device failed\n");
|
||||
@@ -133,7 +137,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
sport->port.line = ret;
|
||||
sport->lpuart32 = of_device_is_compatible(np, "fsl,ls1021a-lpuart");
|
||||
|
||||
@@ -1983,6 +2010,7 @@ static int lpuart_remove(struct platform
|
||||
@@ -1987,6 +2010,7 @@ static int lpuart_remove(struct platform
|
||||
struct lpuart_port *sport = platform_get_drvdata(pdev);
|
||||
|
||||
uart_remove_one_port(&lpuart_reg, &sport->port);
|
||||
@@ -141,7 +145,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
|
||||
clk_disable_unprepare(sport->clk);
|
||||
|
||||
@@ -2067,12 +2095,10 @@ static int lpuart_resume(struct device *
|
||||
@@ -2071,12 +2095,10 @@ static int lpuart_resume(struct device *
|
||||
|
||||
if (sport->lpuart_dma_rx_use) {
|
||||
if (sport->port.irq_wake) {
|
||||
|
||||
@@ -206,7 +206,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
if (IS_ENABLED(CONFIG_USB_DWC3_HOST))
|
||||
mode = USB_DR_MODE_HOST;
|
||||
else if (IS_ENABLED(CONFIG_USB_DWC3_GADGET))
|
||||
@@ -213,8 +232,9 @@ static void dwc3_frame_length_adjustment
|
||||
@@ -227,8 +246,9 @@ static void dwc3_frame_length_adjustment
|
||||
|
||||
reg = dwc3_readl(dwc->regs, DWC3_GFLADJ);
|
||||
dft = reg & DWC3_GFLADJ_30MHZ_MASK;
|
||||
@@ -218,7 +218,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
reg &= ~DWC3_GFLADJ_30MHZ_MASK;
|
||||
reg |= DWC3_GFLADJ_30MHZ_SDBND_SEL | dwc->fladj;
|
||||
dwc3_writel(dwc->regs, DWC3_GFLADJ, reg);
|
||||
@@ -585,6 +605,99 @@ static int dwc3_phy_setup(struct dwc3 *d
|
||||
@@ -599,6 +619,99 @@ static int dwc3_phy_setup(struct dwc3 *d
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -318,7 +318,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
static void dwc3_core_exit(struct dwc3 *dwc)
|
||||
{
|
||||
dwc3_event_buffers_cleanup(dwc);
|
||||
@@ -727,6 +840,8 @@ static int dwc3_core_init(struct dwc3 *d
|
||||
@@ -741,6 +854,8 @@ static int dwc3_core_init(struct dwc3 *d
|
||||
if (ret)
|
||||
goto err1;
|
||||
|
||||
@@ -327,7 +327,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
/* Adjust Frame Length */
|
||||
dwc3_frame_length_adjustment(dwc);
|
||||
|
||||
@@ -925,11 +1040,117 @@ static void dwc3_core_exit_mode(struct d
|
||||
@@ -939,11 +1054,117 @@ static void dwc3_core_exit_mode(struct d
|
||||
}
|
||||
}
|
||||
|
||||
@@ -445,7 +445,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
struct resource *res;
|
||||
struct dwc3 *dwc;
|
||||
u8 lpm_nyet_threshold;
|
||||
@@ -961,6 +1182,11 @@ static int dwc3_probe(struct platform_de
|
||||
@@ -975,6 +1196,11 @@ static int dwc3_probe(struct platform_de
|
||||
dwc->xhci_resources[0].flags = res->flags;
|
||||
dwc->xhci_resources[0].name = res->name;
|
||||
|
||||
@@ -457,7 +457,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
res->start += DWC3_GLOBALS_REGS_START;
|
||||
|
||||
/*
|
||||
@@ -1003,6 +1229,12 @@ static int dwc3_probe(struct platform_de
|
||||
@@ -1017,6 +1243,12 @@ static int dwc3_probe(struct platform_de
|
||||
dwc->usb3_lpm_capable = device_property_read_bool(dev,
|
||||
"snps,usb3_lpm_capable");
|
||||
|
||||
@@ -470,7 +470,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
dwc->disable_scramble_quirk = device_property_read_bool(dev,
|
||||
"snps,disable_scramble_quirk");
|
||||
dwc->u2exit_lfps_quirk = device_property_read_bool(dev,
|
||||
@@ -1047,6 +1279,8 @@ static int dwc3_probe(struct platform_de
|
||||
@@ -1061,6 +1293,8 @@ static int dwc3_probe(struct platform_de
|
||||
dwc->hird_threshold = hird_threshold
|
||||
| (dwc->is_utmi_l1_suspend << 4);
|
||||
|
||||
@@ -479,7 +479,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
platform_set_drvdata(pdev, dwc);
|
||||
dwc3_cache_hwparams(dwc);
|
||||
|
||||
@@ -1070,6 +1304,11 @@ static int dwc3_probe(struct platform_de
|
||||
@@ -1084,6 +1318,11 @@ static int dwc3_probe(struct platform_de
|
||||
if (ret < 0)
|
||||
goto err1;
|
||||
|
||||
@@ -542,7 +542,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
#define DWC3_GCTL_PRTCAP(n) (((n) & (3 << 12)) >> 12)
|
||||
#define DWC3_GCTL_PRTCAPDIR(n) ((n) << 12)
|
||||
#define DWC3_GCTL_PRTCAP_HOST 1
|
||||
@@ -292,6 +318,10 @@
|
||||
@@ -294,6 +320,10 @@
|
||||
/* Global Frame Length Adjustment Register */
|
||||
#define DWC3_GFLADJ_30MHZ_SDBND_SEL (1 << 7)
|
||||
#define DWC3_GFLADJ_30MHZ_MASK 0x3f
|
||||
@@ -553,7 +553,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
|
||||
/* Global User Control Register 2 */
|
||||
#define DWC3_GUCTL2_RST_ACTBITLATER (1 << 14)
|
||||
@@ -756,6 +786,7 @@ struct dwc3_scratchpad_array {
|
||||
@@ -758,6 +788,7 @@ struct dwc3_scratchpad_array {
|
||||
* @regs: base address for our registers
|
||||
* @regs_size: address space size
|
||||
* @fladj: frame length adjustment
|
||||
@@ -561,7 +561,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
* @irq_gadget: peripheral controller's IRQ number
|
||||
* @nr_scratch: number of scratch buffers
|
||||
* @u1u2: only used on revisions <1.83a for workaround
|
||||
@@ -832,6 +863,7 @@ struct dwc3_scratchpad_array {
|
||||
@@ -834,6 +865,7 @@ struct dwc3_scratchpad_array {
|
||||
* 1 - -3.5dB de-emphasis
|
||||
* 2 - No de-emphasis
|
||||
* 3 - Reserved
|
||||
@@ -569,7 +569,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
*/
|
||||
struct dwc3 {
|
||||
struct usb_ctrlrequest *ctrl_req;
|
||||
@@ -850,6 +882,7 @@ struct dwc3 {
|
||||
@@ -852,6 +884,7 @@ struct dwc3 {
|
||||
spinlock_t lock;
|
||||
|
||||
struct device *dev;
|
||||
@@ -577,7 +577,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
|
||||
struct platform_device *xhci;
|
||||
struct resource xhci_resources[DWC3_XHCI_RESOURCES_NUM];
|
||||
@@ -875,6 +908,12 @@ struct dwc3 {
|
||||
@@ -877,6 +910,12 @@ struct dwc3 {
|
||||
enum usb_phy_interface hsphy_mode;
|
||||
|
||||
u32 fladj;
|
||||
@@ -590,7 +590,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
u32 irq_gadget;
|
||||
u32 nr_scratch;
|
||||
u32 u1u2;
|
||||
@@ -951,9 +990,12 @@ struct dwc3 {
|
||||
@@ -953,9 +992,12 @@ struct dwc3 {
|
||||
unsigned ep0_bounced:1;
|
||||
unsigned ep0_expect_in:1;
|
||||
unsigned has_hibernation:1;
|
||||
@@ -603,7 +603,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
unsigned pending_events:1;
|
||||
unsigned pullups_connected:1;
|
||||
unsigned setup_packet_pending:1;
|
||||
@@ -974,9 +1016,16 @@ struct dwc3 {
|
||||
@@ -976,9 +1018,16 @@ struct dwc3 {
|
||||
unsigned dis_rxdet_inp3_quirk:1;
|
||||
unsigned dis_u2_freeclk_exists_quirk:1;
|
||||
unsigned dis_del_phy_power_chg_quirk:1;
|
||||
@@ -822,7 +822,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
curr_ep = get_ep_by_pipe(udc, i);
|
||||
|
||||
/* If the ep is configured */
|
||||
- if (curr_ep->name == NULL) {
|
||||
- if (!curr_ep->ep.name) {
|
||||
+ if (strncmp(curr_ep->name, "ep", 2)) {
|
||||
WARNING("Invalid EP?");
|
||||
continue;
|
||||
|
||||
Reference in New Issue
Block a user