Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
tbblgm119
lede
提交
a3281ef0
L
lede
项目概览
tbblgm119
/
lede
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
lede
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a3281ef0
编写于
1月 09, 2020
作者:
A
AmadeusGhost
提交者:
coolsnowwolf
1月 09, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
target: fixed some patches (#2717)
上级
4cf64c51
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
15 deletion
+12
-15
target/linux/generic/pending-4.19/305-mips_module_reloc.patch
...et/linux/generic/pending-4.19/305-mips_module_reloc.patch
+6
-9
target/linux/ipq40xx/patches-4.19/854-add-sdhci-reset-implementation.patch
...0xx/patches-4.19/854-add-sdhci-reset-implementation.patch
+6
-6
未找到文件。
target/linux/generic/pending-4.19/305-mips_module_reloc.patch
浏览文件 @
a3281ef0
...
@@ -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,22
4
@@
struct mips_hi16 {
@@ -44,14 +44,22
1
@@
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 +27
7
,40 @@
static int apply_r_mips_32(struct module
@@ -67,9 +27
4
,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 +31
8
,17 @@
static int apply_r_mips_26(struct module
@@ -77,13 +31
5
,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 +70
4
,36 @@
int module_finalize(const Elf_Ehdr *hdr,
@@ -459,9 +70
1
,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);
}
}
...
...
target/linux/ipq40xx/patches-4.19/854-add-sdhci-reset-implementation.patch
浏览文件 @
a3281ef0
...
@@ -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
@@ -1
117,6 +1117
,33 @@
static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock)
@@ -1
531,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,
@@ -1
148,7 +1174
,7 @@
static const struct of_device_id sdhci_msm_dt_match[] = {
@@ -1
680,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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录