On Thu, 23 Aug 2007 17:15:27 -0700 Shannon Nelson wrote: > Add code to connect to the DCA driver and provide cpu tags for use by > drivers that would like to use Direct Cache Access hints. > > [Adrian Bunk] Several Kconfig cleanup items > [Andrew Morten, Chris Leech] fix for using cpu_physical_id() even when > built for uni-processor > > Signed-off-by: Shannon Nelson <[EMAIL PROTECTED]> > Acked-by: David S. Miller <[EMAIL PROTECTED]> > --- > > drivers/dca/Kconfig | 7 - > drivers/dma/Kconfig | 60 ++++++----- > drivers/dma/Makefile | 2 > drivers/dma/ioat.c | 12 ++ > drivers/dma/ioat_dca.c | 267 > ++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/dma/ioatdma.h | 2 > 6 files changed, 318 insertions(+), 32 deletions(-) > > diff --git a/drivers/dma/ioat_dca.c b/drivers/dma/ioat_dca.c > new file mode 100644 > index 0000000..03c993a > --- /dev/null > +++ b/drivers/dma/ioat_dca.c > @@ -0,0 +1,267 @@
> + > +/* either a kernel change is needed, or we need something like this in > kernel */ > +#ifndef CONFIG_SMP > +#include <asm/smp.h> > +#undef cpu_physical_id > +#define cpu_physical_id(cpu) (cpuid_ebx(1) >> 24) > +#endif > + > +#include "ioatdma.h" > +#include "ioatdma_registers.h" > + > +/* THIS STUFF NEEDS TO LIVE SOMEWHERE ELSE */ > +#define X86_FEATURE_DCA (4*32+18) /* Direct Cache Access */ > +/* / THIS STUFF NEEDS TO LIVE SOMEWHERE ELSE */ Yes, feature bits need to be integrated with the other CPU-specific feature bits. > +/* pack PCI B/D/F into a u16 */ > +static inline u16 dcaid_from_pcidev(struct pci_dev *pci) > +{ > + return (pci->bus->number << 8) | pci->devfn; > +} Could any other PCI users use this in include/linux/pci.h ? > diff --git a/drivers/dma/ioatdma.h b/drivers/dma/ioatdma.h > index 5931e56..d59c90b 100644 > --- a/drivers/dma/ioatdma.h > +++ b/drivers/dma/ioatdma.h > @@ -132,9 +132,11 @@ struct ioat_desc_sw { > #if defined(CONFIG_INTEL_IOATDMA) || defined(CONFIG_INTEL_IOATDMA_MODULE) > struct ioatdma_device *ioat_dma_probe(struct pci_dev *, void __iomem *); > void ioat_dma_remove(struct ioatdma_device *device); > +struct dca_provider *ioat_dca_init(struct pci_dev *, void __iomem *); Parameter (variable) names in prototypes, please. > #else > #define ioat_dma_probe(pdev, io) NULL > #define ioat_dma_remove(dev) do { } while (0) > +#define ioat_dca_init(pdev, io) NULL > #endif > > #endif /* IOATDMA_H */ --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/