Skip to content

Commit 70187f7

Browse files
torvaldstorvalds
committed
Merge tag 'arc-5.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta: - HSDK-4xd Dev system: perf driver updates for sampling interrupt - HSDK* Dev System: Ethernet broken [Evgeniy Didin] - HIGHMEM broken (2 memory banks) [Mike Rapoport] - show_regs() rewrite once and for all - Other minor fixes * tag 'arc-5.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: ARC: [plat-hsdk]: Switch ethernet phy-mode to rgmii-id arc: fix memory initialization for systems with two memory banks irqchip/eznps: Fix build error for !ARC700 builds ARC: show_regs: fix r12 printing and simplify ARC: HSDK: wireup perf irq ARC: perf: don't bail setup if pct irq missing in device-tree ARC: pgalloc.h: delete a duplicated word + other fixes
2 parents 7514c03 + 26907eb commit 70187f7

7 files changed

Lines changed: 62 additions & 73 deletions

File tree

‎arch/arc/boot/dts/hsdk.dts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@
8888

8989
arcpct: pct {
9090
compatible = "snps,archs-pct";
91+
interrupt-parent = <&cpu_intc>;
92+
interrupts = <20>;
9193
};
9294

9395
/* TIMER0 with interrupt for clockevent */
@@ -208,7 +210,7 @@
208210
reg = <0x8000 0x2000>;
209211
interrupts = <10>;
210212
interrupt-names = "macirq";
211-
phy-mode = "rgmii";
213+
phy-mode = "rgmii-id";
212214
snps,pbl = <32>;
213215
snps,multicast-filter-bins = <256>;
214216
clocks = <&gmacclk>;
@@ -226,7 +228,7 @@
226228
#address-cells = <1>;
227229
#size-cells = <0>;
228230
compatible = "snps,dwmac-mdio";
229-
phy0: ethernet-phy@0 {
231+
phy0: ethernet-phy@0 { /* Micrel KSZ9031 */
230232
reg = <0>;
231233
};
232234
};

