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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Temporarily remove IOMMU merging code.
  [SPARC64]: Update defconfig.
  [SPARC]: Add new timerfd syscall entries.
parents 55850f47 38192d52

arch/sparc/kernel/systbls.S

+4 −2
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ sys_call_table: 
/*295*/	.long sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare

/*300*/	.long sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy

/*305*/	.long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait

/*310*/	.long sys_utimensat, sys_signalfd, sys_ni_syscall, sys_eventfd, sys_fallocate

/*310*/	.long sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate

/*315*/	.long sys_timerfd_settime, sys_timerfd_gettime



#ifdef CONFIG_SUNOS_EMUL

	/* Now the SunOS syscall table. */
@@ -197,6 +198,7 @@ sunos_sys_table: 
	.long sunos_nosys, sunos_nosys, sunos_nosys

	.long sunos_nosys

/*310*/	.long sunos_nosys, sunos_nosys, sunos_nosys

	.long sunos_nosys, sunos_nosys

	.long sunos_nosys, sunos_nosys, sunos_nosys

	.long sunos_nosys



#endif

arch/sparc64/defconfig

+53 −30
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.24-rc4

# Tue Dec  4 00:37:59 2007

# Linux kernel version: 2.6.24

# Tue Feb  5 17:28:19 2008

#

CONFIG_SPARC=y

CONFIG_SPARC64=y
@@ -17,6 +17,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y 
# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_AUDIT_ARCH=y

CONFIG_HAVE_SETUP_PER_CPU_AREA=y

CONFIG_ARCH_NO_VIRT_TO_BUS=y

CONFIG_OF=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
@@ -30,13 +31,15 @@ CONFIG_HZ_100=y 
# CONFIG_HZ_300 is not set

# CONFIG_HZ_1000 is not set

CONFIG_HZ=100

# CONFIG_SCHED_HRTICK is not set

CONFIG_HOTPLUG_CPU=y

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#

# General setup

#

CONFIG_EXPERIMENTAL=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32

CONFIG_LOCALVERSION=""

# CONFIG_LOCALVERSION_AUTO is not set
@@ -76,6 +79,7 @@ CONFIG_FUTEX=y 
CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_VM_EVENT_COUNTERS=y
@@ -83,6 +87,14 @@ CONFIG_SLUB_DEBUG=y 
# CONFIG_SLAB is not set

CONFIG_SLUB=y

# CONFIG_SLOB is not set

CONFIG_PROFILING=y

# CONFIG_MARKERS is not set

CONFIG_OPROFILE=m

CONFIG_HAVE_OPROFILE=y

CONFIG_KPROBES=y

CONFIG_HAVE_KPROBES=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0
@@ -92,6 +104,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_KMOD=y

CONFIG_STOP_MACHINE=y

CONFIG_BLOCK=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_BLK_DEV_BSG=y
@@ -109,6 +122,8 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_CLASSIC_RCU=y

# CONFIG_PREEMPT_RCU is not set

CONFIG_SYSVIPC_COMPAT=y

CONFIG_GENERIC_HARDIRQS=y
@@ -119,7 +134,8 @@ CONFIG_TICK_ONESHOT=y 
CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

# CONFIG_SMP is not set

CONFIG_SMP=y

CONFIG_NR_CPUS=64

# CONFIG_CPU_FREQ is not set

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -169,9 +185,12 @@ CONFIG_BINFMT_ELF32=y 
CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_MISC=m

CONFIG_SOLARIS_EMUL=y

CONFIG_SCHED_SMT=y

CONFIG_SCHED_MC=y

# CONFIG_PREEMPT_NONE is not set

CONFIG_PREEMPT_VOLUNTARY=y

# CONFIG_PREEMPT is not set

# CONFIG_RCU_TRACE is not set

# CONFIG_CMDLINE_BOOL is not set



#
@@ -189,6 +208,7 @@ CONFIG_XFRM=y 
CONFIG_XFRM_USER=m

# CONFIG_XFRM_SUB_POLICY is not set

CONFIG_XFRM_MIGRATE=y

# CONFIG_XFRM_STATISTICS is not set

CONFIG_NET_KEY=m

