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

Commit 6662327e authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by David S. Miller
Browse files

ide: merge <asm-sparc/ide_64.h> with <asm-sparc/ide_32.h> 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent edc83d4f

include/asm-sparc/ide.h

+97 −5
Original line number Diff line number Diff line 
#ifndef ___ASM_SPARC_IDE_H

#define ___ASM_SPARC_IDE_H

#if defined(__sparc__) && defined(__arch64__)

#include <asm-sparc/ide_64.h>

/* ide.h: SPARC PCI specific IDE glue.

 *

 * Copyright (C) 1997  David S. Miller (davem@davemloft.net)

 * Copyright (C) 1998  Eddie C. Dost   (ecd@skynet.be)

 * Adaptation from sparc64 version to sparc by Pete Zaitcev.

 */



#ifndef _SPARC_IDE_H

#define _SPARC_IDE_H



#ifdef __KERNEL__



#include <asm/io.h>

#ifdef CONFIG_SPARC64

#include <asm/pgalloc.h>

#include <asm/spitfire.h>

#include <asm/cacheflush.h>

#include <asm/page.h>

#else

#include <asm-sparc/ide_32.h>

#include <asm/pgtable.h>

#include <asm/psr.h>

#endif



#undef  MAX_HWIFS

#define MAX_HWIFS	2



#define __ide_insl(data_reg, buffer, wcount) \

	__ide_insw(data_reg, buffer, (wcount)<<1)

#define __ide_outsl(data_reg, buffer, wcount) \

	__ide_outsw(data_reg, buffer, (wcount)<<1)



/* On sparc, I/O ports and MMIO registers are accessed identically.  */

#define __ide_mm_insw	__ide_insw

#define __ide_mm_insl	__ide_insl

#define __ide_mm_outsw	__ide_outsw

#define __ide_mm_outsl	__ide_outsl



static inline void __ide_insw(void __iomem *port, void *dst, u32 count)

{

#if defined(CONFIG_SPARC64) && defined(DCACHE_ALIASING_POSSIBLE)

	unsigned long end = (unsigned long)dst + (count << 1);

#endif

	u16 *ps = dst;

	u32 *pi;



	if(((unsigned long)ps) & 0x2) {

		*ps++ = __raw_readw(port);

		count--;

	}

	pi = (u32 *)ps;

	while(count >= 2) {

		u32 w;



		w  = __raw_readw(port) << 16;

		w |= __raw_readw(port);

		*pi++ = w;

		count -= 2;

	}

	ps = (u16 *)pi;

	if(count)

		*ps++ = __raw_readw(port);



#if defined(CONFIG_SPARC64) && defined(DCACHE_ALIASING_POSSIBLE)

	__flush_dcache_range((unsigned long)dst, end);

#endif

}



static inline void __ide_outsw(void __iomem *port, const void *src, u32 count)

{

#if defined(CONFIG_SPARC64) && defined(DCACHE_ALIASING_POSSIBLE)

	unsigned long end = (unsigned long)src + (count << 1);

#endif

	const u16 *ps = src;

	const u32 *pi;



	if(((unsigned long)src) & 0x2) {

		__raw_writew(*ps++, port);

		count--;

	}

	pi = (const u32 *)ps;

	while(count >= 2) {

		u32 w;



		w = *pi++;

		__raw_writew((w >> 16), port);

		__raw_writew(w, port);

		count -= 2;

	}

	ps = (const u16 *)pi;

	if(count)

		__raw_writew(*ps, port);



#if defined(CONFIG_SPARC64) && defined(DCACHE_ALIASING_POSSIBLE)

	__flush_dcache_range((unsigned long)src, end);

#endif

}



#endif /* __KERNEL__ */



#endif /* _SPARC_IDE_H */

include/asm-sparc/ide_32.h

deleted100644 → 0
+0 −85
Original line number Diff line number Diff line 
/* ide.h: SPARC PCI specific IDE glue.

 *

 * Copyright (C) 1997  David S. Miller (davem@davemloft.net)

 * Copyright (C) 1998  Eddie C. Dost   (ecd@skynet.be)

 * Adaptation from sparc64 version to sparc by Pete Zaitcev.

 */



#ifndef _SPARC_IDE_H

#define _SPARC_IDE_H



#ifdef __KERNEL__



#include <asm/pgtable.h>

#include <asm/io.h>

#include <asm/psr.h>



#undef  MAX_HWIFS

#define MAX_HWIFS	2



#define __ide_insl(data_reg, buffer, wcount) \

	__ide_insw(data_reg, buffer, (wcount)<<1)

#define __ide_outsl(data_reg, buffer, wcount) \

	__ide_outsw(data_reg, buffer, (wcount)<<1)



/* On sparc, I/O ports and MMIO registers are accessed identically.  */

#define __ide_mm_insw	__ide_insw

