提交 a3281ef0 编写于 作者: A AmadeusGhost 提交者: coolsnowwolf

target: fixed some patches (#2717)

上级 4cf64c51
...@@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ...@@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */
--- a/arch/mips/kernel/module.c --- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c
@@ -44,14 +44,224 @@ struct mips_hi16 { @@ -44,14 +44,221 @@ struct mips_hi16 {
static LIST_HEAD(dbe_list); static LIST_HEAD(dbe_list);
static DEFINE_SPINLOCK(dbe_lock); static DEFINE_SPINLOCK(dbe_lock);
...@@ -187,7 +187,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ...@@ -187,7 +187,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ if (!ptr) + if (!ptr)
+ return vmalloc(size); + return vmalloc(size);
+ +
+ kmemleak_alloc(ptr, size, 1, GFP_KERNEL);
+ return ptr; + return ptr;
+#endif +#endif
} }
...@@ -204,12 +203,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ...@@ -204,12 +203,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+/* Free memory returned from module_alloc */ +/* Free memory returned from module_alloc */
+void module_memfree(void *module_region) +void module_memfree(void *module_region)
+{ +{
+ if (is_phys_addr(module_region)) { + if (is_phys_addr(module_region))
+ kmemleak_free(module_region);
+ free_phys(module_region); + free_phys(module_region);
+ } else { + else
+ vfree(module_region); + vfree(module_region);
+ }
+} +}
+ +
+static void *__module_alloc(int size, bool phys) +static void *__module_alloc(int size, bool phys)
...@@ -272,7 +269,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ...@@ -272,7 +269,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int apply_r_mips_none(struct module *me, u32 *location, static int apply_r_mips_none(struct module *me, u32 *location,
u32 base, Elf_Addr v, bool rela) u32 base, Elf_Addr v, bool rela)
@@ -67,9 +277,40 @@ static int apply_r_mips_32(struct module @@ -67,9 +274,40 @@ static int apply_r_mips_32(struct module
return 0; return 0;
} }
...@@ -313,7 +310,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ...@@ -313,7 +310,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (v % 4) { if (v % 4) {
pr_err("module %s: dangerous R_MIPS_26 relocation\n", pr_err("module %s: dangerous R_MIPS_26 relocation\n",
me->name); me->name);
@@ -77,13 +318,17 @@ static int apply_r_mips_26(struct module @@ -77,13 +315,17 @@ static int apply_r_mips_26(struct module
} }
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
...@@ -335,7 +332,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ...@@ -335,7 +332,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return 0; return 0;
} }
@@ -459,9 +704,36 @@ int module_finalize(const Elf_Ehdr *hdr, @@ -459,9 +701,36 @@ int module_finalize(const Elf_Ehdr *hdr,
list_add(&me->arch.dbe_list, &dbe_list); list_add(&me->arch.dbe_list, &dbe_list);
spin_unlock_irq(&dbe_lock); spin_unlock_irq(&dbe_lock);
} }
......
...@@ -12,7 +12,7 @@ diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c ...@@ -12,7 +12,7 @@ diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index 32879b845b75..157ae07f9309 100644 index 32879b845b75..157ae07f9309 100644
--- a/drivers/mmc/host/sdhci-msm.c --- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c
@@ -1117,6 +1117,33 @@ static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock) @@ -1531,6 +1531,33 @@ static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock)
__sdhci_msm_set_clock(host, clock); __sdhci_msm_set_clock(host, clock);
} }
...@@ -29,7 +29,7 @@ index 32879b845b75..157ae07f9309 100644 ...@@ -29,7 +29,7 @@ index 32879b845b75..157ae07f9309 100644
+ * SDHCI_RESET_ALL triggers the PWR IRQ + * SDHCI_RESET_ALL triggers the PWR IRQ
+ * and we need to handle it here. + * and we need to handle it here.
+ */ + */
+ sdhci_msm_voltage_switch(host); + sdhci_msm_dump_pwr_ctrl_regs(host);
+ } + }
+ +
+ while (sdhci_readb(host, SDHCI_SOFTWARE_RESET) & mask) { + while (sdhci_readb(host, SDHCI_SOFTWARE_RESET) & mask) {
...@@ -43,10 +43,10 @@ index 32879b845b75..157ae07f9309 100644 ...@@ -43,10 +43,10 @@ index 32879b845b75..157ae07f9309 100644
+ } + }
+} +}
+ +
static void sdhci_msm_write_w(struct sdhci_host *host, u16 val, int reg) /*
{ * Platform specific register write functions. This is so that, if any
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); * register write needs to be followed up by platform specific actions,
@@ -1148,7 +1174,7 @@ static const struct of_device_id sdhci_msm_dt_match[] = { @@ -1680,7 +1706,7 @@ static const struct of_device_id sdhci_msm_dt_match[] = {
MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match); MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);
static const struct sdhci_ops sdhci_msm_ops = { static const struct sdhci_ops sdhci_msm_ops = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册