CONFIG_NET_KEY_MIGRATE=y

CONFIG_INET=y
@@ -249,9 +269,9 @@ CONFIG_IP_DCCP_ACKVEC=y 
CONFIG_IP_DCCP_CCID2=m

# CONFIG_IP_DCCP_CCID2_DEBUG is not set

CONFIG_IP_DCCP_CCID3=m

CONFIG_IP_DCCP_TFRC_LIB=m

# CONFIG_IP_DCCP_CCID3_DEBUG is not set

CONFIG_IP_DCCP_CCID3_RTO=100

CONFIG_IP_DCCP_TFRC_LIB=m



#

# DCCP Kernel Hacking
@@ -279,6 +299,7 @@ CONFIG_VLAN_8021Q=m 
CONFIG_NET_PKTGEN=m

CONFIG_NET_TCPPROBE=m

# CONFIG_HAMRADIO is not set

# CONFIG_CAN is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set
@@ -343,6 +364,7 @@ CONFIG_BLK_DEV_IDE=y 
CONFIG_BLK_DEV_IDEDISK=y

# CONFIG_IDEDISK_MULTI_MODE is not set

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y

# CONFIG_BLK_DEV_IDETAPE is not set

# CONFIG_BLK_DEV_IDEFLOPPY is not set

# CONFIG_BLK_DEV_IDESCSI is not set
@@ -359,7 +381,6 @@ CONFIG_IDE_GENERIC=y 
# PCI IDE chipsets support

#

CONFIG_BLK_DEV_IDEPCI=y

# CONFIG_IDEPCI_SHARE_IRQ is not set

CONFIG_IDEPCI_PCIBUS_ORDER=y

# CONFIG_BLK_DEV_GENERIC is not set

# CONFIG_BLK_DEV_OPTI621 is not set
@@ -389,7 +410,6 @@ CONFIG_BLK_DEV_ALI15X3=y 
# CONFIG_BLK_DEV_TRM290 is not set

# CONFIG_BLK_DEV_VIA82CXXX is not set

# CONFIG_BLK_DEV_TC86C001 is not set

# CONFIG_IDE_ARM is not set

CONFIG_BLK_DEV_IDEDMA=y

CONFIG_IDE_ARCH_OBSOLETE_INIT=y

# CONFIG_BLK_DEV_HD is not set
@@ -501,7 +521,6 @@ CONFIG_NETDEVICES=y 
# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_IP1000 is not set

# CONFIG_ARCNET is not set

# CONFIG_PHYLIB is not set

CONFIG_NET_ETHERNET=y
@@ -533,6 +552,7 @@ CONFIG_NET_PCI=y 
# CONFIG_NE2K_PCI is not set

# CONFIG_8139CP is not set

# CONFIG_8139TOO is not set

# CONFIG_R6040 is not set

# CONFIG_SIS900 is not set

# CONFIG_EPIC100 is not set

# CONFIG_SUNDANCE is not set
@@ -545,6 +565,9 @@ CONFIG_E1000=m 
CONFIG_E1000_NAPI=y

# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set

# CONFIG_E1000E is not set

# CONFIG_E1000E_ENABLED is not set

# CONFIG_IP1000 is not set

# CONFIG_IGB is not set

# CONFIG_MYRI_SBUS is not set

# CONFIG_NS83820 is not set

# CONFIG_HAMACHI is not set
@@ -570,6 +593,7 @@ CONFIG_NETDEV_10000=y 
CONFIG_NIU=m

# CONFIG_MLX4_CORE is not set

# CONFIG_TEHUTI is not set

# CONFIG_BNX2X is not set

# CONFIG_TR is not set



#
@@ -602,7 +626,6 @@ CONFIG_PPPOE=m 
# CONFIG_SLIP is not set

CONFIG_SLHC=m

# CONFIG_NET_FC is not set

# CONFIG_SHAPER is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set
@@ -679,6 +702,7 @@ CONFIG_VT_CONSOLE=y 
CONFIG_HW_CONSOLE=y

# CONFIG_VT_HW_CONSOLE_BINDING is not set

# CONFIG_SERIAL_NONSTANDARD is not set

# CONFIG_NOZOMI is not set



