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

Commit e5859eb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc updates from Helge Deller:
 "Main changes are:

   - Added support to the parisc dma functions to return DMA_ERROR_CODE
     if DMA isn't possible. This fixes a long standing kernel crash if
     parport_pc is enabled (by Thomas Bogendoerfer, marked for stable
     series).

   - Use the compat_sys_keyctl() in compat mode (by Eric Biggers, marked
     for stable series).

   - Initial support for the Page Deallocation Table (PDT) which is
     maintained by firmware and holds the list of memory addresses which
     had physical errors. By checking that list we can prevent Linux to
     use those broken memory areas.

   - Ensure IRQs are off in switch_mm().

   - Report SIGSEGV instead of SIGBUS when running out of stack.

   - Mark the cr16 clocksource stable on single-socket and single-core
     machines"

* 'parisc-4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: DMA API: return error instead of BUG_ON for dma ops on non dma devs
  parisc: Report SIGSEGV instead of SIGBUS when running out of stack
  parisc: use compat_sys_keyctl()
  parisc: Don't hardcode PSW values in hpmc code
  parisc: Don't hardcode PSW values in gsc_*() functions
  parisc: Avoid zeroing gr[0] in fixup_exception()
  parisc/mm: Ensure IRQs are off in switch_mm()
  parisc: Add Page Deallocation Table (PDT) support
  parisc: Enhance detection of synchronous cr16 clocksources
  parisc: Drop per_cpu uaccess related exception_data struct
  parisc: Inline trivial exception code in lusercopy.S
parents 058e88d3 33f9e024

arch/parisc/include/asm/dma-mapping.h

+7 −4
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
** flush/purge and allocate "regular" cacheable pages for everything.

*/



#define DMA_ERROR_CODE	(~(dma_addr_t)0)



#ifdef CONFIG_PA11

extern const struct dma_map_ops pcxl_dma_ops;

extern const struct dma_map_ops pcx_dma_ops;
@@ -54,12 +56,13 @@ parisc_walk_tree(struct device *dev) 
			break;

		}

	}

	BUG_ON(!dev->platform_data);

	return dev->platform_data;

}



#define GET_IOC(dev) (HBA_DATA(parisc_walk_tree(dev))->iommu)

	

#define GET_IOC(dev) ({					\

	void *__pdata = parisc_walk_tree(dev);		\

	__pdata ? HBA_DATA(__pdata)->iommu : NULL;	\

})



#ifdef CONFIG_IOMMU_CCIO

struct parisc_device;

arch/parisc/include/asm/io.h

+8 −8
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ static inline unsigned char gsc_readb(unsigned long addr) 
	unsigned char ret;



	__asm__ __volatile__(

	"	rsm	2,%0\n"

	"	rsm	%3,%0\n"

	"	ldbx	0(%2),%1\n"

	"	mtsm	%0\n"

	: "=&r" (flags), "=r" (ret) : "r" (addr) );

	: "=&r" (flags), "=r" (ret) : "r" (addr), "i" (PSW_SM_D) );



	return ret;

}
@@ -48,10 +48,10 @@ static inline unsigned short gsc_readw(unsigned long addr) 
	unsigned short ret;



	__asm__ __volatile__(

	"	rsm	2,%0\n"

	"	rsm	%3,%0\n"

	"	ldhx	0(%2),%1\n"

	"	mtsm	%0\n"

	: "=&r" (flags), "=r" (ret) : "r" (addr) );

	: "=&r" (flags), "=r" (ret) : "r" (addr), "i" (PSW_SM_D) );



	return ret;

}
@@ -87,20 +87,20 @@ static inline void gsc_writeb(unsigned char val, unsigned long addr) 
{

	long flags;

	__asm__ __volatile__(

	"	rsm	2,%0\n"

	"	rsm	%3,%0\n"

	"	stbs	%1,0(%2)\n"

	"	mtsm	%0\n"

	: "=&r" (flags) :  "r" (val), "r" (addr) );

	: "=&r" (flags) :  "r" (val), "r" (addr), "i" (PSW_SM_D) );

}



static inline void gsc_writew(unsigned short val, unsigned long addr)

{

	long flags;

	__asm__ __volatile__(

	"	rsm	2,%0\n"

	"	rsm	%3,%0\n"

	"	sths	%1,0(%2)\n"

	"	mtsm	%0\n"

	: "=&r" (flags) :  "r" (val), "r" (addr) );

	: "=&r" (flags) :  "r" (val), "r" (addr), "i" (PSW_SM_D) );

}



static inline void gsc_writel(unsigned int val, unsigned long addr)

arch/parisc/include/asm/mmu_context.h

+13 −2
Original line number Diff line number Diff line
@@ -49,15 +49,26 @@ static inline void load_context(mm_context_t context) 
	mtctl(__space_to_prot(context), 8);

}



static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)

static inline void switch_mm_irqs_off(struct mm_struct *prev,

		struct mm_struct *next, struct task_struct *tsk)

{



	if (prev != next) {

		mtctl(__pa(next->pgd), 25);

		load_context(next->context);

	}

}



static inline void switch_mm(struct mm_struct *prev,

		struct mm_struct *next, struct task_struct *tsk)

{

	unsigned long flags;



	local_irq_save(flags);

