leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI: Replace HAVE_ARCH_PCI_MWI with PCI_DISABLE_MWI

Browse Source 
pSeries is the only architecture left using HAVE_ARCH_PCI_MWI and it's
really inappropriate for its needs.  It really wants to disable MWI
altogether.  So here are a pair of stub implementations for pci_set_mwi
and pci_clear_mwi.

Also rename pci_generic_prep_mwi to pci_set_cacheline_size since that
better reflects what it does.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Matthew Wilcox 2006-10-10 08:01:21 -06:00 committed by Greg Kroah-Hartman
parent ebf5a24829
commit edb2d97eb5
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/pci/pci.c
View File

@ -875,7 +875,17 @@ pci_set_master(struct pci_dev *dev)
pcibios_set_master(dev); pcibios_set_master(dev);
} }
#ifndef HAVE_ARCH_PCI_MWI #ifdef PCI_DISABLE_MWI
int pci_set_mwi(struct pci_dev *dev)
{
return 0;
}
void pci_clear_mwi(struct pci_dev *dev)
{
}
#else
#ifndef PCI_CACHE_LINE_BYTES #ifndef PCI_CACHE_LINE_BYTES
#define PCI_CACHE_LINE_BYTES L1_CACHE_BYTES #define PCI_CACHE_LINE_BYTES L1_CACHE_BYTES
@ -886,17 +896,17 @@ pci_set_master(struct pci_dev *dev)
u8 pci_cache_line_size = PCI_CACHE_LINE_BYTES / 4; u8 pci_cache_line_size = PCI_CACHE_LINE_BYTES / 4;
/** /**
* pci_generic_prep_mwi - helper function for pci_set_mwi * pci_set_cacheline_size - ensure the CACHE_LINE_SIZE register is programmed
* @dev: the PCI device for which MWI is enabled * @dev: the PCI device for which MWI is to be enabled
* *
* Helper function for generic implementation of pcibios_prep_mwi * Helper function for pci_set_mwi.
* function. Originally copied from drivers/net/acenic.c. * Originally copied from drivers/net/acenic.c.
* Copyright 1998-2001 by Jes Sorensen, <jes@trained-monkey.org>. * Copyright 1998-2001 by Jes Sorensen, <jes@trained-monkey.org>.
* *
* RETURNS: An appropriate -ERRNO error value on error, or zero for success. * RETURNS: An appropriate -ERRNO error value on error, or zero for success.
*/ */
static int static int
pci_generic_prep_mwi(struct pci_dev *dev) pci_set_cacheline_size(struct pci_dev *dev)
{ {
u8 cacheline_size; u8 cacheline_size;
@ -922,7 +932,6 @@ pci_generic_prep_mwi(struct pci_dev *dev)
return -EINVAL; return -EINVAL;
} }
#endif /* !HAVE_ARCH_PCI_MWI */
/** /**
* pci_set_mwi - enables memory-write-invalidate PCI transaction * pci_set_mwi - enables memory-write-invalidate PCI transaction
@ -940,12 +949,7 @@ pci_set_mwi(struct pci_dev *dev)
int rc; int rc;
u16 cmd; u16 cmd;
#ifdef HAVE_ARCH_PCI_MWI rc = pci_set_cacheline_size(dev);
rc = pcibios_prep_mwi(dev);
#else
rc = pci_generic_prep_mwi(dev);
#endif
if (rc) if (rc)
return rc; return rc;
@ -976,6 +980,7 @@ pci_clear_mwi(struct pci_dev *dev)
pci_write_config_word(dev, PCI_COMMAND, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd);
} }
} }
#endif /* ! PCI_DISABLE_MWI */
/** /**
* pci_intx - enables/disables PCI INTx for device dev * pci_intx - enables/disables PCI INTx for device dev

20
include/asm-powerpc/pci.h
View File

@ -62,19 +62,13 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
} }
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
#define HAVE_ARCH_PCI_MWI 1
static inline int pcibios_prep_mwi(struct pci_dev *dev) /*
{ * We want to avoid touching the cacheline size or MWI bit.
/* * pSeries firmware sets the cacheline size (which is not the cpu cacheline
* We would like to avoid touching the cacheline size or MWI bit * size in all cases) and hardware treats MWI the same as memory write.
* but we cant do that with the current pcibios_prep_mwi */
* interface. pSeries firmware sets the cacheline size (which is not #define PCI_DISABLE_MWI
* the cpu cacheline size in all cases) and hardware treats MWI
* the same as memory write. So we dont touch the cacheline size
* here and allow the generic code to set the MWI bit.
*/
return 0;
}
extern struct dma_mapping_ops pci_dma_ops; extern struct dma_mapping_ops pci_dma_ops;