Commit c78d0c74 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390: rename dma section to amode31 



The dma section name is confusing, since the code which resides within
that section has nothing to do with direct memory access.  Instead the
limitation is that the code has to run in 31 bit addressing mode, and
therefore has to reside below 2GB.  So the name was chosen since
ZONE_DMA is the same region.

To reduce confusion rename the section to amode31, which hopefully
describes better what this is about.

Note: this will also change vmcoreinfo strings
- SDMA=... gets renamed to SAMODE31=...
- EDMA=... gets renamed to EAMODE31=...

Acked-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Reviewed-by: default avatarAlexander Egorenkov <egorenar@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent cfafad6d

arch/s390/hypfs/hypfs_diag0c.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
static void diag0c_fn(void *data)

{

	diag_stat_inc(DIAG_STAT_X00C);

	diag_dma_ops.diag0c(((void **) data)[smp_processor_id()]);

	diag_amode31_ops.diag0c(((void **)data)[smp_processor_id()]);

}



/*

arch/s390/include/asm/diag.h

+11 −8
Original line number Diff line number Diff line
@@ -309,7 +309,10 @@ int diag26c(void *req, void *resp, enum diag26c_sc subcode); 


struct hypfs_diag0c_entry;



/* This struct must contain only pointers/references into the text DMA section. */

/*

 * This structure must contain only pointers/references into

 * the AMODE31 text section.

 */

struct diag_ops {

	int (*diag210)(struct diag210 *addr);

	int (*diag26c)(void *req, void *resp, enum diag26c_sc subcode);
@@ -318,13 +321,13 @@ struct diag_ops { 
	void (*diag308_reset)(void);

};



extern struct diag_ops diag_dma_ops;

extern struct diag210 *__diag210_tmp_dma;

extern struct diag_ops diag_amode31_ops;

extern struct diag210 *__diag210_tmp_amode31;



int _diag210_dma(struct diag210 *addr);

int _diag26c_dma(void *req, void *resp, enum diag26c_sc subcode);

int _diag14_dma(unsigned long rx, unsigned long ry1, unsigned long subcode);

void _diag0c_dma(struct hypfs_diag0c_entry *entry);

void _diag308_reset_dma(void);

int _diag210_amode31(struct diag210 *addr);

int _diag26c_amode31(void *req, void *resp, enum diag26c_sc subcode);

int _diag14_amode31(unsigned long rx, unsigned long ry1, unsigned long subcode);

void _diag0c_amode31(struct hypfs_diag0c_entry *entry);

void _diag308_reset_amode31(void);



#endif /* _ASM_S390_DIAG_H */

arch/s390/include/asm/extable.h

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ struct exception_table_entry 
	long handler;

};



extern struct exception_table_entry *__start_dma_ex_table;

extern struct exception_table_entry *__stop_dma_ex_table;

extern struct exception_table_entry *__start_amode31_ex_table;

extern struct exception_table_entry *__stop_amode31_ex_table;



const struct exception_table_entry *s390_search_extables(unsigned long addr);

arch/s390/include/asm/linkage.h

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#define EX_TABLE(_fault, _target)					\

	__EX_TABLE(__ex_table, _fault, _target)

#define EX_TABLE_DMA(_fault, _target)					\

	__EX_TABLE(.dma.ex_table, _fault, _target)

#define EX_TABLE_AMODE31(_fault, _target)				\

	__EX_TABLE(.amode31.ex_table, _fault, _target)



#endif

arch/s390/include/asm/sections.h

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static inline int arch_is_kernel_initmem_freed(unsigned long addr) 
 */

#define __bootdata_preserved(var) __section(".boot.preserved.data." #var) var



extern unsigned long __sdma, __edma;

extern unsigned long __stext_dma, __etext_dma;

extern unsigned long __samode31, __eamode31;

extern unsigned long __stext_amode31, __etext_amode31;



#endif