kernel: bump 4.9 to 4.9.76
Refresh patches Tested-on: ar71xx Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
parent
ab1785b1b2
commit
2228dbf4e6
3 changed files with 15 additions and 15 deletions
|
@ -4,12 +4,12 @@ LINUX_RELEASE?=1
|
|||
|
||||
LINUX_VERSION-3.18 = .71
|
||||
LINUX_VERSION-4.4 = .110
|
||||
LINUX_VERSION-4.9 = .75
|
||||
LINUX_VERSION-4.9 = .76
|
||||
LINUX_VERSION-4.14 = .12
|
||||
|
||||
LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
|
||||
LINUX_KERNEL_HASH-4.4.110 = d099175aac5678e6cad2f23cd56ed22a2857143c0c18489390c95ba8c441db58
|
||||
LINUX_KERNEL_HASH-4.9.75 = de6c31b7668d4047e370f4625362a02b9ebf7da56d5c0879a4961f620ab1cadf
|
||||
LINUX_KERNEL_HASH-4.9.76 = b82b94332cffaaeade74495264c989dafb96d4748503f87a5b7c436f5de887de
|
||||
LINUX_KERNEL_HASH-4.14.12 = 6608f7d480efc5c1078888e9344f4e0b0cd9bef0b6541cbdaec7d138e03856af
|
||||
|
||||
ifdef KERNEL_PATCHVER
|
||||
|
|
|
@ -246,16 +246,16 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|||
/* Restrict the stage to what we can actually support */
|
||||
if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S1))
|
||||
smmu_domain->stage = ARM_SMMU_DOMAIN_S2;
|
||||
@@ -1578,7 +1593,7 @@ static __le64 *arm_smmu_get_step_for_sid
|
||||
@@ -1580,7 +1595,7 @@ static __le64 *arm_smmu_get_step_for_sid
|
||||
return step;
|
||||
}
|
||||
|
||||
-static int arm_smmu_install_ste_for_dev(struct iommu_fwspec *fwspec)
|
||||
+static void arm_smmu_install_ste_for_dev(struct iommu_fwspec *fwspec)
|
||||
{
|
||||
int i;
|
||||
int i, j;
|
||||
struct arm_smmu_master_data *master = fwspec->iommu_priv;
|
||||
@@ -1590,17 +1605,14 @@ static int arm_smmu_install_ste_for_dev(
|
||||
@@ -1599,17 +1614,14 @@ static int arm_smmu_install_ste_for_dev(
|
||||
|
||||
arm_smmu_write_strtab_ent(smmu, sid, step, &master->ste);
|
||||
}
|
||||
|
@ -275,7 +275,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|||
}
|
||||
|
||||
static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
|
||||
@@ -1619,7 +1631,7 @@ static int arm_smmu_attach_dev(struct io
|
||||
@@ -1628,7 +1640,7 @@ static int arm_smmu_attach_dev(struct io
|
||||
ste = &master->ste;
|
||||
|
||||
/* Already attached to a different domain? */
|
||||
|
@ -284,7 +284,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|||
arm_smmu_detach_dev(dev);
|
||||
|
||||
mutex_lock(&smmu_domain->init_mutex);
|
||||
@@ -1640,10 +1652,12 @@ static int arm_smmu_attach_dev(struct io
|
||||
@@ -1649,10 +1661,12 @@ static int arm_smmu_attach_dev(struct io
|
||||
goto out_unlock;
|
||||
}
|
||||
|
||||
|
@ -300,7 +300,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|||
ste->s1_cfg = &smmu_domain->s1_cfg;
|
||||
ste->s2_cfg = NULL;
|
||||
arm_smmu_write_ctx_desc(smmu, ste->s1_cfg);
|
||||
@@ -1652,10 +1666,7 @@ static int arm_smmu_attach_dev(struct io
|
||||
@@ -1661,10 +1675,7 @@ static int arm_smmu_attach_dev(struct io
|
||||
ste->s2_cfg = &smmu_domain->s2_cfg;
|
||||
}
|
||||
|
||||
|
@ -312,7 +312,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|||
out_unlock:
|
||||
mutex_unlock(&smmu_domain->init_mutex);
|
||||
return ret;
|
||||
@@ -1703,6 +1714,9 @@ arm_smmu_iova_to_phys(struct iommu_domai
|
||||
@@ -1712,6 +1723,9 @@ arm_smmu_iova_to_phys(struct iommu_domai
|
||||
struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
|
||||
struct io_pgtable_ops *ops = smmu_domain->pgtbl_ops;
|
||||
|
||||
|
@ -322,7 +322,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|||
if (!ops)
|
||||
return 0;
|
||||
|
||||
@@ -1801,7 +1815,7 @@ static void arm_smmu_remove_device(struc
|
||||
@@ -1810,7 +1824,7 @@ static void arm_smmu_remove_device(struc
|
||||
return;
|
||||
|
||||
master = fwspec->iommu_priv;
|
||||
|
@ -331,7 +331,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|||
arm_smmu_detach_dev(dev);
|
||||
iommu_group_remove_device(dev);
|
||||
kfree(master);
|
||||
@@ -1830,6 +1844,9 @@ static int arm_smmu_domain_get_attr(stru
|
||||
@@ -1839,6 +1853,9 @@ static int arm_smmu_domain_get_attr(stru
|
||||
{
|
||||
struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
|
||||
|
||||
|
@ -341,7 +341,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|||
switch (attr) {
|
||||
case DOMAIN_ATTR_NESTING:
|
||||
*(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED);
|
||||
@@ -1845,6 +1862,9 @@ static int arm_smmu_domain_set_attr(stru
|
||||
@@ -1854,6 +1871,9 @@ static int arm_smmu_domain_set_attr(stru
|
||||
int ret = 0;
|
||||
struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
|
||||
|
||||
|
@ -351,7 +351,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|||
mutex_lock(&smmu_domain->init_mutex);
|
||||
|
||||
switch (attr) {
|
||||
@@ -1874,6 +1894,31 @@ static int arm_smmu_of_xlate(struct devi
|
||||
@@ -1883,6 +1903,31 @@ static int arm_smmu_of_xlate(struct devi
|
||||
return iommu_fwspec_add_ids(dev, args->args, 1);
|
||||
}
|
||||
|
||||
|
@ -383,7 +383,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|||
static struct iommu_ops arm_smmu_ops = {
|
||||
.capable = arm_smmu_capable,
|
||||
.domain_alloc = arm_smmu_domain_alloc,
|
||||
@@ -1889,6 +1934,8 @@ static struct iommu_ops arm_smmu_ops = {
|
||||
@@ -1898,6 +1943,8 @@ static struct iommu_ops arm_smmu_ops = {
|
||||
.domain_get_attr = arm_smmu_domain_get_attr,
|
||||
.domain_set_attr = arm_smmu_domain_set_attr,
|
||||
.of_xlate = arm_smmu_of_xlate,
|
||||
|
|
|
@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
}
|
||||
|
||||
static inline int is_buf_blank(uint8_t *buf, size_t len)
|
||||
@@ -1856,9 +1842,7 @@ static int alloc_nand_resource(struct pl
|
||||
@@ -1857,9 +1843,7 @@ static int alloc_nand_resource(struct pl
|
||||
/* initialize all interrupts to be disabled */
|
||||
disable_int(info, NDSR_MASK);
|
||||
|
||||
|
|
Loading…
Reference in a new issue