‎arch/arc/include/asm/pgalloc.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
* vineetg: April 2010
1919
* -Switched pgtable_t from being struct page * to unsigned long
2020
* =Needed so that Page Table allocator (pte_alloc_one) is not forced to
21-
* to deal with struct page. Thay way in future we can make it allocate
21+
* deal with struct page. That way in future we can make it allocate
2222
* multiple PG Tbls in one Page Frame
2323
* =sweet side effect is avoiding calls to ugly page_address( ) from the
24-
* pg-tlb allocator sub-sys (pte_alloc_one, ptr_free, pmd_populate
24+
* pg-tlb allocator sub-sys (pte_alloc_one, ptr_free, pmd_populate)
2525
*
2626
* Amit Bhor, Sameer Dhavale: Codito Technologies 2004
2727
*/

‎arch/arc/kernel/perf_event.c‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ static int arc_pmu_device_probe(struct platform_device *pdev)
562562
{
563563
struct arc_reg_pct_build pct_bcr;
564564
struct arc_reg_cc_build cc_bcr;
565-
int i, has_interrupts;
565+
int i, has_interrupts, irq;
566566
int counter_size; /* in bits */
567567

568568
union cc_name {
@@ -637,13 +637,7 @@ static int arc_pmu_device_probe(struct platform_device *pdev)
637637
.attr_groups = arc_pmu->attr_groups,
638638
};
639639

640-
if (has_interrupts) {
641-
int irq = platform_get_irq(pdev, 0);
642-
643-
if (irq < 0) {
644-
pr_err("Cannot get IRQ number for the platform\n");
645-
return -ENODEV;
646-
}
640+
if (has_interrupts && (irq = platform_get_irq(pdev, 0) >= 0)) {
647641

648642
arc_pmu->irq = irq;
649643

@@ -652,9 +646,9 @@ static int arc_pmu_device_probe(struct platform_device *pdev)
652646
this_cpu_ptr(&arc_pmu_cpu));
653647

654648
on_each_cpu(arc_cpu_pmu_irq_init, &irq, 1);
655-
656-
} else
649+
} else {
657650
arc_pmu->pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT;
651+
}
658652

659653
/*
660654
* perf parser doesn't really like '-' symbol in events name, so let's

‎arch/arc/kernel/troubleshoot.c‎

Lines changed: 30 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -18,44 +18,37 @@
1818

1919
#define ARC_PATH_MAX 256
2020

21-
/*
22-
* Common routine to print scratch regs (r0-r12) or callee regs (r13-r25)
23-
* -Prints 3 regs per line and a CR.
24-
* -To continue, callee regs right after scratch, special handling of CR
25-
*/
26-
static noinline void print_reg_file(long *reg_rev, int start_num)
21+
static noinline void print_regs_scratch(struct pt_regs *regs)
2722
{
28-
unsigned int i;
29-
char buf[512];
30-
int n = 0, len = sizeof(buf);
31-
32-
for (i = start_num; i < start_num + 13; i++) {
33-
n += scnprintf(buf + n, len - n, "r%02u: 0x%08lx\t",
34-
i, (unsigned long)*reg_rev);
35-
36-
if (((i + 1) % 3) == 0)
37-
n += scnprintf(buf + n, len - n, "\n");
38-
39-
/* because pt_regs has regs reversed: r12..r0, r25..r13 */
40-
if (is_isa_arcv2() && start_num == 0)
41-
reg_rev++;
42-
else
43-
reg_rev--;
44-
}
45-
46-
if (start_num != 0)
47-
n += scnprintf(buf + n, len - n, "\n\n");
23+
pr_cont("BTA: 0x%08lx\n SP: 0x%08lx FP: 0x%08lx BLK: %pS\n",
24+
regs->bta, regs->sp, regs->fp, (void *)regs->blink);
25+
pr_cont("LPS: 0x%08lx\tLPE: 0x%08lx\tLPC: 0x%08lx\n",
26+
regs->lp_start, regs->lp_end, regs->lp_count);
4827

49-
/* To continue printing callee regs on same line as scratch regs */
50-
if (start_num == 0)
51-
pr_info("%s", buf);
52-
else
53-
pr_cont("%s\n", buf);
28+
pr_info("r00: 0x%08lx\tr01: 0x%08lx\tr02: 0x%08lx\n" \
29+
"r03: 0x%08lx\tr04: 0x%08lx\tr05: 0x%08lx\n" \
30+
"r06: 0x%08lx\tr07: 0x%08lx\tr08: 0x%08lx\n" \
31+
"r09: 0x%08lx\tr10: 0x%08lx\tr11: 0x%08lx\n" \
32+
"r12: 0x%08lx\t",
33+
regs->r0, regs->r1, regs->r2,
34+
regs->r3, regs->r4, regs->r5,
35+
regs->r6, regs->r7, regs->r8,
36+
regs->r9, regs->r10, regs->r11,
37+
regs->r12);
5438
}
5539

56-
static void show_callee_regs(struct callee_regs *cregs)
40+
static void print_regs_callee(struct callee_regs *regs)
5741
{
58-
print_reg_file(&(cregs->r13), 13);
42+
pr_cont("r13: 0x%08lx\tr14: 0x%08lx\n" \
43+
"r15: 0x%08lx\tr16: 0x%08lx\tr17: 0x%08lx\n" \
44+
"r18: 0x%08lx\tr19: 0x%08lx\tr20: 0x%08lx\n" \
45+
"r21: 0x%08lx\tr22: 0x%08lx\tr23: 0x%08lx\n" \
46+
"r24: 0x%08lx\tr25: 0x%08lx\n",
47+
regs->r13, regs->r14,
48+
regs->r15, regs->r16, regs->r17,
49+
regs->r18, regs->r19, regs->r20,
50+
regs->r21, regs->r22, regs->r23,
51+
regs->r24, regs->r25);
5952
}
6053

6154
static void print_task_path_n_nm(struct task_struct *tsk)
@@ -175,7 +168,7 @@ static void show_ecr_verbose(struct pt_regs *regs)
175168
void show_regs(struct pt_regs *regs)
176169
{
177170
struct task_struct *tsk = current;
178-
struct callee_regs *cregs;
171+
struct callee_regs *cregs = (struct callee_regs *)tsk->thread.callee_reg;
179172

180173
/*
181174
* generic code calls us with preemption disabled, but some calls
@@ -204,25 +197,15 @@ void show_regs(struct pt_regs *regs)
204197
STS_BIT(regs, A2), STS_BIT(regs, A1),
205198
STS_BIT(regs, E2), STS_BIT(regs, E1));
206199
#else
207-
pr_cont(" [%2s%2s%2s%2s]",
200+
pr_cont(" [%2s%2s%2s%2s] ",
208201
STS_BIT(regs, IE),
209202
(regs->status32 & STATUS_U_MASK) ? "U " : "K ",
210203
STS_BIT(regs, DE), STS_BIT(regs, AE));
211204
#endif
212-
pr_cont(" BTA: 0x%08lx\n SP: 0x%08lx FP: 0x%08lx BLK: %pS\n",
213-
regs->bta, regs->sp, regs->fp, (void *)regs->blink);
214-
pr_info("LPS: 0x%08lx\tLPE: 0x%08lx\tLPC: 0x%08lx\n",
215-
regs->lp_start, regs->lp_end, regs->lp_count);
216-
217-
/* print regs->r0 thru regs->r12
218-
* Sequential printing was generating horrible code
219-
*/
220-
print_reg_file(&(regs->r0), 0);
221205

222-
/* If Callee regs were saved, display them too */
223-
cregs = (struct callee_regs *)current->thread.callee_reg;
206+
print_regs_scratch(regs);
224207
if (cregs)
225-
show_callee_regs(cregs);
208+
print_regs_callee(cregs);
226209

227210
preempt_disable();
228211
}

‎arch/arc/mm/init.c‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ static unsigned long low_mem_sz;
2626

2727
#ifdef CONFIG_HIGHMEM
2828
static unsigned long min_high_pfn, max_high_pfn;
29-
static u64 high_mem_start;
30-
static u64 high_mem_sz;
29+
static phys_addr_t high_mem_start;
30+
static phys_addr_t high_mem_sz;
3131
#endif
3232

3333
#ifdef CONFIG_DISCONTIGMEM
@@ -69,6 +69,7 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
6969
high_mem_sz = size;
7070
in_use = 1;
7171
memblock_add_node(base, size, 1);
72+
memblock_reserve(base, size);
7273
#endif
7374
}
7475

