Merge tag 'arc-5.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc (70187f77) · Commits · 戴 / test

arch/arc/boot/dts/hsdk.dts

+4 −2

Original line number	Diff line number	Diff line
		@@ -88,6 +88,8 @@

		arcpct: pct {
		compatible = "snps,archs-pct";
		interrupt-parent = <&cpu_intc>;
		interrupts = <20>;
		};

		/* TIMER0 with interrupt for clockevent */
		@@ -208,7 +210,7 @@
		reg = <0x8000 0x2000>;
		interrupts = <10>;
		interrupt-names = "macirq";
		phy-mode = "rgmii";
		phy-mode = "rgmii-id";
		snps,pbl = <32>;
		snps,multicast-filter-bins = <256>;
		clocks = <&gmacclk>;
		@@ -226,7 +228,7 @@
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "snps,dwmac-mdio";
		phy0: ethernet-phy@0 {
		phy0: ethernet-phy@0 { /* Micrel KSZ9031 */
		reg = <0>;
		};
		};

arch/arc/include/asm/pgalloc.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,10 +18,10 @@
		* vineetg: April 2010
		* -Switched pgtable_t from being struct page * to unsigned long
		* =Needed so that Page Table allocator (pte_alloc_one) is not forced to
		* to deal with struct page. Thay way in future we can make it allocate
		* deal with struct page. That way in future we can make it allocate
		* multiple PG Tbls in one Page Frame
		* =sweet side effect is avoiding calls to ugly page_address( ) from the
		* pg-tlb allocator sub-sys (pte_alloc_one, ptr_free, pmd_populate
		* pg-tlb allocator sub-sys (pte_alloc_one, ptr_free, pmd_populate)
		*
		* Amit Bhor, Sameer Dhavale: Codito Technologies 2004
		*/

arch/arc/kernel/perf_event.c

+4 −10

Original line number	Diff line number	Diff line
		@@ -562,7 +562,7 @@ static int arc_pmu_device_probe(struct platform_device *pdev)
		{
		struct arc_reg_pct_build pct_bcr;
		struct arc_reg_cc_build cc_bcr;
		int i, has_interrupts;
		int i, has_interrupts, irq;
		int counter_size; /* in bits */

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

		if (has_interrupts) {
		int irq = platform_get_irq(pdev, 0);

		if (irq < 0) {
		pr_err("Cannot get IRQ number for the platform\n");
		return -ENODEV;
		}
		if (has_interrupts && (irq = platform_get_irq(pdev, 0) >= 0)) {

		arc_pmu->irq = irq;

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

		on_each_cpu(arc_cpu_pmu_irq_init, &irq, 1);

		} else
		} else {
		arc_pmu->pmu.capabilities \|= PERF_PMU_CAP_NO_INTERRUPT;
		}

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

arch/arc/kernel/troubleshoot.c

+30 −47

Original line number	Diff line number	Diff line
		@@ -18,44 +18,37 @@

		#define ARC_PATH_MAX 256

		/*
		* Common routine to print scratch regs (r0-r12) or callee regs (r13-r25)
		* -Prints 3 regs per line and a CR.
		* -To continue, callee regs right after scratch, special handling of CR
		*/
		static noinline void print_reg_file(long *reg_rev, int start_num)
		static noinline void print_regs_scratch(struct pt_regs *regs)
		{
		unsigned int i;
		char buf[512];
		int n = 0, len = sizeof(buf);

		for (i = start_num; i < start_num + 13; i++) {
		n += scnprintf(buf + n, len - n, "r%02u: 0x%08lx\t",
		i, (unsigned long)*reg_rev);

		if (((i + 1) % 3) == 0)
		n += scnprintf(buf + n, len - n, "\n");

		/* because pt_regs has regs reversed: r12..r0, r25..r13 */
		if (is_isa_arcv2() && start_num == 0)
		reg_rev++;
		else
		reg_rev--;
		}

		if (start_num != 0)
		n += scnprintf(buf + n, len - n, "\n\n");
		pr_cont("BTA: 0x%08lx\n SP: 0x%08lx FP: 0x%08lx BLK: %pS\n",
		regs->bta, regs->sp, regs->fp, (void *)regs->blink);
		pr_cont("LPS: 0x%08lx\tLPE: 0x%08lx\tLPC: 0x%08lx\n",
		regs->lp_start, regs->lp_end, regs->lp_count);

		/* To continue printing callee regs on same line as scratch regs */
		if (start_num == 0)
		pr_info("%s", buf);
		else
		pr_cont("%s\n", buf);
		pr_info("r00: 0x%08lx\tr01: 0x%08lx\tr02: 0x%08lx\n" \
		"r03: 0x%08lx\tr04: 0x%08lx\tr05: 0x%08lx\n" \
		"r06: 0x%08lx\tr07: 0x%08lx\tr08: 0x%08lx\n" \
		"r09: 0x%08lx\tr10: 0x%08lx\tr11: 0x%08lx\n" \
		"r12: 0x%08lx\t",
		regs->r0, regs->r1, regs->r2,
		regs->r3, regs->r4, regs->r5,
		regs->r6, regs->r7, regs->r8,
		regs->r9, regs->r10, regs->r11,
		regs->r12);
		}

		static void show_callee_regs(struct callee_regs *cregs)
		static void print_regs_callee(struct callee_regs *regs)
		{
		print_reg_file(&(cregs->r13), 13);
		pr_cont("r13: 0x%08lx\tr14: 0x%08lx\n" \
		"r15: 0x%08lx\tr16: 0x%08lx\tr17: 0x%08lx\n" \
		"r18: 0x%08lx\tr19: 0x%08lx\tr20: 0x%08lx\n" \
		"r21: 0x%08lx\tr22: 0x%08lx\tr23: 0x%08lx\n" \
		"r24: 0x%08lx\tr25: 0x%08lx\n",
		regs->r13, regs->r14,
		regs->r15, regs->r16, regs->r17,
		regs->r18, regs->r19, regs->r20,
		regs->r21, regs->r22, regs->r23,
		regs->r24, regs->r25);
		}

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

		/*
		* generic code calls us with preemption disabled, but some calls
		@@ -209,20 +202,10 @@ void show_regs(struct pt_regs *regs)
		(regs->status32 & STATUS_U_MASK) ? "U " : "K ",
		STS_BIT(regs, DE), STS_BIT(regs, AE));
		#endif
		pr_cont(" BTA: 0x%08lx\n SP: 0x%08lx FP: 0x%08lx BLK: %pS\n",
		regs->bta, regs->sp, regs->fp, (void *)regs->blink);
		pr_info("LPS: 0x%08lx\tLPE: 0x%08lx\tLPC: 0x%08lx\n",
		regs->lp_start, regs->lp_end, regs->lp_count);

		/* print regs->r0 thru regs->r12
		* Sequential printing was generating horrible code
		*/
		print_reg_file(&(regs->r0), 0);

		/* If Callee regs were saved, display them too */
		cregs = (struct callee_regs *)current->thread.callee_reg;
		print_regs_scratch(regs);
		if (cregs)
		show_callee_regs(cregs);
		print_regs_callee(cregs);

		preempt_disable();
		}

arch/arc/mm/init.c

+16 −11

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@ static unsigned long low_mem_sz;

		#ifdef CONFIG_HIGHMEM
		static unsigned long min_high_pfn, max_high_pfn;
		static u64 high_mem_start;
		static u64 high_mem_sz;
		static phys_addr_t high_mem_start;
		static phys_addr_t high_mem_sz;
		#endif

		#ifdef CONFIG_DISCONTIGMEM
		@@ -69,6 +69,7 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
		high_mem_sz = size;
		in_use = 1;
		memblock_add_node(base, size, 1);
		memblock_reserve(base, size);
		#endif
		}

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

		max_zone_pfn[ZONE_HIGHMEM] = max_high_pfn;
		max_zone_pfn[ZONE_HIGHMEM] = min_low_pfn;

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

		/*
		* mem_init - initializes memory
		*
		* Frees up bootmem
		* Calculates and displays memory available/used
		*/
		void __init mem_init(void)
		static void __init highmem_init(void)
		{
		#ifdef CONFIG_HIGHMEM
		unsigned long tmp;

		reset_all_zones_managed_pages();
		memblock_free(high_mem_start, high_mem_sz);
		for (tmp = min_high_pfn; tmp < max_high_pfn; tmp++)
		free_highmem_page(pfn_to_page(tmp));
		#endif
		}

		/*
		* mem_init - initializes memory
		*
		* Frees up bootmem
		* Calculates and displays memory available/used
		*/
		void __init mem_init(void)
		{
		memblock_free_all();
		highmem_init();
		mem_init_print_info(NULL);
		}

Admin message