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

Commit 4c0eec7a authored by Tejun Heo's avatar Tejun Heo Committed by Jesse Barnes
Browse files

sparc64/PCI: drop PCI_CACHE_LINE_BYTES 



sparc64 is now the only user of PCI_CACHE_LINE_BYTES.  Drop it and set
pci_dfl_cache_line_size from pcibios_init() instead and drop
PCI_CACHE_LINE_BYTES handling from generic pci code.

Orignally-From: David Miller <davem@davemloft.net>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent ac1aa47b

arch/sparc/include/asm/pci_64.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -16,8 +16,6 @@ 




#define PCI_IRQ_NONE		0xffffffff

#define PCI_IRQ_NONE		0xffffffff





#define PCI_CACHE_LINE_BYTES	64



static inline void pcibios_set_master(struct pci_dev *dev)

static inline void pcibios_set_master(struct pci_dev *dev)

{

{

	/* No special bus mastering setup handling */

	/* No special bus mastering setup handling */

arch/sparc/kernel/pci.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -1081,3 +1081,10 @@ void pci_resource_to_user(const struct pci_dev *pdev, int bar, 
	*start = rp->start - offset;

	*start = rp->start - offset;

	*end = rp->end - offset;

	*end = rp->end - offset;

}

}



static int __init pcibios_init(void)

{

	pci_dfl_cache_line_size = 64 >> 2;

	return 0;

}

subsys_initcall(pcibios_init);

drivers/pci/pci.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -47,17 +47,13 @@ unsigned long pci_cardbus_mem_size = DEFAULT_CARDBUS_MEM_SIZE; 
unsigned long pci_hotplug_io_size  = DEFAULT_HOTPLUG_IO_SIZE;

unsigned long pci_hotplug_io_size  = DEFAULT_HOTPLUG_IO_SIZE;

unsigned long pci_hotplug_mem_size = DEFAULT_HOTPLUG_MEM_SIZE;

unsigned long pci_hotplug_mem_size = DEFAULT_HOTPLUG_MEM_SIZE;





#ifndef PCI_CACHE_LINE_BYTES

#define PCI_CACHE_LINE_BYTES L1_CACHE_BYTES

#endif



/*

/*

 * The default CLS is used if arch didn't set CLS explicitly and not

 * The default CLS is used if arch didn't set CLS explicitly and not

 * all pci devices agree on the same value.  Arch can override either

 * all pci devices agree on the same value.  Arch can override either

 * the dfl or actual value as it sees fit.  Don't forget this is

 * the dfl or actual value as it sees fit.  Don't forget this is

 * measured in 32-bit words, not bytes.

 * measured in 32-bit words, not bytes.

 */

 */

u8 pci_dfl_cache_line_size __initdata = PCI_CACHE_LINE_BYTES >> 2;

u8 pci_dfl_cache_line_size __initdata = L1_CACHE_BYTES >> 2;

u8 pci_cache_line_size;

u8 pci_cache_line_size;





/**

/**