@@ -157,7 +158,7 @@ void __init setup_arch_memory(void)
157158
min_high_pfn = PFN_DOWN(high_mem_start);
158159
max_high_pfn = PFN_DOWN(high_mem_start + high_mem_sz);
159160

160-
max_zone_pfn[ZONE_HIGHMEM] = max_high_pfn;
161+
max_zone_pfn[ZONE_HIGHMEM] = min_low_pfn;
161162

162163
high_memory = (void *)(min_high_pfn << PAGE_SHIFT);
163164
kmap_init();
@@ -166,22 +167,26 @@ void __init setup_arch_memory(void)
166167
free_area_init(max_zone_pfn);
167168
}
168169

169-
/*
170-
* mem_init - initializes memory
171-
*
172-
* Frees up bootmem
173-
* Calculates and displays memory available/used
174-
*/
175-
void __init mem_init(void)
170+
static void __init highmem_init(void)
176171
{
177172
#ifdef CONFIG_HIGHMEM
178173
unsigned long tmp;
179174

180-
reset_all_zones_managed_pages();
175+
memblock_free(high_mem_start, high_mem_sz);
181176
for (tmp = min_high_pfn; tmp < max_high_pfn; tmp++)
182177
free_highmem_page(pfn_to_page(tmp));
183178
#endif
179+
}
184180

181+
/*
182+
* mem_init - initializes memory
183+
*
184+
* Frees up bootmem
185+
* Calculates and displays memory available/used
186+
*/
187+
void __init mem_init(void)
188+
{
185189
memblock_free_all();
190+
highmem_init();
186191
mem_init_print_info(NULL);
187192
}

‎arch/arc/plat-eznps/include/plat/ctop.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#define CTOP_AUX_DPC (CTOP_AUX_BASE + 0x02C)
3434
#define CTOP_AUX_LPC (CTOP_AUX_BASE + 0x030)
3535
#define CTOP_AUX_EFLAGS (CTOP_AUX_BASE + 0x080)
36-
#define CTOP_AUX_IACK (CTOP_AUX_BASE + 0x088)
3736
#define CTOP_AUX_GPA1 (CTOP_AUX_BASE + 0x08C)
3837
#define CTOP_AUX_UDMC (CTOP_AUX_BASE + 0x300)
3938

‎include/soc/nps/common.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
#define CTOP_INST_MOV2B_FLIP_R3_B1_B2_INST 0x5B60
4646
#define CTOP_INST_MOV2B_FLIP_R3_B1_B2_LIMM 0x00010422
4747

48+
#ifndef AUX_IENABLE
49+
#define AUX_IENABLE 0x40c
50+
#endif
51+
52+
#define CTOP_AUX_IACK (0xFFFFF800 + 0x088)
53+
4854
#ifndef __ASSEMBLY__
4955

5056
/* In order to increase compilation test coverage */

0 commit comments

Comments
 (0)