#

# Serial drivers
@@ -747,13 +771,13 @@ CONFIG_I2C_ALGOBIT=y 
#

# Miscellaneous I2C Chip support

#

# CONFIG_SENSORS_DS1337 is not set

# CONFIG_SENSORS_DS1374 is not set

# CONFIG_DS1682 is not set

# CONFIG_SENSORS_EEPROM is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_TPS65010 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set
@@ -990,6 +1014,7 @@ CONFIG_SND_ALI5451=m 
# CONFIG_SND_BT87X is not set

# CONFIG_SND_CA0106 is not set

# CONFIG_SND_CMIPCI is not set

# CONFIG_SND_OXYGEN is not set

# CONFIG_SND_CS4281 is not set

# CONFIG_SND_CS46XX is not set

# CONFIG_SND_DARLA20 is not set
@@ -1014,6 +1039,7 @@ CONFIG_SND_ALI5451=m 
# CONFIG_SND_HDA_INTEL is not set

# CONFIG_SND_HDSP is not set

# CONFIG_SND_HDSPM is not set

# CONFIG_SND_HIFIER is not set

# CONFIG_SND_ICE1712 is not set

# CONFIG_SND_ICE1724 is not set

# CONFIG_SND_INTEL8X0 is not set
@@ -1031,6 +1057,7 @@ CONFIG_SND_ALI5451=m 
# CONFIG_SND_TRIDENT is not set

# CONFIG_SND_VIA82XX is not set

# CONFIG_SND_VIA82XX_MODEM is not set

# CONFIG_SND_VIRTUOSO is not set

# CONFIG_SND_VX222 is not set

# CONFIG_SND_YMFPCI is not set

# CONFIG_SND_AC97_POWER_SAVE is not set
@@ -1057,6 +1084,10 @@ CONFIG_SND_SUN_CS4231=m 
# SoC Audio support for SuperH

#



#

# ALSA SoC audio for Freescale SOCs

#



#

# Open Sound System

#
@@ -1080,6 +1111,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y 
CONFIG_USB_ARCH_HAS_EHCI=y

CONFIG_USB=y

# CONFIG_USB_DEBUG is not set

# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set



#

# Miscellaneous USB options
@@ -1093,7 +1125,6 @@ CONFIG_USB_DEVICEFS=y 
# USB Host Controller Drivers

#

CONFIG_USB_EHCI_HCD=m

# CONFIG_USB_EHCI_SPLIT_ISO is not set

# CONFIG_USB_EHCI_ROOT_HUB_TT is not set

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

# CONFIG_USB_ISP116X_HCD is not set
@@ -1143,10 +1174,6 @@ CONFIG_USB_STORAGE=m 
#

# USB port drivers

#



#

# USB Serial Converter support

#

# CONFIG_USB_SERIAL is not set



#
@@ -1172,14 +1199,6 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_TRANCEVIBRATOR is not set

# CONFIG_USB_IOWARRIOR is not set

# CONFIG_USB_TEST is not set



#

# USB DSL modem support

#



#

# USB Gadget Support

#

# CONFIG_USB_GADGET is not set

# CONFIG_MMC is not set

# CONFIG_NEW_LEDS is not set
@@ -1332,11 +1351,6 @@ CONFIG_NLS_DEFAULT="iso8859-1" 
# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set

# CONFIG_DLM is not set

CONFIG_INSTRUMENTATION=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=m

CONFIG_KPROBES=y

# CONFIG_MARKERS is not set



#

# Kernel hacking
@@ -1374,6 +1388,8 @@ CONFIG_DEBUG_BUGVERBOSE=y 
CONFIG_FORCED_INLINING=y

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_KPROBES_SANITY_TEST is not set

# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_LKDTM is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_SAMPLES is not set
@@ -1396,8 +1412,9 @@ CONFIG_ASYNC_MEMCPY=m 
CONFIG_ASYNC_XOR=m

CONFIG_CRYPTO=y

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_AEAD=m

CONFIG_CRYPTO_AEAD=y

CONFIG_CRYPTO_BLKCIPHER=y

# CONFIG_CRYPTO_SEQIV is not set

CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_HMAC=y
@@ -1416,6 +1433,9 @@ CONFIG_CRYPTO_CBC=y 
CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_XTS=m

# CONFIG_CRYPTO_CTR is not set

# CONFIG_CRYPTO_GCM is not set

# CONFIG_CRYPTO_CCM is not set

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_FCRYPT=m
@@ -1431,13 +1451,16 @@ CONFIG_CRYPTO_ARC4=m 
CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_SEED=m

# CONFIG_CRYPTO_SALSA20 is not set

CONFIG_CRYPTO_DEFLATE=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_CRC32C=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_AUTHENC=m

# CONFIG_CRYPTO_LZO is not set

CONFIG_CRYPTO_HW=y

# CONFIG_CRYPTO_DEV_HIFN_795X is not set



#

# Library routines

arch/sparc64/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ obj-y := process.o setup.o cpu.o idprom.o \ 
		   traps.o auxio.o una_asm.o sysfs.o iommu.o \

		   irq.o ptrace.o time.o sys_sparc.o signal.o \

		   unaligned.o central.o pci.o starfire.o semaphore.o \

		   power.o sbus.o iommu_common.o sparc64_ksyms.o chmc.o \

		   power.o sbus.o sparc64_ksyms.o chmc.o \

		   visemul.o prom.o of_device.o hvapi.o sstate.o mdesc.o



obj-$(CONFIG_STACKTRACE) += stacktrace.o

arch/sparc64/kernel/iommu.c

+26 −116
Original line number Diff line number Diff line
@@ -472,94 +472,15 @@ static void dma_4u_unmap_single(struct device *dev, dma_addr_t bus_addr, 
	spin_unlock_irqrestore(&iommu->lock, flags);

}



#define SG_ENT_PHYS_ADDRESS(SG)	(__pa(sg_virt((SG))))



static void fill_sg(iopte_t *iopte, struct scatterlist *sg,

		    int nused, int nelems,

		    unsigned long iopte_protection)

{

	struct scatterlist *dma_sg = sg;

	int i;



	for (i = 0; i < nused; i++) {

		unsigned long pteval = ~0UL;

		u32 dma_npages;



		dma_npages = ((dma_sg->dma_address & (IO_PAGE_SIZE - 1UL)) +

			      dma_sg->dma_length +

			      ((IO_PAGE_SIZE - 1UL))) >> IO_PAGE_SHIFT;

		do {

			unsigned long offset;

			signed int len;



			/* If we are here, we know we have at least one

			 * more page to map.  So walk forward until we

			 * hit a page crossing, and begin creating new

			 * mappings from that spot.

			 */

			for (;;) {

				unsigned long tmp;



				tmp = SG_ENT_PHYS_ADDRESS(sg);

				len = sg->length;

				if (((tmp ^ pteval) >> IO_PAGE_SHIFT) != 0UL) {

					pteval = tmp & IO_PAGE_MASK;

					offset = tmp & (IO_PAGE_SIZE - 1UL);

					break;

				}

				if (((tmp ^ (tmp + len - 1UL)) >> IO_PAGE_SHIFT) != 0UL) {

					pteval = (tmp + IO_PAGE_SIZE) & IO_PAGE_MASK;

					offset = 0UL;

					len -= (IO_PAGE_SIZE - (tmp & (IO_PAGE_SIZE - 1UL)));

					break;

				}

				sg = sg_next(sg);

				nelems--;

			}



			pteval = iopte_protection | (pteval & IOPTE_PAGE);

			while (len > 0) {

				*iopte++ = __iopte(pteval);

				pteval += IO_PAGE_SIZE;

				len -= (IO_PAGE_SIZE - offset);

				offset = 0;

				dma_npages--;

			}



			pteval = (pteval & IOPTE_PAGE) + len;

			sg = sg_next(sg);

			nelems--;



			/* Skip over any tail mappings we've fully mapped,

			 * adjusting pteval along the way.  Stop when we

			 * detect a page crossing event.

			 */

			while (nelems &&

			       (pteval << (64 - IO_PAGE_SHIFT)) != 0UL &&

			       (pteval == SG_ENT_PHYS_ADDRESS(sg)) &&

			       ((pteval ^

				 (SG_ENT_PHYS_ADDRESS(sg) + sg->length - 1UL)) >> IO_PAGE_SHIFT) == 0UL) {

				pteval += sg->length;

				sg = sg_next(sg);

				nelems--;

			}

			if ((pteval << (64 - IO_PAGE_SHIFT)) == 0UL)

				pteval = ~0UL;

		} while (dma_npages != 0);

		dma_sg = sg_next(dma_sg);

	}

}



