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

Commit 63237eeb authored by David S. Miller's avatar David S. Miller
Browse files

sparc: Move SBUS DMA attribute interfaces out of asm/sbus.h 



This is in preparation for the subsequent asm/sbus.h removal.

Also, make these routines take a "struct device" or no
arguments, as appropriate.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 738f2b7b

arch/sparc/include/asm/io_32.h

+11 −0
Original line number Diff line number Diff line
@@ -308,6 +308,17 @@ extern void sbus_iounmap(volatile void __iomem *vaddr, unsigned long size); 
#define RTC_PORT(x)   (rtc_port + (x))

#define RTC_ALWAYS_BCD  0



static inline int sbus_can_dma_64bit(void)

{

	return 0; /* actually, sparc_cpu_model==sun4d */

}

static inline int sbus_can_burst64(void)

{

	return 0; /* actually, sparc_cpu_model==sun4d */

}

struct device;

extern void sbus_set_sbus64(struct device *, int);



#endif



#define __ARCH_HAS_NO_PAGE_ZERO_MAPPED		1

arch/sparc/include/asm/io_64.h

+11 −0
Original line number Diff line number Diff line
@@ -495,6 +495,17 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *); 
#define sbus_iounmap(__addr, __size)	\

	release_region((unsigned long)(__addr), (__size))



static inline int sbus_can_dma_64bit(void)

{

	return 1;

}

static inline int sbus_can_burst64(void)

{

	return 1;

}

struct device;

extern void sbus_set_sbus64(struct device *, int);



/*

 * Convert a physical pointer to a virtual kernel pointer for /dev/mem

 * access

arch/sparc/include/asm/sbus_32.h

+0 −4
Original line number Diff line number Diff line
@@ -102,10 +102,6 @@ sbus_is_slave(struct sbus_dev *dev) 
	for ((bus) = sbus_root; (bus); (bus) = (bus)->next) \

		for ((device) = (bus)->devices; (device); (device) = (device)->next)



/* Driver DVMA interfaces. */

#define sbus_can_dma_64bit(sdev)	(0) /* actually, sparc_cpu_model==sun4d */

#define sbus_can_burst64(sdev)		(0) /* actually, sparc_cpu_model==sun4d */

extern void sbus_set_sbus64(struct sbus_dev *, int);

extern void sbus_fill_device_irq(struct sbus_dev *);



/* These yield IOMMU mappings in consistent mode. */

arch/sparc/include/asm/sbus_64.h

+0 −4
Original line number Diff line number Diff line
@@ -94,10 +94,6 @@ extern struct sbus_bus *sbus_root; 
	for ((bus) = sbus_root; (bus); (bus) = (bus)->next) \

		for ((device) = (bus)->devices; (device); (device) = (device)->next)



/* Driver DVMA interfaces. */

#define sbus_can_dma_64bit(sdev)	(1)

#define sbus_can_burst64(sdev)		(1)

extern void sbus_set_sbus64(struct sbus_dev *, int);

extern void sbus_fill_device_irq(struct sbus_dev *);



extern void sbus_arch_bus_ranges_init(struct device_node *, struct sbus_bus *);

arch/sparc/kernel/ioport.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static void _sparc_free_io(struct resource *res) 


#ifdef CONFIG_SBUS



void sbus_set_sbus64(struct sbus_dev *sdev, int x)

void sbus_set_sbus64(struct device *dev, int x)

{

	printk("sbus_set_sbus64: unsupported\n");

}