patch-2.3.35 linux/include/asm-sparc/sbus.h

Next file: linux/include/asm-sparc/scatterlist.h
Previous file: linux/include/asm-sparc/resource.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.34/linux/include/asm-sparc/sbus.h linux/include/asm-sparc/sbus.h
@@ -1,4 +1,4 @@
-/* $Id: sbus.h,v 1.16 1998/12/16 04:33:52 davem Exp $
+/* $Id: sbus.h,v 1.19 1999/10/25 06:17:56 zaitcev Exp $
  * sbus.h:  Defines for the Sun SBus.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -7,8 +7,11 @@
 #ifndef _SPARC_SBUS_H
 #define _SPARC_SBUS_H
 
+#include <linux/ioport.h>
+
 #include <asm/oplib.h>
 #include <asm/iommu.h>
+#include <asm/scatterlist.h>
 
 /* We scan which devices are on the SBus using the PROM node device
  * tree.  SBus devices are described in two different ways.  You can
@@ -34,77 +37,82 @@
   return (int) (((dev_addr)-SUN_SBUS_BVADDR)>>25);
 }
 
-extern __inline__ unsigned long sbus_dev_offset(unsigned long dev_addr)
-{
-  return (unsigned long) (((dev_addr)-SUN_SBUS_BVADDR)&SBUS_OFF_MASK);
-}
-
-struct linux_sbus;
+struct sbus_bus;
 
 /* Linux SBUS device tables */
-struct linux_sbus_device {
-  struct linux_sbus_device *next;      /* next device on this SBus or null */
-  struct linux_sbus_device *child;     /* For ledma and espdma on sun4m */
-  struct linux_sbus *my_bus;           /* Back ptr to sbus */
-  int prom_node;                       /* PROM device tree node for this device */
-  char prom_name[32];                  /* PROM device name */
-
-  struct linux_prom_registers reg_addrs[PROMREG_MAX];
-  int num_registers, ranges_applied;
-
-  unsigned int irqs[4];
-  int num_irqs;
-
-  unsigned long sbus_addr;             /* Absolute base address for device. */
-  unsigned long sbus_vaddrs[PROMVADDR_MAX];
-  unsigned long num_vaddrs;
-  unsigned long offset;                /* Offset given by PROM */
-  int slot;
+struct sbus_dev {
+	struct sbus_bus	*bus;       /* Back ptr to sbus */
+	struct sbus_dev	*next;      /* next device on this SBus or null */
+	struct sbus_dev	*child;     /* For ledma and espdma on sun4m */
+	struct sbus_dev	*parent;    /* Parent device if not toplevel */
+	int prom_node;              /* PROM device tree node for this device */
+	char prom_name[64];         /* PROM device name */
+	int slot;
+
+	struct resource resource[PROMREG_MAX];
+
+	struct linux_prom_registers reg_addrs[PROMREG_MAX];
+	int num_registers, ranges_applied;
+
+	struct linux_prom_ranges device_ranges[PROMREG_MAX];
+	int num_device_ranges;
+
+	unsigned int irqs[4];
+	int num_irqs;
 };
 
 /* This struct describes the SBus(s) found on this machine. */
-struct linux_sbus {
-	struct linux_sbus *next;             /* next SBus, if more than one SBus */
-	struct linux_sbus_device *devices;   /* Link to devices on this SBus */
-	struct iommu_struct *iommu;          /* IOMMU for this sbus if applicable */
-	int prom_node;                       /* PROM device tree node for this SBus */
-	char prom_name[16];                  /* Usually "sbus" or "sbi" */
-	int clock_freq;
+struct sbus_bus {
+	void			*iommu;		/* Opaque IOMMU cookie */
+	struct sbus_dev		*devices;	/* Link to devices on this SBus */
+	struct sbus_bus		*next;		/* next SBus, if more than one SBus */
+	int			prom_node;	/* PROM device tree node for this SBus */
+	char			prom_name[64];  /* Usually "sbus" or "sbi" */
+	int			clock_freq;
+
 	struct linux_prom_ranges sbus_ranges[PROMREG_MAX];
 	int num_sbus_ranges;
+
 	int devid;
 	int board;
 };
 
-extern struct linux_sbus *SBus_chain;
+extern struct sbus_bus *sbus_root;
 
 extern __inline__ int
-sbus_is_slave(struct linux_sbus_device *dev)
+sbus_is_slave(struct sbus_dev *dev)
 {
-	/* Have to write this for sun4c's */
+	/* XXX Have to write this for sun4c's */
 	return 0;
 }
 
 /* Device probing routines could find these handy */
 #define for_each_sbus(bus) \
-        for((bus) = SBus_chain; (bus); (bus)=(bus)->next)
+        for((bus) = sbus_root; (bus); (bus)=(bus)->next)
 
 #define for_each_sbusdev(device, bus) \
         for((device) = (bus)->devices; (device); (device)=(device)->next)
         
 #define for_all_sbusdev(device, bus) \
-	for((bus) = SBus_chain, (device) = (bus)->devices; (bus); (device)=((device)->next ? (device)->next : ((bus) = (bus)->next, (bus) ? (bus)->devices : 0)))
-
-/* If you did not get the buffer from mmu_get_*() or sparc_alloc_dvma()
- * then you must use this to get the 32-bit SBUS dvma address.
- * And in this case it is your responsibility to make sure the buffer
- * is GFP_DMA, ie. that it is not greater than MAX_DMA_ADDRESS.
- */
-#define sbus_dvma_addr(__addr)	((__u32)(__addr))
+	for((bus) = sbus_root, ((device) = (bus) ? (bus)->devices : 0); (bus); (device)=((device)->next ? (device)->next : ((bus) = (bus)->next, (bus) ? (bus)->devices : 0)))
 
-/* Apply promlib probed SBUS ranges to registers. */
-extern void prom_apply_sbus_ranges(struct linux_sbus *sbus, 
-				   struct linux_prom_registers *sbusregs,
-				   int nregs, struct linux_sbus_device *sdev);
+/* 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);
+
+/* These yield IOMMU mappings in consistant mode. */
+extern void *sbus_alloc_consistant(struct sbus_dev *, long, u32 *dma_addrp);
+extern void sbus_free_consistant(struct sbus_dev *, long, void *, u32);
+
+/* All the rest use streaming mode mappings. */
+extern u32 sbus_map_single(struct sbus_dev *, void *, long);
+extern void sbus_unmap_single(struct sbus_dev *, u32, long);
+extern void sbus_map_sg(struct sbus_dev *, struct scatterlist *, int);
+extern void sbus_unmap_sg(struct sbus_dev *, struct scatterlist *, int);
+
+/* Finally, allow explicit synchronization of streamable mappings. */
+extern void sbus_dma_sync_single(struct sbus_dev *, u32, long);
+extern void sbus_dma_sync_sg(struct sbus_dev *, struct scatterlist *, int);
 
 #endif /* !(_SPARC_SBUS_H) */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)