Commit e955d825 authored by Mark Maule's avatar Mark Maule Committed by Tony Luck
Browse files

[IA64-SGI] sn2-pci-dma-abstraction.patch 



Provide an abstraction of the altix pci dma runtime layer so that multiple
pci-based bridges can be supported.

Signed-off-by: default avatarMark Maule <maule@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 25ee7e38

arch/ia64/sn/include/pci/pcibr_provider.h

+4 −2
Original line number Diff line number Diff line
@@ -123,9 +123,11 @@ pcibr_lock(struct pcibus_info *pcibus_info) 
}

#define pcibr_unlock(pcibus_info, flag)  spin_unlock_irqrestore(&pcibus_info->pbi_lock, flag)



extern int  pcibr_init_provider(void);

extern void *pcibr_bus_fixup(struct pcibus_bussoft *);

extern uint64_t pcibr_dma_map(struct pcidev_info *, unsigned long, size_t, unsigned int);

extern void pcibr_dma_unmap(struct pcidev_info *, dma_addr_t, int);

extern dma_addr_t pcibr_dma_map(struct pci_dev *, unsigned long, size_t);

extern dma_addr_t pcibr_dma_map_consistent(struct pci_dev *, unsigned long, size_t);

extern void pcibr_dma_unmap(struct pci_dev *, dma_addr_t, int);



/*

 * prototypes for the bridge asic register access routines in pcibr_reg.c

arch/ia64/sn/include/pci/pcibus_provider_defs.h

+10 −2
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#define PCIIO_ASIC_TYPE_PIC	2

#define PCIIO_ASIC_TYPE_TIOCP	3



#define PCIIO_ASIC_MAX_TYPES	4



/*

 * Common pciio bus provider data.  There should be one of these as the

 * first field in any pciio based provider soft structure (e.g. pcibr_soft
@@ -35,9 +37,15 @@ struct pcibus_bussoft { 
};



/*

 * DMA mapping flags

 * SN pci bus indirection

 */



#define SN_PCIDMA_CONSISTENT    0x0001

struct sn_pcibus_provider {

	dma_addr_t	(*dma_map)(struct pci_dev *, unsigned long, size_t);

	dma_addr_t	(*dma_map_consistent)(struct pci_dev *, unsigned long, size_t);

	void		(*dma_unmap)(struct pci_dev *, dma_addr_t, int);

	void *		(*bus_fixup)(struct pcibus_bussoft *);

};



extern struct sn_pcibus_provider *sn_pci_provider[];

#endif				/* _ASM_IA64_SN_PCI_PCIBUS_PROVIDER_H */

arch/ia64/sn/include/pci/pcidev.h

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ extern struct sn_irq_info **sn_irq; 
#define SN_PCIDEV_BUSSOFT(pci_dev) \

	(SN_PCIDEV_INFO(pci_dev)->pdi_host_pcidev_info->pdi_pcibus_info)



#define SN_PCIDEV_BUSPROVIDER(pci_dev) \

	(SN_PCIDEV_INFO(pci_dev)->pdi_provider)



#define PCIIO_BUS_NONE	255      /* bus 255 reserved */

#define PCIIO_SLOT_NONE 255

#define PCIIO_FUNC_NONE 255
@@ -46,6 +49,7 @@ struct pcidev_info { 
	struct pci_dev		*pdi_linux_pcidev;	/* Kernel pci_dev */



	struct sn_irq_info	*pdi_sn_irq_info;

	struct sn_pcibus_provider *pdi_provider;	/* sn pci ops */

};