static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,

			 int nelems, enum dma_data_direction direction)

{

	struct iommu *iommu;

	unsigned long flags, ctx, i, npages, iopte_protection;

	struct scatterlist *sg;

	struct strbuf *strbuf;

	unsigned long flags, ctx, npages, iopte_protection;

	struct iommu *iommu;

	iopte_t *base;

	u32 dma_base;

	struct scatterlist *sgtmp;

	int used;



	/* Fast path single entry scatterlists. */

	if (nelems == 1) {
@@ -578,11 +499,7 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist, 
	if (unlikely(direction == DMA_NONE))

		goto bad_no_ctx;



	/* Step 1: Prepare scatter list. */



	npages = prepare_sg(dev, sglist, nelems);



	/* Step 2: Allocate a cluster and context, if necessary. */

	npages = calc_npages(sglist, nelems);



	spin_lock_irqsave(&iommu->lock, flags);
@@ -599,18 +516,6 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist, 
	dma_base = iommu->page_table_map_base +

		((base - iommu->page_table) << IO_PAGE_SHIFT);



	/* Step 3: Normalize DMA addresses. */

	used = nelems;



	sgtmp = sglist;

	while (used && sgtmp->dma_length) {

		sgtmp->dma_address += dma_base;

		sgtmp = sg_next(sgtmp);

		used--;

	}

	used = nelems - used;



	/* Step 4: Create the mappings. */

	if (strbuf->strbuf_enabled)

		iopte_protection = IOPTE_STREAMING(ctx);

	else
@@ -618,13 +523,27 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist, 
	if (direction != DMA_TO_DEVICE)

		iopte_protection |= IOPTE_WRITE;



	fill_sg(base, sglist, used, nelems, iopte_protection);

	for_each_sg(sglist, sg, nelems, i) {

		unsigned long paddr = SG_ENT_PHYS_ADDRESS(sg);

		unsigned long slen = sg->length;

		unsigned long this_npages;



		this_npages = iommu_num_pages(paddr, slen);



#ifdef VERIFY_SG

	verify_sglist(sglist, nelems, base, npages);

#endif

		sg->dma_address = dma_base | (paddr & ~IO_PAGE_MASK);

		sg->dma_length = slen;



	return used;

		paddr &= IO_PAGE_MASK;

		while (this_npages--) {

			iopte_val(*base) = iopte_protection | paddr;



			base++;

			paddr += IO_PAGE_SIZE;

			dma_base += IO_PAGE_SIZE;

		}

	}



	return nelems;



bad:

	iommu_free_ctx(iommu, ctx);
@@ -637,11 +556,10 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist, 
static void dma_4u_unmap_sg(struct device *dev, struct scatterlist *sglist,

			    int nelems, enum dma_data_direction direction)

{

	struct iommu *iommu;

	unsigned long flags, ctx, i, npages;

	struct strbuf *strbuf;

	struct iommu *iommu;

	iopte_t *base;

	unsigned long flags, ctx, i, npages;

	struct scatterlist *sg, *sgprv;

	u32 bus_addr;



	if (unlikely(direction == DMA_NONE)) {
@@ -654,15 +572,7 @@ static void dma_4u_unmap_sg(struct device *dev, struct scatterlist *sglist, 


	bus_addr = sglist->dma_address & IO_PAGE_MASK;



	sgprv = NULL;

	for_each_sg(sglist, sg, nelems, i) {

		if (sg->dma_length == 0)

			break;

		sgprv = sg;

	}



	npages = (IO_PAGE_ALIGN(sgprv->dma_address + sgprv->dma_length) -

		  bus_addr) >> IO_PAGE_SHIFT;

	npages = calc_npages(sglist, nelems);



	base = iommu->page_table +

		((bus_addr - iommu->page_table_map_base) >> IO_PAGE_SHIFT);

arch/sparc64/kernel/iommu_common.c

deleted100644 → 0
+0 −248
Original line number Diff line number Diff line 
/* $Id: iommu_common.c,v 1.9 2001/12/17 07:05:09 davem Exp $

 * iommu_common.c: UltraSparc SBUS/PCI common iommu code.

 *

 * Copyright (C) 1999 David S. Miller (davem@redhat.com)

 */



#include <linux/dma-mapping.h>

#include "iommu_common.h"



/* You are _strongly_ advised to enable the following debugging code

 * any time you make changes to the sg code below, run it for a while

 * with filesystems mounted read-only before buying the farm... -DaveM

 */



#ifdef VERIFY_SG

static int verify_lengths(struct scatterlist *sglist, int nents, int npages)

{

	int sg_len, dma_len;

	int i, pgcount;

	struct scatterlist *sg;



	sg_len = 0;

	for_each_sg(sglist, sg, nents, i)

		sg_len += sg->length;



	dma_len = 0;

	for_each_sg(sglist, sg, nents, i) {

		if (!sg->dma_length)

			break;

		dma_len += sg->dma_length;

	}



	if (sg_len != dma_len) {

		printk("verify_lengths: Error, different, sg[%d] dma[%d]\n",

		       sg_len, dma_len);

		return -1;

	}



	pgcount = 0;

	for_each_sg(sglist, sg, nents, i) {

		unsigned long start, end;



		if (!sg->dma_length)

			break;



		start = sg->dma_address;

		start = start & IO_PAGE_MASK;



		end = sg->dma_address + sg->dma_length;

		end = (end + (IO_PAGE_SIZE - 1)) & IO_PAGE_MASK;



		pgcount += ((end - start) >> IO_PAGE_SHIFT);

	}



	if (pgcount != npages) {

		printk("verify_lengths: Error, page count wrong, "

		       "npages[%d] pgcount[%d]\n",

		       npages, pgcount);

		return -1;

	}



	/* This test passes... */

	return 0;

}



static int verify_one_map(struct scatterlist *dma_sg, struct scatterlist **__sg, int nents, iopte_t **__iopte)

{

	struct scatterlist *sg = *__sg;

	iopte_t *iopte = *__iopte;

	u32 dlen = dma_sg->dma_length;

	u32 daddr;

	unsigned int sglen;

	unsigned long sgaddr;



	daddr = dma_sg->dma_address;

	sglen = sg->length;

	sgaddr = (unsigned long) sg_virt(sg);

	while (dlen > 0) {

		unsigned long paddr;



		/* SG and DMA_SG must begin at the same sub-page boundary. */

		if ((sgaddr & ~IO_PAGE_MASK) != (daddr & ~IO_PAGE_MASK)) {

			printk("verify_one_map: Wrong start offset "

			       "sg[%08lx] dma[%08x]\n",

			       sgaddr, daddr);

			nents = -1;

			goto out;

		}



		/* Verify the IOPTE points to the right page. */

		paddr = iopte_val(*iopte) & IOPTE_PAGE;

		if ((paddr + PAGE_OFFSET) != (sgaddr & IO_PAGE_MASK)) {

			printk("verify_one_map: IOPTE[%08lx] maps the "

			       "wrong page, should be [%08lx]\n",

			       iopte_val(*iopte), (sgaddr & IO_PAGE_MASK) - PAGE_OFFSET);

			nents = -1;

			goto out;

		}



		/* If this SG crosses a page, adjust to that next page

		 * boundary and loop.

		 */

		if ((sgaddr & IO_PAGE_MASK) ^ ((sgaddr + sglen - 1) & IO_PAGE_MASK)) {

			unsigned long next_page, diff;



			next_page = (sgaddr + IO_PAGE_SIZE) & IO_PAGE_MASK;

			diff = next_page - sgaddr;

			sgaddr += diff;

			daddr += diff;

			sglen -= diff;

			dlen -= diff;

			if (dlen > 0)

				iopte++;

			continue;

		}



		/* SG wholly consumed within this page. */

		daddr += sglen;

		dlen -= sglen;



		if (dlen > 0 && ((daddr & ~IO_PAGE_MASK) == 0))

			iopte++;



		sg = sg_next(sg);

		if (--nents <= 0)

			break;

		sgaddr = (unsigned long) sg_virt(sg);

		sglen = sg->length;

	}

	if (dlen < 0) {

		/* Transfer overrun, big problems. */

		printk("verify_one_map: Transfer overrun by %d bytes.\n",

		       -dlen);

		nents = -1;

	} else {

		/* Advance to next dma_sg implies that the next iopte will

		 * begin it.

		 */

		iopte++;

	}



out:

	*__sg = sg;

	*__iopte = iopte;

	return nents;

}



static int verify_maps(struct scatterlist *sg, int nents, iopte_t *iopte)

{

	struct scatterlist *dma_sg = sg;

	struct scatterlist *orig_dma_sg = dma_sg;

	int orig_nents = nents;



	for (;;) {

		nents = verify_one_map(dma_sg, &sg, nents, &iopte);

		if (nents <= 0)

			break;

		dma_sg = sg_next(dma_sg);

		if (dma_sg->dma_length == 0)

			break;

	}



	if (nents > 0) {

		printk("verify_maps: dma maps consumed by some sgs remain (%d)\n",

		       nents);

		return -1;

	}



	if (nents < 0) {

		printk("verify_maps: Error, messed up mappings, "

		       "at sg %d dma_sg %d\n",

		       (int) (orig_nents + nents), (int) (dma_sg - orig_dma_sg));

		return -1;

	}



	/* This test passes... */

	return 0;

}



void verify_sglist(struct scatterlist *sglist, int nents, iopte_t *iopte, int npages)

{

	struct scatterlist *sg;



	if (verify_lengths(sglist, nents, npages) < 0 ||

	    verify_maps(sglist, nents, iopte) < 0) {

		int i;



		printk("verify_sglist: Crap, messed up mappings, dumping, iodma at ");

		printk("%016lx.\n", sglist->dma_address & IO_PAGE_MASK);



		for_each_sg(sglist, sg, nents, i) {

			printk("sg(%d): page_addr(%p) off(%x) length(%x) "

			       "dma_address[%016x] dma_length[%016x]\n",

			       i,

			       page_address(sg_page(sg)), sg->offset,

			       sg->length,

			       sg->dma_address, sg->dma_length);

		}

	}



	/* Seems to be ok */

}

#endif



unsigned long prepare_sg(struct device *dev, struct scatterlist *sg, int nents)

{

	struct scatterlist *dma_sg = sg;

	unsigned long prev;

	u32 dent_addr, dent_len;

	unsigned int max_seg_size;



	prev  = (unsigned long) sg_virt(sg);

	prev += (unsigned long) (dent_len = sg->length);

	dent_addr = (u32) ((unsigned long)(sg_virt(sg)) & (IO_PAGE_SIZE - 1UL));

	max_seg_size = dma_get_max_seg_size(dev);

	while (--nents) {

		unsigned long addr;



		sg = sg_next(sg);

		addr = (unsigned long) sg_virt(sg);

		if (! VCONTIG(prev, addr) ||

			dent_len + sg->length > max_seg_size) {

			dma_sg->dma_address = dent_addr;

			dma_sg->dma_length = dent_len;

			dma_sg = sg_next(dma_sg);



			dent_addr = ((dent_addr +

				      dent_len +

				      (IO_PAGE_SIZE - 1UL)) >> IO_PAGE_SHIFT);

			dent_addr <<= IO_PAGE_SHIFT;

			dent_addr += addr & (IO_PAGE_SIZE - 1UL);

			dent_len = 0;

		}

		dent_len += sg->length;

		prev = addr + sg->length;

	}

	dma_sg->dma_address = dent_addr;

	dma_sg->dma_length = dent_len;



	if (dma_sg != sg) {

		dma_sg = sg_next(dma_sg);

		dma_sg->dma_length = 0;

	}



	return ((unsigned long) dent_addr +

		(unsigned long) dent_len +

		(IO_PAGE_SIZE - 1UL)) >> IO_PAGE_SHIFT;

}