lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: Fix domain numbers in /proc on 64-bit

Browse Source 
The code to properly expose domain numbers in /proc is somewhat
bogus on ppc64 as it depends on the "buid" field being non-0,
but that field is really pseries specific.

This removes that code and makes ppc64 use the same code as 32-bit
which effectively decides whether to expose domains based on
ppc_pci_flags set by the platform, and sets the default for 64-bit
to enable domains and enable compatibility for domain 0 (which
strips the domain number for domain 0 to help with X servers).

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Benjamin Herrenschmidt
2008-10-02 14:12:51 +00:00
committed by Paul Mackerras
parent 454666eb78
commit 1fd0f52583
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/kernel/pci-common.c
View File

@@ -53,8 +53,9 @@ static int global_phb_number; /* Global phb counter */
/* ISA Memory physical address */ /* ISA Memory physical address */
resource_size_t isa_mem_base; resource_size_t isa_mem_base;
/* Default PCI flags is 0 */ /* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */
unsigned int ppc_pci_flags; unsigned int ppc_pci_flags = 0;
static struct dma_mapping_ops *pci_dma_ops; static struct dma_mapping_ops *pci_dma_ops;
@@ -853,15 +854,12 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
int pci_proc_domain(struct pci_bus *bus) int pci_proc_domain(struct pci_bus *bus)
{ {
struct pci_controller *hose = pci_bus_to_host(bus); struct pci_controller *hose = pci_bus_to_host(bus);
#ifdef CONFIG_PPC64
return hose->buid != 0;
#else
if (!(ppc_pci_flags & PPC_PCI_ENABLE_PROC_DOMAINS)) if (!(ppc_pci_flags & PPC_PCI_ENABLE_PROC_DOMAINS))
return 0; return 0;
if (ppc_pci_flags & PPC_PCI_COMPAT_DOMAIN_0) if (ppc_pci_flags & PPC_PCI_COMPAT_DOMAIN_0)
return hose->global_number != 0; return hose->global_number != 0;
return 1; return 1;
#endif
} }
void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,

5
arch/powerpc/kernel/pci_64.c
View File

@@ -388,6 +388,11 @@ static int __init pcibios_init(void)
if (pci_probe_only) if (pci_probe_only)
ppc_pci_flags |= PPC_PCI_PROBE_ONLY; ppc_pci_flags |= PPC_PCI_PROBE_ONLY;
/* On ppc64, we always enable PCI domains and we keep domain 0
* backward compatible in /proc for video cards
*/
ppc_pci_flags |= PPC_PCI_ENABLE_PROC_DOMAINS | PPC_PCI_COMPAT_DOMAIN_0;
/* Scan all of the recorded PCI controllers. */ /* Scan all of the recorded PCI controllers. */
list_for_each_entry_safe(hose, tmp, &hose_list, list_node) { list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
scan_phb(hose); scan_phb(hose);