	switch_mm_irqs_off(prev, next, tsk);

	local_irq_restore(flags);

}

#define switch_mm_irqs_off switch_mm_irqs_off



#define deactivate_mm(tsk,mm)	do { } while (0)



static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)

arch/parisc/include/asm/pdc.h

+18 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
#if !defined(__ASSEMBLY__)



extern int pdc_type;

extern unsigned long parisc_cell_num; /* cell number the CPU runs on (PAT) */

extern unsigned long parisc_cell_loc; /* cell location of CPU (PAT)	   */



/* Values for pdc_type */

#define PDC_TYPE_ILLEGAL	-1
@@ -143,6 +145,18 @@ struct pdc_btlb_info { /* PDC_BLOCK_TLB, return of PDC_BTLB_INFO */ 


#endif /* !CONFIG_PA20 */



struct pdc_mem_retinfo { /* PDC_MEM/PDC_MEM_MEMINFO (return info) */

	unsigned long pdt_size;

	unsigned long pdt_entries;

	unsigned long pdt_status;

	unsigned long first_dbe_loc;

	unsigned long good_mem;

};



struct pdc_mem_read_pdt { /* PDC_MEM/PDC_MEM_READ_PDT (return info) */

	unsigned long pdt_entries;

};



#ifdef CONFIG_64BIT

struct pdc_memory_table_raddr { /* PDC_MEM/PDC_MEM_TABLE (return info) */

	unsigned long entries_returned;
@@ -301,6 +315,10 @@ int pdc_get_initiator(struct hardware_path *, struct pdc_initiator *); 
int pdc_tod_read(struct pdc_tod *tod);

int pdc_tod_set(unsigned long sec, unsigned long usec);



void pdc_pdt_init(void);	/* in pdt.c */

int pdc_mem_pdt_info(struct pdc_mem_retinfo *rinfo);

int pdc_mem_pdt_read_entries(struct pdc_mem_read_pdt *rpdt_read,

		unsigned long *pdt_entries_ptr);

#ifdef CONFIG_64BIT

int pdc_mem_mem_table(struct pdc_memory_table_raddr *r_addr,

		struct pdc_memory_table *tbl, unsigned long entries);

arch/parisc/include/asm/pdcpat.h

+26 −9
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ 
#define PDC_PAT_MEM_CELL_CLEAR  	6L /* Clear PDT For Cell           */

#define PDC_PAT_MEM_CELL_READ   	7L /* Read PDT entries For Cell    */

#define PDC_PAT_MEM_CELL_RESET  	8L /* Reset clear bit For Cell     */

#define PDC_PAT_MEM_SETGM	  	9L /* Set Golden Memory value      */

#define PDC_PAT_MEM_SETGM		9L /* Set Good Memory value        */

#define PDC_PAT_MEM_ADD_PAGE		10L /* ADDs a page to the cell      */

#define PDC_PAT_MEM_ADDRESS		11L /* Get Physical Location From   */

                                    		 /* Memory Address               */
@@ -212,6 +212,23 @@ struct pdc_pat_cpu_num { 
	unsigned long cpu_loc;

};



struct pdc_pat_mem_retinfo { /* PDC_PAT_MEM/PDC_PAT_MEM_PD_INFO (return info) */

	unsigned int ke;	/* bit 0: memory inside good memory? */

	unsigned int current_pdt_entries:16;

	unsigned int max_pdt_entries:16;

	unsigned long Cs_bitmap;

	unsigned long Ic_bitmap;

	unsigned long good_mem;

	unsigned long first_dbe_loc; /* first location of double bit error */

	unsigned long clear_time; /* last PDT clear time (since Jan 1970) */

};



struct pdc_pat_mem_read_pd_retinfo { /* PDC_PAT_MEM/PDC_PAT_MEM_PD_READ */

	unsigned long actual_count_bytes;

	unsigned long pdt_entries;

};





struct pdc_pat_pd_addr_map_entry {

	unsigned char entry_type;       /* 1 = Memory Descriptor Entry Type */

	unsigned char reserve1[5];
@@ -293,15 +310,15 @@ extern int pdc_pat_cpu_get_number(struct pdc_pat_cpu_num *cpu_info, unsigned lon 


extern int pdc_pat_pd_get_addr_map(unsigned long *actual_len, void *mem_addr, unsigned long count, unsigned long offset);





extern int pdc_pat_io_pci_cfg_read(unsigned long pci_addr, int pci_size, u32 *val); 

extern int pdc_pat_io_pci_cfg_write(unsigned long pci_addr, int pci_size, u32 val); 





/* Flag to indicate this is a PAT box...don't use this unless you

** really have to...it might go away some day.

*/

extern int pdc_pat;     /* arch/parisc/kernel/inventory.c */

extern int pdc_pat_mem_pdt_info(struct pdc_pat_mem_retinfo *rinfo);

extern int pdc_pat_mem_read_cell_pdt(struct pdc_pat_mem_read_pd_retinfo *pret,

		unsigned long *pdt_entries_ptr, unsigned long max_entries);

extern int pdc_pat_mem_read_pd_pdt(struct pdc_pat_mem_read_pd_retinfo *pret,

		unsigned long *pdt_entries_ptr, unsigned long count,

		unsigned long offset);



#endif /* __ASSEMBLY__ */