extern void sn_irq_fixup(struct pci_dev *pci_dev,

arch/ia64/sn/kernel/io_init.c

+64 −8
Original line number Diff line number Diff line
@@ -34,6 +34,37 @@ struct brick { 


int sn_ioif_inited = 0;		/* SN I/O infrastructure initialized? */



struct sn_pcibus_provider *sn_pci_provider[PCIIO_ASIC_MAX_TYPES];	/* indexed by asic type */



/*

 * Hooks and struct for unsupported pci providers

 */



static dma_addr_t

sn_default_pci_map(struct pci_dev *pdev, unsigned long paddr, size_t size)

{

	return 0;

}



static void

sn_default_pci_unmap(struct pci_dev *pdev, dma_addr_t addr, int direction)

{

	return;

}



static void *

sn_default_pci_bus_fixup(struct pcibus_bussoft *soft)

{

	return NULL;

}



static struct sn_pcibus_provider sn_pci_default_provider = {

	.dma_map = sn_default_pci_map,

	.dma_map_consistent = sn_default_pci_map,

	.dma_unmap = sn_default_pci_unmap,

	.bus_fixup = sn_default_pci_bus_fixup,

};



/*

 * Retrieve the DMA Flush List given nasid.  This list is needed 

 * to implement the WAR - Flush DMA data on PIO Reads.
@@ -201,6 +232,7 @@ static void sn_pci_fixup_slot(struct pci_dev *dev) 
	struct sn_irq_info *sn_irq_info;

	struct pci_dev *host_pci_dev;

	int status = 0;

	struct pcibus_bussoft *bs;



	dev->sysdata = kmalloc(sizeof(struct pcidev_info), GFP_KERNEL);

	if (SN_PCIDEV_INFO(dev) <= 0)
@@ -241,6 +273,7 @@ static void sn_pci_fixup_slot(struct pci_dev *dev) 
	}



	/* set up host bus linkages */

	bs = SN_PCIBUS_BUSSOFT(dev->bus);

	host_pci_dev =

	    pci_find_slot(SN_PCIDEV_INFO(dev)->pdi_slot_host_handle >> 32,

			  SN_PCIDEV_INFO(dev)->
@@ -248,10 +281,16 @@ static void sn_pci_fixup_slot(struct pci_dev *dev) 
	SN_PCIDEV_INFO(dev)->pdi_host_pcidev_info =

	    SN_PCIDEV_INFO(host_pci_dev);

	SN_PCIDEV_INFO(dev)->pdi_linux_pcidev = dev;

	SN_PCIDEV_INFO(dev)->pdi_pcibus_info = SN_PCIBUS_BUSSOFT(dev->bus);

	SN_PCIDEV_INFO(dev)->pdi_pcibus_info = bs;



	if (bs && bs->bs_asic_type < PCIIO_ASIC_MAX_TYPES) {

		SN_PCIDEV_BUSPROVIDER(dev) = sn_pci_provider[bs->bs_asic_type];

	} else {

		SN_PCIDEV_BUSPROVIDER(dev) = &sn_pci_default_provider;

	}



	/* Only set up IRQ stuff if this device has a host bus context */

	if (SN_PCIDEV_BUSSOFT(dev) && sn_irq_info->irq_irq) {

	if (bs && sn_irq_info->irq_irq) {

		SN_PCIDEV_INFO(dev)->pdi_sn_irq_info = sn_irq_info;

		dev->irq = SN_PCIDEV_INFO(dev)->pdi_sn_irq_info->irq_irq;

		sn_irq_fixup(dev, sn_irq_info);
@@ -271,6 +310,7 @@ static void sn_pci_controller_fixup(int segment, int busnum) 
	struct pcibus_bussoft *prom_bussoft_ptr;

	struct hubdev_info *hubdev_info;

	void *provider_soft;

	struct sn_pcibus_provider *provider;



	status =

	    sal_get_pcibus_info((u64) segment, (u64) busnum,
@@ -291,16 +331,22 @@ static void sn_pci_controller_fixup(int segment, int busnum) 
	/*

	 * Per-provider fixup.  Copies the contents from prom to local

	 * area and links SN_PCIBUS_BUSSOFT().

	 *

	 * Note:  Provider is responsible for ensuring that prom_bussoft_ptr

	 * represents an asic-type that it can handle.

	 */



	if (prom_bussoft_ptr->bs_asic_type == PCIIO_ASIC_TYPE_PPB) {

		return;		/* no further fixup necessary */

	if (prom_bussoft_ptr->bs_asic_type >= PCIIO_ASIC_MAX_TYPES) {

		return;		/* unsupported asic type */

	}



	provider = sn_pci_provider[prom_bussoft_ptr->bs_asic_type];

	if (provider == NULL) {

		return;		/* no provider registerd for this asic */

	}



	provider_soft = NULL;

	if (provider->bus_fixup) {

		provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr);

	}



	provider_soft = pcibr_bus_fixup(prom_bussoft_ptr);

	if (provider_soft == NULL) {

		return;		/* fixup failed or not applicable */

	}
@@ -338,6 +384,16 @@ static int __init sn_pci_init(void) 
	if (!ia64_platform_is("sn2") || IS_RUNNING_ON_SIMULATOR())

		return 0;



	/*

	 * prime sn_pci_provider[].  Individial provider init routines will

	 * override their respective default entries.

	 */



	for (i = 0; i < PCIIO_ASIC_MAX_TYPES; i++)

		sn_pci_provider[i] = &sn_pci_default_provider;



	pcibr_init_provider();



	/*

	 * This is needed to avoid bounce limit checks in the blk layer

	 */

arch/ia64/sn/pci/pci_dma.c

+20 −15
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <asm/sn/sn_sal.h>

#include "pci/pcibus_provider_defs.h"

#include "pci/pcidev.h"

#include "pci/pcibr_provider.h"



#define SG_ENT_VIRT_ADDRESS(sg)	(page_address((sg)->page) + (sg)->offset)

#define SG_ENT_PHYS_ADDRESS(SG)	virt_to_phys(SG_ENT_VIRT_ADDRESS(SG))
@@ -79,7 +78,8 @@ void *sn_dma_alloc_coherent(struct device *dev, size_t size, 
{

	void *cpuaddr;

	unsigned long phys_addr;

	struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(to_pci_dev(dev));

	struct pci_dev *pdev = to_pci_dev(dev);

	struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);



	BUG_ON(dev->bus != &pci_bus_type);
@@ -102,8 +102,7 @@ void *sn_dma_alloc_coherent(struct device *dev, size_t size, 
	 * resources.

	 */



	*dma_handle = pcibr_dma_map(pcidev_info, phys_addr, size,

				    SN_PCIDMA_CONSISTENT);

	*dma_handle = provider->dma_map_consistent(pdev, phys_addr, size);

	if (!*dma_handle) {

		printk(KERN_ERR "%s: out of ATEs\n", __FUNCTION__);

		free_pages((unsigned long)cpuaddr, get_order(size));
@@ -127,11 +126,12 @@ EXPORT_SYMBOL(sn_dma_alloc_coherent); 
void sn_dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,

			  dma_addr_t dma_handle)

{

	struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(to_pci_dev(dev));

	struct pci_dev *pdev = to_pci_dev(dev);

	struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);



	BUG_ON(dev->bus != &pci_bus_type);



	pcibr_dma_unmap(pcidev_info, dma_handle, 0);

	provider->dma_unmap(pdev, dma_handle, 0);

	free_pages((unsigned long)cpu_addr, get_order(size));

}

EXPORT_SYMBOL(sn_dma_free_coherent);
@@ -159,12 +159,13 @@ dma_addr_t sn_dma_map_single(struct device *dev, void *cpu_addr, size_t size, 
{

	dma_addr_t dma_addr;

	unsigned long phys_addr;

	struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(to_pci_dev(dev));

	struct pci_dev *pdev = to_pci_dev(dev);

	struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);



	BUG_ON(dev->bus != &pci_bus_type);



	phys_addr = __pa(cpu_addr);

	dma_addr = pcibr_dma_map(pcidev_info, phys_addr, size, 0);

	dma_addr = provider->dma_map(pdev, phys_addr, size);

	if (!dma_addr) {

		printk(KERN_ERR "%s: out of ATEs\n", __FUNCTION__);

		return 0;
@@ -187,10 +188,12 @@ EXPORT_SYMBOL(sn_dma_map_single); 
void sn_dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,

			 int direction)

{

	struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(to_pci_dev(dev));

	struct pci_dev *pdev = to_pci_dev(dev);

	struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);



	BUG_ON(dev->bus != &pci_bus_type);

	pcibr_dma_unmap(pcidev_info, dma_addr, direction);



	provider->dma_unmap(pdev, dma_addr, direction);

}

EXPORT_SYMBOL(sn_dma_unmap_single);
@@ -207,12 +210,13 @@ void sn_dma_unmap_sg(struct device *dev, struct scatterlist *sg, 
		     int nhwentries, int direction)

{

	int i;

	struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(to_pci_dev(dev));

	struct pci_dev *pdev = to_pci_dev(dev);

	struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);



	BUG_ON(dev->bus != &pci_bus_type);



	for (i = 0; i < nhwentries; i++, sg++) {

		pcibr_dma_unmap(pcidev_info, sg->dma_address, direction);

		provider->dma_unmap(pdev, sg->dma_address, direction);

		sg->dma_address = (dma_addr_t) NULL;

		sg->dma_length = 0;

	}
@@ -233,7 +237,8 @@ int sn_dma_map_sg(struct device *dev, struct scatterlist *sg, int nhwentries, 
{

	unsigned long phys_addr;

	struct scatterlist *saved_sg = sg;

	struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(to_pci_dev(dev));

	struct pci_dev *pdev = to_pci_dev(dev);

	struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);

	int i;



	BUG_ON(dev->bus != &pci_bus_type);
@@ -243,8 +248,8 @@ int sn_dma_map_sg(struct device *dev, struct scatterlist *sg, int nhwentries, 
	 */

	for (i = 0; i < nhwentries; i++, sg++) {

		phys_addr = SG_ENT_PHYS_ADDRESS(sg);

		sg->dma_address = pcibr_dma_map(pcidev_info, phys_addr,

						sg->length, 0);

		sg->dma_address = provider->dma_map(pdev,

						    phys_addr, sg->length);



		if (!sg->dma_address) {

			printk(KERN_ERR "%s: out of ATEs\n", __FUNCTION__);