#define __ide_mm_insl	__ide_insl

#define __ide_mm_outsw	__ide_outsw

#define __ide_mm_outsl	__ide_outsl



static inline void __ide_insw(void __iomem *port, void *dst, u32 count)

{

	/* unsigned long end = (unsigned long)dst + (count << 1); */ /* P3 */

	u16 *ps = dst;

	u32 *pi;



	if(((unsigned long)ps) & 0x2) {

		*ps++ = __raw_readw(port);

		count--;

	}

	pi = (u32 *)ps;

	while(count >= 2) {

		u32 w;



		w  = __raw_readw(port) << 16;

		w |= __raw_readw(port);

		*pi++ = w;

		count -= 2;

	}

	ps = (u16 *)pi;

	if(count)

		*ps++ = __raw_readw(port);



	/* __flush_dcache_range((unsigned long)dst, end); */ /* P3 see hme */

}



static inline void __ide_outsw(void __iomem *port, const void *src, u32 count)

{

	/* unsigned long end = (unsigned long)src + (count << 1); */

	const u16 *ps = src;

	const u32 *pi;



	if(((unsigned long)src) & 0x2) {

		__raw_writew(*ps++, port);

		count--;

	}

	pi = (const u32 *)ps;

	while(count >= 2) {

		u32 w;



		w = *pi++;

		__raw_writew((w >> 16), port);

		__raw_writew(w, port);

		count -= 2;

	}

	ps = (const u16 *)pi;

	if(count)

		__raw_writew(*ps, port);



	/* __flush_dcache_range((unsigned long)src, end); */ /* P3 see hme */

}



#endif /* __KERNEL__ */



#endif /* _SPARC_IDE_H */

include/asm-sparc/ide_64.h

deleted100644 → 0
+0 −100
Original line number Diff line number Diff line 
/*

 * ide.h: Ultra/PCI specific IDE glue.

 *

 * Copyright (C) 1997  David S. Miller (davem@caip.rutgers.edu)

 * Copyright (C) 1998  Eddie C. Dost   (ecd@skynet.be)

 */



#ifndef _SPARC64_IDE_H

#define _SPARC64_IDE_H



#ifdef __KERNEL__



#include <asm/pgalloc.h>

#include <asm/io.h>

#include <asm/spitfire.h>

#include <asm/cacheflush.h>

#include <asm/page.h>



#ifndef MAX_HWIFS

# ifdef CONFIG_BLK_DEV_IDEPCI

#define MAX_HWIFS	10

# else

#define MAX_HWIFS	2

# endif

#endif



#define __ide_insl(data_reg, buffer, wcount) \

	__ide_insw(data_reg, buffer, (wcount)<<1)

#define __ide_outsl(data_reg, buffer, wcount) \

	__ide_outsw(data_reg, buffer, (wcount)<<1)



/* On sparc64, I/O ports and MMIO registers are accessed identically.  */

#define __ide_mm_insw	__ide_insw

#define __ide_mm_insl	__ide_insl

#define __ide_mm_outsw	__ide_outsw

#define __ide_mm_outsl	__ide_outsl



static inline void __ide_insw(void __iomem *port, void *dst, u32 count)

{

#ifdef DCACHE_ALIASING_POSSIBLE

	unsigned long end = (unsigned long)dst + (count << 1);

#endif

	u16 *ps = dst;

	u32 *pi;



	if(((u64)ps) & 0x2) {

		*ps++ = __raw_readw(port);

		count--;

	}

	pi = (u32 *)ps;

	while(count >= 2) {

		u32 w;



		w  = __raw_readw(port) << 16;

		w |= __raw_readw(port);

		*pi++ = w;

		count -= 2;

	}

	ps = (u16 *)pi;

	if(count)

		*ps++ = __raw_readw(port);



#ifdef DCACHE_ALIASING_POSSIBLE

	__flush_dcache_range((unsigned long)dst, end);

#endif

}



static inline void __ide_outsw(void __iomem *port, void *src, u32 count)

{

#ifdef DCACHE_ALIASING_POSSIBLE

	unsigned long end = (unsigned long)src + (count << 1);

#endif

	const u16 *ps = src;

	const u32 *pi;



	if(((u64)src) & 0x2) {

		__raw_writew(*ps++, port);

		count--;

	}

	pi = (const u32 *)ps;

	while(count >= 2) {

		u32 w;



		w = *pi++;

		__raw_writew((w >> 16), port);

		__raw_writew(w, port);

		count -= 2;

	}

	ps = (const u16 *)pi;

	if(count)

		__raw_writew(*ps, port);



#ifdef DCACHE_ALIASING_POSSIBLE

	__flush_dcache_range((unsigned long)src, end);

#endif

}



#endif /* __KERNEL__ */



#endif /* _SPARC64_IDE_H */