Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca902667 authored by Alexander Grund's avatar Alexander Grund
Browse files

Merge tag 'v4.4.295' into lineage-17.1 

This is the 4.4.295 stable release

Change-Id: I0236259f971f18a1d1a3dc985489803dd13b079b
parents 690d8622 87ae08ae

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 293

SUBLEVEL = 295

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/bcm5301x.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -175,6 +175,8 @@ 


			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};

	};

arch/arm/include/asm/tlb.h

+8 −0
Original line number Diff line number Diff line
@@ -257,6 +257,14 @@ tlb_remove_pmd_tlb_entry(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr 
	tlb_add_flush(tlb, addr);

}



static inline void

tlb_flush_pmd_range(struct mmu_gather *tlb, unsigned long address,

		    unsigned long size)

{

	tlb_add_flush(tlb, address);

	tlb_add_flush(tlb, address + size - PMD_SIZE);

}



#define pte_free_tlb(tlb, ptep, addr)	__pte_free_tlb(tlb, ptep, addr)

#define pmd_free_tlb(tlb, pmdp, addr)	__pmd_free_tlb(tlb, pmdp, addr)

#define pud_free_tlb(tlb, pudp, addr)	pud_free((tlb)->mm, pudp)

arch/arm/mach-socfpga/core.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ extern void __iomem *sdr_ctl_base_addr; 
u32 socfpga_sdram_self_refresh(u32 sdr_base);

extern unsigned int socfpga_sdram_self_refresh_sz;



extern char secondary_trampoline, secondary_trampoline_end;

extern char secondary_trampoline[], secondary_trampoline_end[];



extern unsigned long socfpga_cpu1start_addr;

arch/arm/mach-socfpga/platsmp.c

+4 −4
Original line number Diff line number Diff line
@@ -31,14 +31,14 @@ 


static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)

{

	int trampoline_size = &secondary_trampoline_end - &secondary_trampoline;

	int trampoline_size = secondary_trampoline_end - secondary_trampoline;



	if (socfpga_cpu1start_addr) {

		/* This will put CPU #1 into reset. */

		writel(RSTMGR_MPUMODRST_CPU1,

		       rst_manager_base_addr + SOCFPGA_RSTMGR_MODMPURST);



		memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);

		memcpy(phys_to_virt(0), secondary_trampoline, trampoline_size);



		writel(virt_to_phys(secondary_startup),

		       sys_manager_base_addr + (socfpga_cpu1start_addr & 0x000000ff));
@@ -56,12 +56,12 @@ static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle) 


static int socfpga_a10_boot_secondary(unsigned int cpu, struct task_struct *idle)

{

	int trampoline_size = &secondary_trampoline_end - &secondary_trampoline;

	int trampoline_size = secondary_trampoline_end - secondary_trampoline;



	if (socfpga_cpu1start_addr) {

		writel(RSTMGR_MPUMODRST_CPU1, rst_manager_base_addr +

		       SOCFPGA_A10_RSTMGR_MODMPURST);

		memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);

		memcpy(phys_to_virt(0), secondary_trampoline, trampoline_size);



		writel(virt_to_phys(secondary_startup),

		       sys_manager_base_addr + (socfpga_cpu1start_addr & 0x00000fff));