Skip to content

L
linux
Commit 1beb6a7d authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files
Options

[PATCH] powerpc: Experimental support for new G5 Macs (#2) 

This adds some very basic support for the new machines, including the
Quad G5 (tested), and other new dual core based machines and iMac G5
iSight (untested). This is still experimental !  There is no thermal
control yet, there is no proper handing of MSIs, etc.. but it
boots, I have all 4 cores up on my machine. Compared to the previous
version of this patch, this one adds DART IOMMU support for the U4
chipset and thus should work fine on setups with more than 2Gb of RAM.
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent cd0c7f06
Show whitespace changes
Inline Side-by-side
Showing with 807 additions and 377 deletions
arch/powerpc/Kconfig
View file @ 1beb6a7d
...@@ -300,6 +300,7 @@ config PPC_PMAC64 ...@@ -300,6 +300,7 @@ config PPC_PMAC64
bool bool
depends on PPC_PMAC && POWER4 depends on PPC_PMAC && POWER4
select U3_DART select U3_DART
select MPIC_BROKEN_U3
select GENERIC_TBSYNC select GENERIC_TBSYNC
default y default y
......
arch/powerpc/kernel/pci_64.c
View file @ 1beb6a7d
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#ifdef DEBUG #ifdef DEBUG
#include <asm/udbg.h> #include <asm/udbg.h>
#define DBG(fmt...) udbg_printf(fmt) #define DBG(fmt...) printk(fmt)
#else #else
#define DBG(fmt...) #define DBG(fmt...)
#endif #endif
...@@ -323,6 +323,7 @@ static void pci_parse_of_addrs(struct device_node *node, struct pci_dev *dev) ...@@ -323,6 +323,7 @@ static void pci_parse_of_addrs(struct device_node *node, struct pci_dev *dev)
addrs = (u32 *) get_property(node, "assigned-addresses", &proplen); addrs = (u32 *) get_property(node, "assigned-addresses", &proplen);
if (!addrs) if (!addrs)
return; return;
DBG(" parse addresses (%d bytes) @ %p\n", proplen, addrs);
for (; proplen >= 20; proplen -= 20, addrs += 5) { for (; proplen >= 20; proplen -= 20, addrs += 5) {
flags = pci_parse_of_flags(addrs[0]); flags = pci_parse_of_flags(addrs[0]);
if (!flags) if (!flags)
...@@ -332,6 +333,9 @@ static void pci_parse_of_addrs(struct device_node *node, struct pci_dev *dev) ...@@ -332,6 +333,9 @@ static void pci_parse_of_addrs(struct device_node *node, struct pci_dev *dev)
if (!size) if (!size)
continue; continue;
i = addrs[0] & 0xff; i = addrs[0] & 0xff;
DBG(" base: %llx, size: %llx, i: %x\n",
(unsigned long long)base, (unsigned long long)size, i);
if (PCI_BASE_ADDRESS_0 <= i && i <= PCI_BASE_ADDRESS_5) { if (PCI_BASE_ADDRESS_0 <= i && i <= PCI_BASE_ADDRESS_5) {
res = &dev->resource[(i - PCI_BASE_ADDRESS_0) >> 2]; res = &dev->resource[(i - PCI_BASE_ADDRESS_0) >> 2];
} else if (i == dev->rom_base_reg) { } else if (i == dev->rom_base_reg) {
...@@ -362,6 +366,8 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, ...@@ -362,6 +366,8 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
if (type == NULL) if (type == NULL)
type = ""; type = "";
DBG(" create device, devfn: %x, type: %s\n", devfn, type);
memset(dev, 0, sizeof(struct pci_dev)); memset(dev, 0, sizeof(struct pci_dev));
dev->bus = bus; dev->bus = bus;
dev->sysdata = node; dev->sysdata = node;
...@@ -381,6 +387,8 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, ...@@ -381,6 +387,8 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn)); dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
dev->class = get_int_prop(node, "class-code", 0); dev->class = get_int_prop(node, "class-code", 0);
DBG(" class: 0x%x\n", dev->class);
dev->current_state = 4; /* unknown power state */ dev->current_state = 4; /* unknown power state */
if (!strcmp(type, "pci")) { if (!strcmp(type, "pci")) {
...@@ -402,6 +410,8 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, ...@@ -402,6 +410,8 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
pci_parse_of_addrs(node, dev); pci_parse_of_addrs(node, dev);
DBG(" adding to system ...\n");
pci_device_add(dev, bus); pci_device_add(dev, bus);
/* XXX pci_scan_msi_device(dev); */ /* XXX pci_scan_msi_device(dev); */
...@@ -418,15 +428,21 @@ void __devinit of_scan_bus(struct device_node *node, ...@@ -418,15 +428,21 @@ void __devinit of_scan_bus(struct device_node *node,
int reglen, devfn; int reglen, devfn;
struct pci_dev *dev; struct pci_dev *dev;
DBG("of_scan_bus(%s) bus no %d... \n", node->full_name, bus->number);
while ((child = of_get_next_child(node, child)) != NULL) { while ((child = of_get_next_child(node, child)) != NULL) {
DBG(" * %s\n", child->full_name);
reg = (u32 *) get_property(child, "reg", &reglen); reg = (u32 *) get_property(child, "reg", &reglen);
if (reg == NULL || reglen < 20) if (reg == NULL || reglen < 20)
continue; continue;
devfn = (reg[0] >> 8) & 0xff; devfn = (reg[0] >> 8) & 0xff;
/* create a new pci_dev for this device */ /* create a new pci_dev for this device */
dev = of_create_pci_dev(child, bus, devfn); dev = of_create_pci_dev(child, bus, devfn);
if (!dev) if (!dev)
continue; continue;
DBG("dev header type: %x\n", dev->hdr_type);
if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE || if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
of_scan_pci_bridge(child, dev); of_scan_pci_bridge(child, dev);
...@@ -446,16 +462,18 @@ void __devinit of_scan_pci_bridge(struct device_node *node, ...@@ -446,16 +462,18 @@ void __devinit of_scan_pci_bridge(struct device_node *node,
unsigned int flags; unsigned int flags;
u64 size; u64 size;
DBG("of_scan_pci_bridge(%s)\n", node->full_name);
/* parse bus-range property */ /* parse bus-range property */
busrange = (u32 *) get_property(node, "bus-range", &len); busrange = (u32 *) get_property(node, "bus-range", &len);
if (busrange == NULL || len != 8) { if (busrange == NULL || len != 8) {
printk(KERN_ERR "Can't get bus-range for PCI-PCI bridge %s\n", printk(KERN_DEBUG "Can't get bus-range for PCI-PCI bridge %s\n",
node->full_name); node->full_name);
return; return;
} }
ranges = (u32 *) get_property(node, "ranges", &len); ranges = (u32 *) get_property(node, "ranges", &len);
if (ranges == NULL) { if (ranges == NULL) {
printk(KERN_ERR "Can't get ranges for PCI-PCI bridge %s\n", printk(KERN_DEBUG "Can't get ranges for PCI-PCI bridge %s\n",
node->full_name); node->full_name);
return; return;
} }
...@@ -509,10 +527,13 @@ void __devinit of_scan_pci_bridge(struct device_node *node, ...@@ -509,10 +527,13 @@ void __devinit of_scan_pci_bridge(struct device_node *node,
} }
sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus), sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus),
bus->number); bus->number);
DBG(" bus name: %s\n", bus->name);
mode = PCI_PROBE_NORMAL; mode = PCI_PROBE_NORMAL;
if (ppc_md.pci_probe_mode) if (ppc_md.pci_probe_mode)
mode = ppc_md.pci_probe_mode(bus); mode = ppc_md.pci_probe_mode(bus);
DBG(" probe mode: %d\n", mode);
if (mode == PCI_PROBE_DEVTREE) if (mode == PCI_PROBE_DEVTREE)
of_scan_bus(node, bus); of_scan_bus(node, bus);
else if (mode == PCI_PROBE_NORMAL) else if (mode == PCI_PROBE_NORMAL)
...@@ -528,6 +549,8 @@ void __devinit scan_phb(struct pci_controller *hose) ...@@ -528,6 +549,8 @@ void __devinit scan_phb(struct pci_controller *hose)
int i, mode; int i, mode;
struct resource *res; struct resource *res;
DBG("Scanning PHB %s\n", node ? node->full_name : "<NO NAME>");
bus = pci_create_bus(NULL, hose->first_busno, hose->ops, node); bus = pci_create_bus(NULL, hose->first_busno, hose->ops, node);
if (bus == NULL) { if (bus == NULL) {
printk(KERN_ERR "Failed to create bus for PCI domain %04x\n", printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",
...@@ -552,8 +575,9 @@ void __devinit scan_phb(struct pci_controller *hose) ...@@ -552,8 +575,9 @@ void __devinit scan_phb(struct pci_controller *hose)
mode = PCI_PROBE_NORMAL; mode = PCI_PROBE_NORMAL;
#ifdef CONFIG_PPC_MULTIPLATFORM #ifdef CONFIG_PPC_MULTIPLATFORM
if (ppc_md.pci_probe_mode) if (node && ppc_md.pci_probe_mode)
mode = ppc_md.pci_probe_mode(bus); mode = ppc_md.pci_probe_mode(bus);
DBG(" probe mode: %d\n", mode);
if (mode == PCI_PROBE_DEVTREE) { if (mode == PCI_PROBE_DEVTREE) {
bus->subordinate = hose->last_busno; bus->subordinate = hose->last_busno;
of_scan_bus(node, bus); of_scan_bus(node, bus);
...@@ -842,8 +866,7 @@ pgprot_t pci_phys_mem_access_prot(struct file *file, ...@@ -842,8 +866,7 @@ pgprot_t pci_phys_mem_access_prot(struct file *file,
* Returns a negative error code on failure, zero on success. * Returns a negative error code on failure, zero on success.
*/ */
int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, enum pci_mmap_state mmap_state, int write_combine)
int write_combine)
{ {
unsigned long offset = vma->vm_pgoff << PAGE_SHIFT; unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
struct resource *rp; struct resource *rp;
......
arch/powerpc/kernel/prom.c
View file @ 1beb6a7d
...@@ -298,6 +298,16 @@ static int __devinit finish_node_interrupts(struct device_node *np, ...@@ -298,6 +298,16 @@ static int __devinit finish_node_interrupts(struct device_node *np,
int i, j, n, sense; int i, j, n, sense;
unsigned int *irq, virq; unsigned int *irq, virq;
struct device_node *ic; struct device_node *ic;
int trace = 0;
//#define TRACE(fmt...) do { if (trace) { printk(fmt); mdelay(1000); } } while(0)
#define TRACE(fmt...)
if (!strcmp(np->name, "smu-doorbell"))
trace = 1;
TRACE("Finishing SMU doorbell ! num_interrupt_controllers = %d\n",
num_interrupt_controllers);
if (num_interrupt_controllers == 0) { if (num_interrupt_controllers == 0) {
/* /*
...@@ -332,11 +342,12 @@ static int __devinit finish_node_interrupts(struct device_node *np, ...@@ -332,11 +342,12 @@ static int __devinit finish_node_interrupts(struct device_node *np,
} }
ints = (unsigned int *) get_property(np, "interrupts", &intlen); ints = (unsigned int *) get_property(np, "interrupts", &intlen);
TRACE("ints=%p, intlen=%d\n", ints, intlen);
if (ints == NULL) if (ints == NULL)
return 0; return 0;
intrcells = prom_n_intr_cells(np); intrcells = prom_n_intr_cells(np);
intlen /= intrcells * sizeof(unsigned int); intlen /= intrcells * sizeof(unsigned int);
TRACE("intrcells=%d, new intlen=%d\n", intrcells, intlen);
np->intrs = prom_alloc(intlen * sizeof(*(np->intrs)), mem_start); np->intrs = prom_alloc(intlen * sizeof(*(np->intrs)), mem_start);
if (!np->intrs) if (!np->intrs)
return -ENOMEM; return -ENOMEM;
...@@ -347,6 +358,7 @@ static int __devinit finish_node_interrupts(struct device_node *np, ...@@ -347,6 +358,7 @@ static int __devinit finish_node_interrupts(struct device_node *np,
intrcount = 0; intrcount = 0;
for (i = 0; i < intlen; ++i, ints += intrcells) { for (i = 0; i < intlen; ++i, ints += intrcells) {
n = map_interrupt(&irq, &ic, np, ints, intrcells); n = map_interrupt(&irq, &ic, np, ints, intrcells);
TRACE("map, irq=%d, ic=%p, n=%d\n", irq, ic, n);
if (n <= 0) if (n <= 0)
continue; continue;
...@@ -357,6 +369,7 @@ static int __devinit finish_node_interrupts(struct device_node *np, ...@@ -357,6 +369,7 @@ static int __devinit finish_node_interrupts(struct device_node *np,
np->intrs[intrcount].sense = map_isa_senses[sense]; np->intrs[intrcount].sense = map_isa_senses[sense];
} else { } else {
virq = virt_irq_create_mapping(irq[0]); virq = virt_irq_create_mapping(irq[0]);
TRACE("virq=%d\n", virq);
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
if (virq == NO_IRQ) { if (virq == NO_IRQ) {
printk(KERN_CRIT "Could not allocate interrupt" printk(KERN_CRIT "Could not allocate interrupt"
...@@ -366,6 +379,12 @@ static int __devinit finish_node_interrupts(struct device_node *np, ...@@ -366,6 +379,12 @@ static int __devinit finish_node_interrupts(struct device_node *np,
#endif #endif
np->intrs[intrcount].line = irq_offset_up(virq); np->intrs[intrcount].line = irq_offset_up(virq);
sense = (n > 1)? (irq[1] & 3): 1; sense = (n > 1)? (irq[1] & 3): 1;
/* Apple uses bits in there in a different way, let's
* only keep the real sense bit on macs
*/
if (_machine == PLATFORM_POWERMAC)
sense &= 0x1;
np->intrs[intrcount].sense = map_mpic_senses[sense]; np->intrs[intrcount].sense = map_mpic_senses[sense];
} }
...@@ -375,12 +394,13 @@ static int __devinit finish_node_interrupts(struct device_node *np, ...@@ -375,12 +394,13 @@ static int __devinit finish_node_interrupts(struct device_node *np,
char *name = get_property(ic->parent, "name", NULL); char *name = get_property(ic->parent, "name", NULL);
if (name && !strcmp(name, "u3")) if (name && !strcmp(name, "u3"))
np->intrs[intrcount].line += 128; np->intrs[intrcount].line += 128;
else if (!(name && !strcmp(name, "mac-io"))) else if (!(name && (!strcmp(name, "mac-io") ||
!strcmp(name, "u4"))))
/* ignore other cascaded controllers, such as /* ignore other cascaded controllers, such as
the k2-sata-root */ the k2-sata-root */
break; break;
} }
#endif #endif /* CONFIG_PPC64 */
if (n > 2) { if (n > 2) {
printk("hmmm, got %d intr cells for %s:", n, printk("hmmm, got %d intr cells for %s:", n,
np->full_name); np->full_name);
......
arch/powerpc/kernel/udbg.c
View file @ 1beb6a7d
...@@ -110,10 +110,12 @@ static int early_console_initialized; ...@@ -110,10 +110,12 @@ static int early_console_initialized;
void __init disable_early_printk(void) void __init disable_early_printk(void)
{ {
#if 1
if (!early_console_initialized) if (!early_console_initialized)
return; return;
unregister_console(&udbg_console); unregister_console(&udbg_console);
early_console_initialized = 0; early_console_initialized = 0;
#endif
} }
/* called by setup_system */ /* called by setup_system */
......
arch/powerpc/platforms/maple/setup.c
View file @ 1beb6a7d
...@@ -195,7 +195,7 @@ static void __init maple_init_early(void) ...@@ -195,7 +195,7 @@ static void __init maple_init_early(void)
/* Setup interrupt mapping options */ /* Setup interrupt mapping options */
ppc64_interrupt_controller = IC_OPEN_PIC; ppc64_interrupt_controller = IC_OPEN_PIC;
iommu_init_early_u3(); iommu_init_early_dart();
DBG(" <- maple_init_early\n"); DBG(" <- maple_init_early\n");
} }
...@@ -257,7 +257,7 @@ static int __init maple_probe(int platform) ...@@ -257,7 +257,7 @@ static int __init maple_probe(int platform)
* occupies having to be broken up so the DART itself is not * occupies having to be broken up so the DART itself is not
* part of the cacheable linar mapping * part of the cacheable linar mapping
*/ */
alloc_u3_dart_table(); alloc_dart_table();
return 1; return 1;
} }
......
arch/powerpc/platforms/powermac/feature.c
View file @ 1beb6a7d
...@@ -101,7 +101,8 @@ static const char *macio_names[] = ...@@ -101,7 +101,8 @@ static const char *macio_names[] =
"Keylargo", "Keylargo",
"Pangea", "Pangea",
"Intrepid", "Intrepid",
"K2" "K2",
"Shasta",
}; };
...@@ -119,7 +120,7 @@ static const char *macio_names[] = ...@@ -119,7 +120,7 @@ static const char *macio_names[] =
static struct device_node *uninorth_node; static struct device_node *uninorth_node;
static u32 __iomem *uninorth_base; static u32 __iomem *uninorth_base;
static u32 uninorth_rev; static u32 uninorth_rev;
static int uninorth_u3; static int uninorth_maj;
static void __iomem *u3_ht; static void __iomem *u3_ht;
/* /*
...@@ -1399,8 +1400,15 @@ static long g5_fw_enable(struct device_node *node, long param, long value) ...@@ -1399,8 +1400,15 @@ static long g5_fw_enable(struct device_node *node, long param, long value)
static long g5_mpic_enable(struct device_node *node, long param, long value) static long g5_mpic_enable(struct device_node *node, long param, long value)
{ {
unsigned long flags; unsigned long flags;
struct device_node *parent = of_get_parent(node);
int is_u3;
if (node->parent == NULL || strcmp(node->parent->name, "u3")) if (parent == NULL)
return 0;
is_u3 = strcmp(parent->name, "u3") == 0 ||
strcmp(parent->name, "u4") == 0;
of_node_put(parent);
if (!is_u3)
return 0; return 0;
LOCK(flags); LOCK(flags);
...@@ -1464,7 +1472,7 @@ static long g5_i2s_enable(struct device_node *node, long param, long value) ...@@ -1464,7 +1472,7 @@ static long g5_i2s_enable(struct device_node *node, long param, long value)
}, },
}; };
if (macio->type != macio_keylargo2 /* && macio->type != macio_shasta*/) if (macio->type != macio_keylargo2 && macio->type != macio_shasta)
return -ENODEV; return -ENODEV;
if (strncmp(node->name, "i2s-", 4)) if (strncmp(node->name, "i2s-", 4))
return -ENODEV; return -ENODEV;
...@@ -1473,11 +1481,9 @@ static long g5_i2s_enable(struct device_node *node, long param, long value) ...@@ -1473,11 +1481,9 @@ static long g5_i2s_enable(struct device_node *node, long param, long value)
case 0: case 0:
case 1: case 1:
break; break;
#if 0
case 2: case 2:
if (macio->type == macio_shasta) if (macio->type == macio_shasta)
break; break;
#endif
default: default:
return -ENODEV; return -ENODEV;
} }
...@@ -1508,7 +1514,7 @@ static long g5_reset_cpu(struct device_node *node, long param, long value) ...@@ -1508,7 +1514,7 @@ static long g5_reset_cpu(struct device_node *node, long param, long value)
struct device_node *np; struct device_node *np;
macio = &macio_chips[0]; macio = &macio_chips[0];
if (macio->type != macio_keylargo2) if (macio->type != macio_keylargo2 && macio->type != macio_shasta)
return -ENODEV; return -ENODEV;
np = find_path_device("/cpus"); np = find_path_device("/cpus");
...@@ -1547,6 +1553,7 @@ static long g5_reset_cpu(struct device_node *node, long param, long value) ...@@ -1547,6 +1553,7 @@ static long g5_reset_cpu(struct device_node *node, long param, long value)
*/ */
void g5_phy_disable_cpu1(void) void g5_phy_disable_cpu1(void)
{ {
if (uninorth_maj == 3)
UN_OUT(U3_API_PHY_CONFIG_1, 0); UN_OUT(U3_API_PHY_CONFIG_1, 0);
} }
#endif /* CONFIG_POWER4 */ #endif /* CONFIG_POWER4 */
...@@ -2462,6 +2469,14 @@ static struct pmac_mb_def pmac_mb_defs[] = { ...@@ -2462,6 +2469,14 @@ static struct pmac_mb_def pmac_mb_defs[] = {
PMAC_TYPE_POWERMAC_G5_U3L, g5_features, PMAC_TYPE_POWERMAC_G5_U3L, g5_features,
0, 0,
}, },
{ "PowerMac11,2", "PowerMac G5 Dual Core",
PMAC_TYPE_POWERMAC_G5_U3L, g5_features,
0,
},
{ "PowerMac12,1", "iMac G5 (iSight)",
PMAC_TYPE_POWERMAC_G5_U3L, g5_features,
0,
},
{ "RackMac3,1", "XServe G5", { "RackMac3,1", "XServe G5",
PMAC_TYPE_XSERVE_G5, g5_features, PMAC_TYPE_XSERVE_G5, g5_features,
0, 0,
...@@ -2574,6 +2589,11 @@ static int __init probe_motherboard(void) ...@@ -2574,6 +2589,11 @@ static int __init probe_motherboard(void)
pmac_mb.model_name = "Unknown K2-based"; pmac_mb.model_name = "Unknown K2-based";
pmac_mb.features = g5_features; pmac_mb.features = g5_features;
break; break;
case macio_shasta:
pmac_mb.model_id = PMAC_TYPE_UNKNOWN_SHASTA;
pmac_mb.model_name = "Unknown Shasta-based";
pmac_mb.features = g5_features;
break;
#endif /* CONFIG_POWER4 */ #endif /* CONFIG_POWER4 */
default: default:
return -ENODEV; return -ENODEV;
...@@ -2651,7 +2671,12 @@ static void __init probe_uninorth(void) ...@@ -2651,7 +2671,12 @@ static void __init probe_uninorth(void)
/* Locate G5 u3 */ /* Locate G5 u3 */
if (uninorth_node == NULL) { if (uninorth_node == NULL) {
uninorth_node = of_find_node_by_name(NULL, "u3"); uninorth_node = of_find_node_by_name(NULL, "u3");
uninorth_u3 = 1; uninorth_maj = 3;
}
/* Locate G5 u4 */
if (uninorth_node == NULL) {
uninorth_node = of_find_node_by_name(NULL, "u4");
uninorth_maj = 4;
} }
if (uninorth_node == NULL) if (uninorth_node == NULL)
return; return;
...@@ -2664,12 +2689,13 @@ static void __init probe_uninorth(void) ...@@ -2664,12 +2689,13 @@ static void __init probe_uninorth(void)
return; return;
uninorth_base = ioremap(address, 0x40000); uninorth_base = ioremap(address, 0x40000);
uninorth_rev = in_be32(UN_REG(UNI_N_VERSION)); uninorth_rev = in_be32(UN_REG(UNI_N_VERSION));
if (uninorth_u3) if (uninorth_maj == 3 || uninorth_maj == 4)
u3_ht = ioremap(address + U3_HT_CONFIG_BASE, 0x1000); u3_ht = ioremap(address + U3_HT_CONFIG_BASE, 0x1000);
printk(KERN_INFO "Found %s memory controller & host bridge," printk(KERN_INFO "Found %s memory controller & host bridge"
" revision: %d\n", uninorth_u3 ? "U3" : "UniNorth", " @ 0x%08x revision: 0x%02x\n", uninorth_maj == 3 ? "U3" :
uninorth_rev); uninorth_maj == 4 ? "U4" : "UniNorth",
(unsigned int)address, uninorth_rev);
printk(KERN_INFO "Mapped at 0x%08lx\n", (unsigned long)uninorth_base); printk(KERN_INFO "Mapped at 0x%08lx\n", (unsigned long)uninorth_base);
/* Set the arbitrer QAck delay according to what Apple does /* Set the arbitrer QAck delay according to what Apple does
...@@ -2677,7 +2703,8 @@ static void __init probe_uninorth(void) ...@@ -2677,7 +2703,8 @@ static void __init probe_uninorth(void)
if (uninorth_rev < 0x11) { if (uninorth_rev < 0x11) {
actrl = UN_IN(UNI_N_ARB_CTRL) & ~UNI_N_ARB_CTRL_QACK_DELAY_MASK; actrl = UN_IN(UNI_N_ARB_CTRL) & ~UNI_N_ARB_CTRL_QACK_DELAY_MASK;
actrl |= ((uninorth_rev < 3) ? UNI_N_ARB_CTRL_QACK_DELAY105 : actrl |= ((uninorth_rev < 3) ? UNI_N_ARB_CTRL_QACK_DELAY105 :
UNI_N_ARB_CTRL_QACK_DELAY) << UNI_N_ARB_CTRL_QACK_DELAY_SHIFT; UNI_N_ARB_CTRL_QACK_DELAY) <<
UNI_N_ARB_CTRL_QACK_DELAY_SHIFT;
UN_OUT(UNI_N_ARB_CTRL, actrl); UN_OUT(UNI_N_ARB_CTRL, actrl);
} }
...@@ -2685,7 +2712,8 @@ static void __init probe_uninorth(void) ...@@ -2685,7 +2712,8 @@ static void __init probe_uninorth(void)
* revs 1.5 to 2.O and Pangea. Seem to toggle the UniN Maxbus/PCI * revs 1.5 to 2.O and Pangea. Seem to toggle the UniN Maxbus/PCI
* memory timeout * memory timeout
*/ */
if ((uninorth_rev >= 0x11 && uninorth_rev <= 0x24) || uninorth_rev == 0xc0) if ((uninorth_rev >= 0x11 && uninorth_rev <= 0x24) ||
uninorth_rev == 0xc0)
UN_OUT(0x2160, UN_IN(0x2160) & 0x00ffffff); UN_OUT(0x2160, UN_IN(0x2160) & 0x00ffffff);
} }
...@@ -2736,12 +2764,14 @@ static void __init probe_one_macio(const char *name, const char *compat, int typ ...@@ -2736,12 +2764,14 @@ static void __init probe_one_macio(const char *name, const char *compat, int typ
node->full_name); node->full_name);
return; return;
} }
if (type == macio_keylargo) { if (type == macio_keylargo || type == macio_keylargo2) {
u32 *did = (u32 *)get_property(node, "device-id", NULL); u32 *did = (u32 *)get_property(node, "device-id", NULL);
if (*did == 0x00000025) if (*did == 0x00000025)
type = macio_pangea; type = macio_pangea;
if (*did == 0x0000003e) if (*did == 0x0000003e)
type = macio_intrepid; type = macio_intrepid;
if (*did == 0x0000004f)
type = macio_shasta;
} }
macio_chips[i].of_node = node; macio_chips[i].of_node = node;
macio_chips[i].type = type; macio_chips[i].type = type;
...@@ -2840,7 +2870,8 @@ set_initial_features(void) ...@@ -2840,7 +2870,8 @@ set_initial_features(void)
} }
#ifdef CONFIG_POWER4 #ifdef CONFIG_POWER4
if (macio_chips[0].type == macio_keylargo2) { if (macio_chips[0].type == macio_keylargo2 ||
macio_chips[0].type == macio_shasta) {
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
/* On SMP machines running UP, we have the second CPU eating /* On SMP machines running UP, we have the second CPU eating
* bus cycles. We need to take it off the bus. This is done * bus cycles. We need to take it off the bus. This is done
......
arch/powerpc/platforms/powermac/pci.c
View file @ 1beb6a7d
/* /*
* Support for PCI bridges found on Power Macintoshes. * Support for PCI bridges found on Power Macintoshes.
* *
* Copyright (C) 2003 Benjamin Herrenschmuidt (benh@kernel.crashing.org) * Copyright (C) 2003-2005 Benjamin Herrenschmuidt (benh@kernel.crashing.org)
* Copyright (C) 1997 Paul Mackerras (paulus@samba.org) * Copyright (C) 1997 Paul Mackerras (paulus@samba.org)
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <asm/pmac_feature.h> #include <asm/pmac_feature.h>
#include <asm/grackle.h> #include <asm/grackle.h>
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
#include <asm/iommu.h> //#include <asm/iommu.h>
#include <asm/ppc-pci.h> #include <asm/ppc-pci.h>
#endif #endif
...@@ -44,6 +44,7 @@ static int add_bridge(struct device_node *dev); ...@@ -44,6 +44,7 @@ static int add_bridge(struct device_node *dev);
static int has_uninorth; static int has_uninorth;
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
static struct pci_controller *u3_agp; static struct pci_controller *u3_agp;
static struct pci_controller *u4_pcie;
static struct pci_controller *u3_ht; static struct pci_controller *u3_ht;
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC64 */
...@@ -97,11 +98,8 @@ static void __init fixup_bus_range(struct device_node *bridge) ...@@ -97,11 +98,8 @@ static void __init fixup_bus_range(struct device_node *bridge)
/* Lookup the "bus-range" property for the hose */ /* Lookup the "bus-range" property for the hose */
bus_range = (int *) get_property(bridge, "bus-range", &len); bus_range = (int *) get_property(bridge, "bus-range", &len);
if (bus_range == NULL || len < 2 * sizeof(int)) { if (bus_range == NULL || len < 2 * sizeof(int))
printk(KERN_WARNING "Can't get bus-range for %s\n",
bridge->full_name);
return; return;
}
bus_range[1] = fixup_one_level_bus_range(bridge->child, bus_range[1]); bus_range[1] = fixup_one_level_bus_range(bridge->child, bus_range[1]);
} }
...@@ -128,14 +126,14 @@ static void __init fixup_bus_range(struct device_node *bridge) ...@@ -128,14 +126,14 @@ static void __init fixup_bus_range(struct device_node *bridge)
*/ */
#define MACRISC_CFA0(devfn, off) \ #define MACRISC_CFA0(devfn, off) \
((1 << (unsigned long)PCI_SLOT(dev_fn)) \ ((1 << (unsigned int)PCI_SLOT(dev_fn)) \
| (((unsigned long)PCI_FUNC(dev_fn)) << 8) \ | (((unsigned int)PCI_FUNC(dev_fn)) << 8) \
| (((unsigned long)(off)) & 0xFCUL)) | (((unsigned int)(off)) & 0xFCUL))
#define MACRISC_CFA1(bus, devfn, off) \ #define MACRISC_CFA1(bus, devfn, off) \
((((unsigned long)(bus)) << 16) \ ((((unsigned int)(bus)) << 16) \
|(((unsigned long)(devfn)) << 8) \ |(((unsigned int)(devfn)) << 8) \
|(((unsigned long)(off)) & 0xFCUL) \ |(((unsigned int)(off)) & 0xFCUL) \
|1UL) |1UL)
static unsigned long macrisc_cfg_access(struct pci_controller* hose, static unsigned long macrisc_cfg_access(struct pci_controller* hose,
...@@ -168,7 +166,8 @@ static int macrisc_read_config(struct pci_bus *bus, unsigned int devfn, ...@@ -168,7 +166,8 @@ static int macrisc_read_config(struct pci_bus *bus, unsigned int devfn,
hose = pci_bus_to_host(bus); hose = pci_bus_to_host(bus);
if (hose == NULL) if (hose == NULL)
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
if (offset >= 0x100)
return PCIBIOS_BAD_REGISTER_NUMBER;
addr = macrisc_cfg_access(hose, bus->number, devfn, offset); addr = macrisc_cfg_access(hose, bus->number, devfn, offset);
if (!addr) if (!addr)
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
...@@ -199,7 +198,8 @@ static int macrisc_write_config(struct pci_bus *bus, unsigned int devfn, ...@@ -199,7 +198,8 @@ static int macrisc_write_config(struct pci_bus *bus, unsigned int devfn,
hose = pci_bus_to_host(bus); hose = pci_bus_to_host(bus);
if (hose == NULL) if (hose == NULL)
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
if (offset >= 0x100)
return PCIBIOS_BAD_REGISTER_NUMBER;
addr = macrisc_cfg_access(hose, bus->number, devfn, offset); addr = macrisc_cfg_access(hose, bus->number, devfn, offset);
if (!addr) if (!addr)
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
...@@ -234,12 +234,13 @@ static struct pci_ops macrisc_pci_ops = ...@@ -234,12 +234,13 @@ static struct pci_ops macrisc_pci_ops =
/* /*
* Verify that a specific (bus, dev_fn) exists on chaos * Verify that a specific (bus, dev_fn) exists on chaos
*/ */
static int static int chaos_validate_dev(struct pci_bus *bus, int devfn, int offset)
chaos_validate_dev(struct pci_bus *bus, int devfn, int offset)
{ {
struct device_node *np; struct device_node *np;
u32 *vendor, *device; u32 *vendor, *device;
if (offset >= 0x100)
return PCIBIOS_BAD_REGISTER_NUMBER;
np = pci_busdev_to_OF_node(bus, devfn); np = pci_busdev_to_OF_node(bus, devfn);
if (np == NULL) if (np == NULL)
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
...@@ -341,10 +342,10 @@ static int u3_ht_skip_device(struct pci_controller *hose, ...@@ -341,10 +342,10 @@ static int u3_ht_skip_device(struct pci_controller *hose,
} }
#define U3_HT_CFA0(devfn, off) \ #define U3_HT_CFA0(devfn, off) \
((((unsigned long)devfn) << 8) | offset) ((((unsigned int)devfn) << 8) | offset)
#define U3_HT_CFA1(bus, devfn, off) \ #define U3_HT_CFA1(bus, devfn, off) \
(U3_HT_CFA0(devfn, off) \ (U3_HT_CFA0(devfn, off) \
+ (((unsigned long)bus) << 16) \ + (((unsigned int)bus) << 16) \
+ 0x01000000UL) + 0x01000000UL)
static unsigned long u3_ht_cfg_access(struct pci_controller* hose, static unsigned long u3_ht_cfg_access(struct pci_controller* hose,
...@@ -370,7 +371,8 @@ static int u3_ht_read_config(struct pci_bus *bus, unsigned int devfn, ...@@ -370,7 +371,8 @@ static int u3_ht_read_config(struct pci_bus *bus, unsigned int devfn,
hose = pci_bus_to_host(bus); hose = pci_bus_to_host(bus);
if (hose == NULL) if (hose == NULL)
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
if (offset >= 0x100)
return PCIBIOS_BAD_REGISTER_NUMBER;
addr = u3_ht_cfg_access(hose, bus->number, devfn, offset); addr = u3_ht_cfg_access(hose, bus->number, devfn, offset);
if (!addr) if (!addr)
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
...@@ -419,7 +421,8 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn, ...@@ -419,7 +421,8 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn,
hose = pci_bus_to_host(bus); hose = pci_bus_to_host(bus);
if (hose == NULL) if (hose == NULL)
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
if (offset >= 0x100)
return PCIBIOS_BAD_REGISTER_NUMBER;
addr = u3_ht_cfg_access(hose, bus->number, devfn, offset); addr = u3_ht_cfg_access(hose, bus->number, devfn, offset);
if (!addr) if (!addr)
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
...@@ -459,6 +462,112 @@ static struct pci_ops u3_ht_pci_ops = ...@@ -459,6 +462,112 @@ static struct pci_ops u3_ht_pci_ops =
u3_ht_read_config, u3_ht_read_config,
u3_ht_write_config u3_ht_write_config
}; };
#define U4_PCIE_CFA0(devfn, off) \
((1 << ((unsigned int)PCI_SLOT(dev_fn))) \
| (((unsigned int)PCI_FUNC(dev_fn)) << 8) \
| ((((unsigned int)(off)) >> 8) << 28) \
| (((unsigned int)(off)) & 0xfcU))
#define U4_PCIE_CFA1(bus, devfn, off) \
((((unsigned int)(bus)) << 16) \
|(((unsigned int)(devfn)) << 8) \
| ((((unsigned int)(off)) >> 8) << 28) \
|(((unsigned int)(off)) & 0xfcU) \
|1UL)
static unsigned long u4_pcie_cfg_access(struct pci_controller* hose,
u8 bus, u8 dev_fn, int offset)
{
unsigned int caddr;
if (bus == hose->first_busno) {
caddr = U4_PCIE_CFA0(dev_fn, offset);
} else
caddr = U4_PCIE_CFA1(bus, dev_fn, offset);
/* Uninorth will return garbage if we don't read back the value ! */
do {
out_le32(hose->cfg_addr, caddr);
} while (in_le32(hose->cfg_addr) != caddr);
offset &= 0x03;
return ((unsigned long)hose->cfg_data) + offset;
}
static int u4_pcie_read_config(struct pci_bus *bus, unsigned int devfn,
int offset, int len, u32 *val)
{
struct pci_controller *hose;
unsigned long addr;
hose = pci_bus_to_host(bus);
if (hose == NULL)
return PCIBIOS_DEVICE_NOT_FOUND;
if (offset >= 0x1000)
return PCIBIOS_BAD_REGISTER_NUMBER;
addr = u4_pcie_cfg_access(hose, bus->number, devfn, offset);
if (!addr)
return PCIBIOS_DEVICE_NOT_FOUND;
/*
* Note: the caller has already checked that offset is
* suitably aligned and that len is 1, 2 or 4.
*/
switch (len) {
case 1:
*val = in_8((u8 *)addr);
break;
case 2:
*val = in_le16((u16 *)addr);
break;
default:
*val = in_le32((u32 *)addr);
break;
}
return PCIBIOS_SUCCESSFUL;
}
static int u4_pcie_write_config(struct pci_bus *bus, unsigned int devfn,
int offset, int len, u32 val)
{
struct pci_controller *hose;
unsigned long addr;
hose = pci_bus_to_host(bus);
if (hose == NULL)
return PCIBIOS_DEVICE_NOT_FOUND;
if (offset >= 0x1000)
return PCIBIOS_BAD_REGISTER_NUMBER;
addr = u4_pcie_cfg_access(hose, bus->number, devfn, offset);
if (!addr)
return PCIBIOS_DEVICE_NOT_FOUND;
/*
* Note: the caller has already checked that offset is
* suitably aligned and that len is 1, 2 or 4.
*/
switch (len) {
case 1:
out_8((u8 *)addr, val);
(void) in_8((u8 *)addr);
break;
case 2:
out_le16((u16 *)addr, val);
(void) in_le16((u16 *)addr);
break;
default:
out_le32((u32 *)addr, val);
(void) in_le32((u32 *)addr);
break;
}
return PCIBIOS_SUCCESSFUL;
}
static struct pci_ops u4_pcie_pci_ops =
{
u4_pcie_read_config,
u4_pcie_write_config
};
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC64 */
#ifdef CONFIG_PPC32 #ifdef CONFIG_PPC32
...@@ -628,15 +737,36 @@ static void __init setup_u3_agp(struct pci_controller* hose) ...@@ -628,15 +737,36 @@ static void __init setup_u3_agp(struct pci_controller* hose)
hose->ops = &macrisc_pci_ops; hose->ops = &macrisc_pci_ops;
hose->cfg_addr = ioremap(0xf0000000 + 0x800000, 0x1000); hose->cfg_addr = ioremap(0xf0000000 + 0x800000, 0x1000);
hose->cfg_data = ioremap(0xf0000000 + 0xc00000, 0x1000); hose->cfg_data = ioremap(0xf0000000 + 0xc00000, 0x1000);
u3_agp = hose; u3_agp = hose;
} }
static void __init setup_u4_pcie(struct pci_controller* hose)
{
/* We currently only implement the "non-atomic" config space, to
* be optimised later.
*/
hose->ops = &u4_pcie_pci_ops;
hose->cfg_addr = ioremap(0xf0000000 + 0x800000, 0x1000);
hose->cfg_data = ioremap(0xf0000000 + 0xc00000, 0x1000);
/* The bus contains a bridge from root -> device, we need to
* make it visible on bus 0 so that we pick the right type
* of config cycles. If we didn't, we would have to force all
* config cycles to be type 1. So we override the "bus-range"
* property here
*/
hose->first_busno = 0x00;
hose->last_busno = 0xff;
u4_pcie = hose;
}
static void __init setup_u3_ht(struct pci_controller* hose) static void __init setup_u3_ht(struct pci_controller* hose)
{ {
struct device_node *np = (struct device_node *)hose->arch_data; struct device_node *np = (struct device_node *)hose->arch_data;
struct pci_controller *other = NULL;
int i, cur; int i, cur;
hose->ops = &u3_ht_pci_ops; hose->ops = &u3_ht_pci_ops;
/* We hard code the address because of the different size of /* We hard code the address because of the different size of
...@@ -670,11 +800,20 @@ static void __init setup_u3_ht(struct pci_controller* hose) ...@@ -670,11 +800,20 @@ static void __init setup_u3_ht(struct pci_controller* hose)
u3_ht = hose; u3_ht = hose;
if (u3_agp == NULL) { if (u3_agp != NULL)
DBG("U3 has no AGP, using full resource range\n"); other = u3_agp;
else if (u4_pcie != NULL)
other = u4_pcie;
if (other == NULL) {
DBG("U3/4 has no AGP/PCIE, using full resource range\n");
return; return;
} }
/* Fixup bus range vs. PCIE */
if (u4_pcie)
hose->last_busno = u4_pcie->first_busno - 1;
/* We "remove" the AGP resources from the resources allocated to HT, /* We "remove" the AGP resources from the resources allocated to HT,
* that is we create "holes". However, that code does assumptions * that is we create "holes". However, that code does assumptions
* that so far happen to be true (cross fingers...), typically that * that so far happen to be true (cross fingers...), typically that
...@@ -682,7 +821,7 @@ static void __init setup_u3_ht(struct pci_controller* hose) ...@@ -682,7 +821,7 @@ static void __init setup_u3_ht(struct pci_controller* hose)
*/ */
cur = 0; cur = 0;
for (i=0; i<3; i++) { for (i=0; i<3; i++) {
struct resource *res = &u3_agp->mem_resources[i]; struct resource *res = &other->mem_resources[i];
if (res->flags != IORESOURCE_MEM) if (res->flags != IORESOURCE_MEM)
continue; continue;
/* We don't care about "fine" resources */ /* We don't care about "fine" resources */
...@@ -777,9 +916,13 @@ static int __init add_bridge(struct device_node *dev) ...@@ -777,9 +916,13 @@ static int __init add_bridge(struct device_node *dev)
setup_u3_ht(hose); setup_u3_ht(hose);
disp_name = "U3-HT"; disp_name = "U3-HT";
primary = 1; primary = 1;
} else if (device_is_compatible(dev, "u4-pcie")) {
setup_u4_pcie(hose);
disp_name = "U4-PCIE";
primary = 0;
} }
printk(KERN_INFO "Found %s PCI host bridge. Firmware bus number: %d->%d\n", printk(KERN_INFO "Found %s PCI host bridge. Firmware bus number:"
disp_name, hose->first_busno, hose->last_busno); " %d->%d\n", disp_name, hose->first_busno, hose->last_busno);
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC64 */
/* 32 bits only bridges */ /* 32 bits only bridges */
...@@ -900,6 +1043,8 @@ void __init pmac_pci_init(void) ...@@ -900,6 +1043,8 @@ void __init pmac_pci_init(void)
pci_setup_phb_io(u3_ht, 1); pci_setup_phb_io(u3_ht, 1);
if (u3_agp) if (u3_agp)
pci_setup_phb_io(u3_agp, 0); pci_setup_phb_io(u3_agp, 0);
if (u4_pcie)
pci_setup_phb_io(u4_pcie, 0);
/* /*
* On ppc64, fixup the IO resources on our host bridges as * On ppc64, fixup the IO resources on our host bridges as
...@@ -912,7 +1057,8 @@ void __init pmac_pci_init(void) ...@@ -912,7 +1057,8 @@ void __init pmac_pci_init(void)
/* Fixup the PCI<->OF mapping for U3 AGP due to bus renumbering. We /* Fixup the PCI<->OF mapping for U3 AGP due to bus renumbering. We
* assume there is no P2P bridge on the AGP bus, which should be a * assume there is no P2P bridge on the AGP bus, which should be a
* safe assumptions hopefully. * safe assumptions for now. We should do something better in the
* future though
*/ */
if (u3_agp) { if (u3_agp) {
struct device_node *np = u3_agp->arch_data; struct device_node *np = u3_agp->arch_data;
...@@ -920,7 +1066,6 @@ void __init pmac_pci_init(void) ...@@ -920,7 +1066,6 @@ void __init pmac_pci_init(void)
for (np = np->child; np; np = np->sibling) for (np = np->child; np; np = np->sibling)
PCI_DN(np)->busno = 0xf0; PCI_DN(np)->busno = 0xf0;
} }
/* pmac_check_ht_link(); */ /* pmac_check_ht_link(); */
/* Tell pci.c to not use the common resource allocation mechanism */ /* Tell pci.c to not use the common resource allocation mechanism */
...@@ -1127,7 +1272,8 @@ void pmac_pci_fixup_pciata(struct pci_dev* dev) ...@@ -1127,7 +1272,8 @@ void pmac_pci_fixup_pciata(struct pci_dev* dev)
good: good:
pci_read_config_byte(dev, PCI_CLASS_PROG, &progif); pci_read_config_byte(dev, PCI_CLASS_PROG, &progif);
if ((progif & 5) != 5) { if ((progif & 5) != 5) {
printk(KERN_INFO "Forcing PCI IDE into native mode: %s\n", pci_name(dev)); printk(KERN_INFO "Forcing PCI IDE into native mode: %s\n",
pci_name(dev));
(void) pci_write_config_byte(dev, PCI_CLASS_PROG, progif|5); (void) pci_write_config_byte(dev, PCI_CLASS_PROG, progif|5);
if (pci_read_config_byte(dev, PCI_CLASS_PROG, &progif) || if (pci_read_config_byte(dev, PCI_CLASS_PROG, &progif) ||
(progif & 5) != 5) (progif & 5) != 5)
...@@ -1153,7 +1299,8 @@ static void fixup_k2_sata(struct pci_dev* dev) ...@@ -1153,7 +1299,8 @@ static void fixup_k2_sata(struct pci_dev* dev)
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
dev->resource[i].start = dev->resource[i].end = 0; dev->resource[i].start = dev->resource[i].end = 0;
dev->resource[i].flags = 0; dev->resource[i].flags = 0;
pci_write_config_dword(dev, PCI_BASE_ADDRESS_0 + 4 * i, 0); pci_write_config_dword(dev, PCI_BASE_ADDRESS_0 + 4 * i,
0);
} }
} else { } else {
pci_read_config_word(dev, PCI_COMMAND, &cmd); pci_read_config_word(dev, PCI_COMMAND, &cmd);
...@@ -1162,7 +1309,8 @@ static void fixup_k2_sata(struct pci_dev* dev) ...@@ -1162,7 +1309,8 @@ static void fixup_k2_sata(struct pci_dev* dev)
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
dev->resource[i].start = dev->resource[i].end = 0; dev->resource[i].start = dev->resource[i].end = 0;
dev->resource[i].flags = 0; dev->resource[i].flags = 0;
pci_write_config_dword(dev, PCI_BASE_ADDRESS_0 + 4 * i, 0); pci_write_config_dword(dev, PCI_BASE_ADDRESS_0 + 4 * i,
0);
} }
} }
} }
......
arch/powerpc/platforms/powermac/pic.c
View file @ 1beb6a7d
...@@ -524,18 +524,56 @@ static void __init pmac_pic_setup_mpic_nmi(struct mpic *mpic) ...@@ -524,18 +524,56 @@ static void __init pmac_pic_setup_mpic_nmi(struct mpic *mpic)
#endif /* defined(CONFIG_XMON) && defined(CONFIG_PPC32) */ #endif /* defined(CONFIG_XMON) && defined(CONFIG_PPC32) */
} }
static struct mpic * __init pmac_setup_one_mpic(struct device_node *np,
int master)
{
unsigned char senses[128];
int offset = master ? 0 : 128;
int count = master ? 128 : 124;
const char *name = master ? " MPIC 1 " : " MPIC 2 ";
struct resource r;
struct mpic *mpic;
unsigned int flags = master ? MPIC_PRIMARY : 0;
int rc;
rc = of_address_to_resource(np, 0, &r);
if (rc)
return NULL;
pmac_call_feature(PMAC_FTR_ENABLE_MPIC, np, 0, 0);
prom_get_irq_senses(senses, offset, offset + count);
flags |= MPIC_WANTS_RESET;
if (get_property(np, "big-endian", NULL))
flags |= MPIC_BIG_ENDIAN;
/* Primary Big Endian means HT interrupts. This is quite dodgy
* but works until I find a better way
*/
if (master && (flags & MPIC_BIG_ENDIAN))
flags |= MPIC_BROKEN_U3;
mpic = mpic_alloc(r.start, flags, 0, offset, count, master ? 252 : 0,
senses, count, name);
if (mpic == NULL)
return NULL;
mpic_init(mpic);
return mpic;
}
static int __init pmac_pic_probe_mpic(void) static int __init pmac_pic_probe_mpic(void)
{ {
struct mpic *mpic1, *mpic2; struct mpic *mpic1, *mpic2;
struct device_node *np, *master = NULL, *slave = NULL; struct device_node *np, *master = NULL, *slave = NULL;
unsigned char senses[128];
struct resource r;
/* We can have up to 2 MPICs cascaded */ /* We can have up to 2 MPICs cascaded */
for (np = NULL; (np = of_find_node_by_type(np, "open-pic")) for (np = NULL; (np = of_find_node_by_type(np, "open-pic"))
!= NULL;) { != NULL;) {
if (master == NULL && if (master == NULL &&
get_property(np, "interrupt-parent", NULL) != NULL) get_property(np, "interrupts", NULL) == NULL)
master = of_node_get(np); master = of_node_get(np);
else if (slave == NULL) else if (slave == NULL)
slave = of_node_get(np); slave = of_node_get(np);
...@@ -557,13 +595,8 @@ static int __init pmac_pic_probe_mpic(void) ...@@ -557,13 +595,8 @@ static int __init pmac_pic_probe_mpic(void)
ppc_md.get_irq = mpic_get_irq; ppc_md.get_irq = mpic_get_irq;
/* Setup master */ /* Setup master */
BUG_ON(of_address_to_resource(master, 0, &r)); mpic1 = pmac_setup_one_mpic(master, 1);
pmac_call_feature(PMAC_FTR_ENABLE_MPIC, master, 0, 0);
prom_get_irq_senses(senses, 0, 128);
mpic1 = mpic_alloc(r.start, MPIC_PRIMARY | MPIC_WANTS_RESET,
0, 0, 128, 252, senses, 128, " OpenPIC ");
BUG_ON(mpic1 == NULL); BUG_ON(mpic1 == NULL);
mpic_init(mpic1);
/* Install NMI if any */ /* Install NMI if any */
pmac_pic_setup_mpic_nmi(mpic1); pmac_pic_setup_mpic_nmi(mpic1);
...@@ -574,27 +607,12 @@ static int __init pmac_pic_probe_mpic(void) ...@@ -574,27 +607,12 @@ static int __init pmac_pic_probe_mpic(void)
if (slave == NULL || slave->n_intrs < 1) if (slave == NULL || slave->n_intrs < 1)
return 0; return 0;
/* Setup slave, failures are non-fatal */ mpic2 = pmac_setup_one_mpic(slave, 0);
if (of_address_to_resource(slave, 0, &r)) {
printk(KERN_ERR "Can't get address of MPIC %s\n",
slave->full_name);
return 0;
}
pmac_call_feature(PMAC_FTR_ENABLE_MPIC, slave, 0, 0);
prom_get_irq_senses(senses, 128, 128 + 124);
/* We don't need to set MPIC_BROKEN_U3 here since we don't have
* hypertransport interrupts routed to it, at least not on currently
* supported machines, that may change.
*/
mpic2 = mpic_alloc(r.start, MPIC_BIG_ENDIAN | MPIC_WANTS_RESET,
0, 128, 124, 0, senses, 124, " U3-MPIC ");
if (mpic2 == NULL) { if (mpic2 == NULL) {
printk(KERN_ERR "Can't create slave MPIC %s\n", printk(KERN_ERR "Failed to setup slave MPIC\n");
slave->full_name); of_node_put(slave);
return 0; return 0;
} }
mpic_init(mpic2);
mpic_setup_cascade(slave->intrs[0].line, pmac_u3_cascade, mpic2); mpic_setup_cascade(slave->intrs[0].line, pmac_u3_cascade, mpic2);
of_node_put(slave); of_node_put(slave);
......
arch/powerpc/platforms/powermac/setup.c
View file @ 1beb6a7d
...@@ -345,7 +345,7 @@ void __init pmac_setup_arch(void) ...@@ -345,7 +345,7 @@ void __init pmac_setup_arch(void)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* Check for Core99 */ /* Check for Core99 */
if (find_devices("uni-n") || find_devices("u3")) if (find_devices("uni-n") || find_devices("u3") || find_devices("u4"))
smp_ops = &core99_smp_ops; smp_ops = &core99_smp_ops;
#ifdef CONFIG_PPC32 #ifdef CONFIG_PPC32
else else
...@@ -635,7 +635,7 @@ static void __init pmac_init_early(void) ...@@ -635,7 +635,7 @@ static void __init pmac_init_early(void)
/* Setup interrupt mapping options */ /* Setup interrupt mapping options */
ppc64_interrupt_controller = IC_OPEN_PIC; ppc64_interrupt_controller = IC_OPEN_PIC;
iommu_init_early_u3(); iommu_init_early_dart();
#endif #endif
} }
...@@ -711,7 +711,7 @@ static int __init pmac_probe(int platform) ...@@ -711,7 +711,7 @@ static int __init pmac_probe(int platform)
* occupies having to be broken up so the DART itself is not * occupies having to be broken up so the DART itself is not
* part of the cacheable linar mapping * part of the cacheable linar mapping
*/ */
alloc_u3_dart_table(); alloc_dart_table();
#endif #endif
#ifdef CONFIG_PMAC_SMU #ifdef CONFIG_PMAC_SMU
...@@ -733,10 +733,11 @@ static int pmac_pci_probe_mode(struct pci_bus *bus) ...@@ -733,10 +733,11 @@ static int pmac_pci_probe_mode(struct pci_bus *bus)
struct device_node *node = bus->sysdata; struct device_node *node = bus->sysdata;
/* We need to use normal PCI probing for the AGP bus, /* We need to use normal PCI probing for the AGP bus,
since the device for the AGP bridge isn't in the tree. */ * since the device for the AGP bridge isn't in the tree.
if (bus->self == NULL && device_is_compatible(node, "u3-agp")) */
if (bus->self == NULL && (device_is_compatible(node, "u3-agp") ||
device_is_compatible(node, "u4-pcie")))
return PCI_PROBE_NORMAL; return PCI_PROBE_NORMAL;
return PCI_PROBE_DEVTREE; return PCI_PROBE_DEVTREE;
} }
#endif #endif
......
arch/powerpc/platforms/powermac/smp.c
View file @ 1beb6a7d
...@@ -361,7 +361,6 @@ static void __init psurge_dual_sync_tb(int cpu_nr) ...@@ -361,7 +361,6 @@ static void __init psurge_dual_sync_tb(int cpu_nr)
set_dec(tb_ticks_per_jiffy); set_dec(tb_ticks_per_jiffy);
/* XXX fixme */ /* XXX fixme */
set_tb(0, 0); set_tb(0, 0);
last_jiffy_stamp(cpu_nr) = 0;
if (cpu_nr > 0) { if (cpu_nr > 0) {
mb(); mb();
...@@ -429,15 +428,62 @@ struct smp_ops_t psurge_smp_ops = { ...@@ -429,15 +428,62 @@ struct smp_ops_t psurge_smp_ops = {
}; };
#endif /* CONFIG_PPC32 - actually powersurge support */ #endif /* CONFIG_PPC32 - actually powersurge support */
/*
* Core 99 and later support
*/
static void (*pmac_tb_freeze)(int freeze);
static unsigned long timebase;
static int tb_req;
static void smp_core99_give_timebase(void)
{
unsigned long flags;
local_irq_save(flags);
while(!tb_req)
barrier();
tb_req = 0;
(*pmac_tb_freeze)(1);
mb();
timebase = get_tb();
mb();
while (timebase)
barrier();
mb();
(*pmac_tb_freeze)(0);
mb();
local_irq_restore(flags);
}
static void __devinit smp_core99_take_timebase(void)
{
unsigned long flags;
local_irq_save(flags);
tb_req = 1;
mb();
while (!timebase)
barrier();
mb();
set_tb(timebase >> 32, timebase & 0xffffffff);
timebase = 0;
mb();
set_dec(tb_ticks_per_jiffy/2);
local_irq_restore(flags);
}
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
/* /*
* G5s enable/disable the timebase via an i2c-connected clock chip. * G5s enable/disable the timebase via an i2c-connected clock chip.
*/ */
static struct device_node *pmac_tb_clock_chip_host; static struct device_node *pmac_tb_clock_chip_host;
static u8 pmac_tb_pulsar_addr; static u8 pmac_tb_pulsar_addr;
static void (*pmac_tb_freeze)(int freeze);
static DEFINE_SPINLOCK(timebase_lock);
static unsigned long timebase;
static void smp_core99_cypress_tb_freeze(int freeze) static void smp_core99_cypress_tb_freeze(int freeze)
{ {
...@@ -447,7 +493,8 @@ static void smp_core99_cypress_tb_freeze(int freeze) ...@@ -447,7 +493,8 @@ static void smp_core99_cypress_tb_freeze(int freeze)
/* Strangely, the device-tree says address is 0xd2, but darwin /* Strangely, the device-tree says address is 0xd2, but darwin
* accesses 0xd0 ... * accesses 0xd0 ...
*/ */
pmac_low_i2c_setmode(pmac_tb_clock_chip_host, pmac_low_i2c_mode_combined); pmac_low_i2c_setmode(pmac_tb_clock_chip_host,
pmac_low_i2c_mode_combined);
rc = pmac_low_i2c_xfer(pmac_tb_clock_chip_host, rc = pmac_low_i2c_xfer(pmac_tb_clock_chip_host,
0xd0 | pmac_low_i2c_read, 0xd0 | pmac_low_i2c_read,
0x81, &data, 1); 0x81, &data, 1);
...@@ -475,7 +522,8 @@ static void smp_core99_pulsar_tb_freeze(int freeze) ...@@ -475,7 +522,8 @@ static void smp_core99_pulsar_tb_freeze(int freeze)
u8 data; u8 data;
int rc; int rc;
pmac_low_i2c_setmode(pmac_tb_clock_chip_host, pmac_low_i2c_mode_combined); pmac_low_i2c_setmode(pmac_tb_clock_chip_host,
pmac_low_i2c_mode_combined);
rc = pmac_low_i2c_xfer(pmac_tb_clock_chip_host, rc = pmac_low_i2c_xfer(pmac_tb_clock_chip_host,
pmac_tb_pulsar_addr | pmac_low_i2c_read, pmac_tb_pulsar_addr | pmac_low_i2c_read,
0x2e, &data, 1); 0x2e, &data, 1);
...@@ -496,54 +544,14 @@ static void smp_core99_pulsar_tb_freeze(int freeze) ...@@ -496,54 +544,14 @@ static void smp_core99_pulsar_tb_freeze(int freeze)
} }
} }
static void __init smp_core99_setup_i2c_hwsync(int ncpus)
static void smp_core99_give_timebase(void)
{
/* Open i2c bus for synchronous access */
if (pmac_low_i2c_open(pmac_tb_clock_chip_host, 0))
panic("Can't open i2c for TB sync !\n");
spin_lock(&timebase_lock);
(*pmac_tb_freeze)(1);
mb();
timebase = get_tb();
spin_unlock(&timebase_lock);
while (timebase)
barrier();
spin_lock(&timebase_lock);
(*pmac_tb_freeze)(0);
spin_unlock(&timebase_lock);
/* Close i2c bus */
pmac_low_i2c_close(pmac_tb_clock_chip_host);
}
static void __devinit smp_core99_take_timebase(void)
{
while (!timebase)
barrier();
spin_lock(&timebase_lock);
set_tb(timebase >> 32, timebase & 0xffffffff);
timebase = 0;
spin_unlock(&timebase_lock);
}
static void __init smp_core99_setup(int ncpus)
{ {
struct device_node *cc = NULL; struct device_node *cc = NULL;
struct device_node *p; struct device_node *p;
const char *name = NULL;
u32 *reg; u32 *reg;
int ok; int ok;
/* HW sync only on these platforms */
if (!machine_is_compatible("PowerMac7,2") &&
!machine_is_compatible("PowerMac7,3") &&
!machine_is_compatible("RackMac3,1"))
return;
/* Look for the clock chip */ /* Look for the clock chip */
while ((cc = of_find_node_by_name(cc, "i2c-hwclock")) != NULL) { while ((cc = of_find_node_by_name(cc, "i2c-hwclock")) != NULL) {
p = of_get_parent(cc); p = of_get_parent(cc);
...@@ -561,114 +569,64 @@ static void __init smp_core99_setup(int ncpus) ...@@ -561,114 +569,64 @@ static void __init smp_core99_setup(int ncpus)
if (device_is_compatible(cc, "pulsar-legacy-slewing")) { if (device_is_compatible(cc, "pulsar-legacy-slewing")) {
pmac_tb_freeze = smp_core99_pulsar_tb_freeze; pmac_tb_freeze = smp_core99_pulsar_tb_freeze;
pmac_tb_pulsar_addr = 0xd2; pmac_tb_pulsar_addr = 0xd2;
printk(KERN_INFO "Timebase clock is Pulsar chip\n"); name = "Pulsar";
} else if (device_is_compatible(cc, "cy28508")) { } else if (device_is_compatible(cc, "cy28508")) {
pmac_tb_freeze = smp_core99_cypress_tb_freeze; pmac_tb_freeze = smp_core99_cypress_tb_freeze;
printk(KERN_INFO "Timebase clock is Cypress chip\n"); name = "Cypress";
} }
break; break;
case 0xd4: case 0xd4:
pmac_tb_freeze = smp_core99_pulsar_tb_freeze; pmac_tb_freeze = smp_core99_pulsar_tb_freeze;
pmac_tb_pulsar_addr = 0xd4; pmac_tb_pulsar_addr = 0xd4;
printk(KERN_INFO "Timebase clock is Pulsar chip\n"); name = "Pulsar";
break;
}
if (pmac_tb_freeze != NULL)
break; break;
} }
if (pmac_tb_freeze != NULL) { if (pmac_tb_freeze != NULL) {
pmac_tb_clock_chip_host = of_get_parent(cc); struct device_node *p = of_get_parent(cc);
of_node_put(cc); of_node_put(cc);
break; while(p && strcmp(p->type, "i2c")) {
cc = of_get_parent(p);
of_node_put(p);
p = cc;
} }
if (p == NULL)
goto no_i2c_sync;
/* Open i2c bus for synchronous access */
if (pmac_low_i2c_open(p, 0)) {
printk(KERN_ERR "Failed top open i2c bus %s for clock"
" sync, fallback to software sync !\n",
p->full_name);
of_node_put(p);
goto no_i2c_sync;
} }
if (pmac_tb_freeze == NULL) { pmac_tb_clock_chip_host = p;
smp_ops->give_timebase = smp_generic_give_timebase; printk(KERN_INFO "Processor timebase sync using %s i2c clock\n",
smp_ops->take_timebase = smp_generic_take_timebase; name);
return;
} }
no_i2c_sync:
pmac_tb_freeze = NULL;
} }
/* nothing to do here, caches are already set up by service processor */ #endif /* CONFIG_PPC64 */
static inline void __devinit core99_init_caches(int cpu)
{
}
#else /* CONFIG_PPC64 */
/* /*
* SMP G4 powermacs use a GPIO to enable/disable the timebase. * SMP G4 and newer G5 use a GPIO to enable/disable the timebase.
*/ */
static unsigned int core99_tb_gpio; /* Timebase freeze GPIO */ static unsigned int core99_tb_gpio; /* Timebase freeze GPIO */
static unsigned int pri_tb_hi, pri_tb_lo; static void smp_core99_gpio_tb_freeze(int freeze)
static unsigned int pri_tb_stamp;
/* not __init, called in sleep/wakeup code */
void smp_core99_give_timebase(void)
{ {
unsigned long flags; if (freeze)
unsigned int t;
/* wait for the secondary to be in take_timebase */
for (t = 100000; t > 0 && !sec_tb_reset; --t)
udelay(10);
if (!sec_tb_reset) {
printk(KERN_WARNING "Timeout waiting sync on second CPU\n");
return;
}
/* freeze the timebase and read it */
/* disable interrupts so the timebase is disabled for the
shortest possible time */
local_irq_save(flags);
pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, core99_tb_gpio, 4); pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, core99_tb_gpio, 4);
pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, core99_tb_gpio, 0); else
mb();
pri_tb_hi = get_tbu();
pri_tb_lo = get_tbl();
pri_tb_stamp = last_jiffy_stamp(smp_processor_id());
mb();
/* tell the secondary we're ready */
sec_tb_reset = 2;
mb();
/* wait for the secondary to have taken it */
/* note: can't use udelay here, since it needs the timebase running */
for (t = 10000000; t > 0 && sec_tb_reset; --t)
barrier();
if (sec_tb_reset)
/* XXX BUG_ON here? */
printk(KERN_WARNING "Timeout waiting sync(2) on second CPU\n");
/* Now, restart the timebase by leaving the GPIO to an open collector */
pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, core99_tb_gpio, 0); pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, core99_tb_gpio, 0);
pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, core99_tb_gpio, 0); pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, core99_tb_gpio, 0);
local_irq_restore(flags);
}
/* not __init, called in sleep/wakeup code */
void smp_core99_take_timebase(void)
{
unsigned long flags;
/* tell the primary we're here */
sec_tb_reset = 1;
mb();
/* wait for the primary to set pri_tb_hi/lo */
while (sec_tb_reset < 2)
mb();
/* set our stuff the same as the primary */
local_irq_save(flags);
set_dec(1);
set_tb(pri_tb_hi, pri_tb_lo);
last_jiffy_stamp(smp_processor_id()) = pri_tb_stamp;
mb();
/* tell the primary we're done */
sec_tb_reset = 0;
mb();
local_irq_restore(flags);
} }
/* L2 and L3 cache settings to pass from CPU0 to CPU1 on G4 cpus */ /* L2 and L3 cache settings to pass from CPU0 to CPU1 on G4 cpus */
...@@ -677,6 +635,7 @@ volatile static long int core99_l3_cache; ...@@ -677,6 +635,7 @@ volatile static long int core99_l3_cache;
static void __devinit core99_init_caches(int cpu) static void __devinit core99_init_caches(int cpu)
{ {
#ifndef CONFIG_PPC64
if (!cpu_has_feature(CPU_FTR_L2CR)) if (!cpu_has_feature(CPU_FTR_L2CR))
return; return;
...@@ -702,29 +661,79 @@ static void __devinit core99_init_caches(int cpu) ...@@ -702,29 +661,79 @@ static void __devinit core99_init_caches(int cpu)
_set_L3CR(core99_l3_cache); _set_L3CR(core99_l3_cache);
printk("CPU%d: L3CR set to %lx\n", cpu, core99_l3_cache); printk("CPU%d: L3CR set to %lx\n", cpu, core99_l3_cache);
} }
#endif /* !CONFIG_PPC64 */
} }
static void __init smp_core99_setup(int ncpus) static void __init smp_core99_setup(int ncpus)
{ {
#ifdef CONFIG_PPC64
/* i2c based HW sync on some G5s */
if (machine_is_compatible("PowerMac7,2") ||
machine_is_compatible("PowerMac7,3") ||
machine_is_compatible("RackMac3,1"))
smp_core99_setup_i2c_hwsync(ncpus);
/* GPIO based HW sync on recent G5s */
if (pmac_tb_freeze == NULL) {
struct device_node *np =
of_find_node_by_name(NULL, "timebase-enable");
u32 *reg = (u32 *)get_property(np, "reg", NULL);
if (np && reg && !strcmp(np->type, "gpio")) {
core99_tb_gpio = *reg;
if (core99_tb_gpio < 0x50)
core99_tb_gpio += 0x50;
pmac_tb_freeze = smp_core99_gpio_tb_freeze;
printk(KERN_INFO "Processor timebase sync using"
" GPIO 0x%02x\n", core99_tb_gpio);
}
}
#else /* CONFIG_PPC64 */
/* GPIO based HW sync on ppc32 Core99 */
if (pmac_tb_freeze == NULL && !machine_is_compatible("MacRISC4")) {
struct device_node *cpu; struct device_node *cpu;
u32 *tbprop = NULL; u32 *tbprop = NULL;
int i;
core99_tb_gpio = KL_GPIO_TB_ENABLE; /* default value */ core99_tb_gpio = KL_GPIO_TB_ENABLE; /* default value */
cpu = of_find_node_by_type(NULL, "cpu"); cpu = of_find_node_by_type(NULL, "cpu");
if (cpu != NULL) { if (cpu != NULL) {
tbprop = (u32 *)get_property(cpu, "timebase-enable", NULL); tbprop = (u32 *)get_property(cpu, "timebase-enable",
NULL);
if (tbprop) if (tbprop)
core99_tb_gpio = *tbprop; core99_tb_gpio = *tbprop;
of_node_put(cpu); of_node_put(cpu);
} }
pmac_tb_freeze = smp_core99_gpio_tb_freeze;
printk(KERN_INFO "Processor timebase sync using"
" GPIO 0x%02x\n", core99_tb_gpio);
}
#endif /* CONFIG_PPC64 */
/* No timebase sync, fallback to software */
if (pmac_tb_freeze == NULL) {
smp_ops->give_timebase = smp_generic_give_timebase;
smp_ops->take_timebase = smp_generic_take_timebase;
printk(KERN_INFO "Processor timebase sync using software\n");
}
#ifndef CONFIG_PPC64
{
int i;
/* XXX should get this from reg properties */ /* XXX should get this from reg properties */
for (i = 1; i < ncpus; ++i) for (i = 1; i < ncpus; ++i)
smp_hw_index[i] = i; smp_hw_index[i] = i;
}
#endif
/* 32 bits SMP can't NAP */
if (!machine_is_compatible("MacRISC4"))
powersave_nap = 0; powersave_nap = 0;
} }
#endif
static int __init smp_core99_probe(void) static int __init smp_core99_probe(void)
{ {
...@@ -803,17 +812,25 @@ static void __devinit smp_core99_setup_cpu(int cpu_nr) ...@@ -803,17 +812,25 @@ static void __devinit smp_core99_setup_cpu(int cpu_nr)
mpic_setup_this_cpu(); mpic_setup_this_cpu();
if (cpu_nr == 0) { if (cpu_nr == 0) {
#ifdef CONFIG_POWER4 #ifdef CONFIG_PPC64
extern void g5_phy_disable_cpu1(void); extern void g5_phy_disable_cpu1(void);
/* Close i2c bus if it was used for tb sync */
if (pmac_tb_clock_chip_host) {
pmac_low_i2c_close(pmac_tb_clock_chip_host);
pmac_tb_clock_chip_host = NULL;
}
/* If we didn't start the second CPU, we must take /* If we didn't start the second CPU, we must take
* it off the bus * it off the bus
*/ */
if (machine_is_compatible("MacRISC4") && if (machine_is_compatible("MacRISC4") &&
num_online_cpus() < 2) num_online_cpus() < 2)
g5_phy_disable_cpu1(); g5_phy_disable_cpu1();
#endif /* CONFIG_POWER4 */ #endif /* CONFIG_PPC64 */
if (ppc_md.progress) ppc_md.progress("core99_setup_cpu 0 done", 0x349);
if (ppc_md.progress)
ppc_md.progress("core99_setup_cpu 0 done", 0x349);
} }
} }
......
arch/powerpc/sysdev/Makefile
View file @ 1beb6a7d
...@@ -4,6 +4,6 @@ obj-$(CONFIG_PPC_I8259) += i8259.o ...@@ -4,6 +4,6 @@ obj-$(CONFIG_PPC_I8259) += i8259.o
obj-$(CONFIG_PPC_MPC106) += grackle.o obj-$(CONFIG_PPC_MPC106) += grackle.o
obj-$(CONFIG_BOOKE) += dcr.o obj-$(CONFIG_BOOKE) += dcr.o
obj-$(CONFIG_40x) += dcr.o obj-$(CONFIG_40x) += dcr.o
obj-$(CONFIG_U3_DART) += u3_iommu.o obj-$(CONFIG_U3_DART) += dart_iommu.o
obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o
obj-$(CONFIG_83xx) += ipic.o obj-$(CONFIG_83xx) += ipic.o
arch/powerpc/sysdev/dart.h
View file @ 1beb6a7d
...@@ -20,29 +20,44 @@ ...@@ -20,29 +20,44 @@
#define _POWERPC_SYSDEV_DART_H #define _POWERPC_SYSDEV_DART_H
/* physical base of DART registers */
#define DART_BASE 0xf8033000UL
/* Offset from base to control register */ /* Offset from base to control register */
#define DARTCNTL 0 #define DART_CNTL 0
/* Offset from base to exception register */ /* Offset from base to exception register */
#define DARTEXCP 0x10 #define DART_EXCP_U3 0x10
/* Offset from base to TLB tag registers */ /* Offset from base to TLB tag registers */
#define DARTTAG 0x1000 #define DART_TAGS_U3 0x1000
/* U4 registers */
#define DART_BASE_U4 0x10
#define DART_SIZE_U4 0x20
#define DART_EXCP_U4 0x30
#define DART_TAGS_U4 0x1000
/* Control Register fields */ /* Control Register fields */
/* base address of table (pfn) */ /* U3 registers */
#define DARTCNTL_BASE_MASK 0xfffff #define DART_CNTL_U3_BASE_MASK 0xfffff
#define DARTCNTL_BASE_SHIFT 12 #define DART_CNTL_U3_BASE_SHIFT 12
#define DART_CNTL_U3_FLUSHTLB 0x400
#define DART_CNTL_U3_ENABLE 0x200
#define DART_CNTL_U3_SIZE_MASK 0x1ff
#define DART_CNTL_U3_SIZE_SHIFT 0
/* U4 registers */
#define DART_BASE_U4_BASE_MASK 0xffffff
#define DART_BASE_U4_BASE_SHIFT 0
#define DART_CNTL_U4_FLUSHTLB 0x20000000
#define DART_CNTL_U4_ENABLE 0x80000000
#define DART_SIZE_U4_SIZE_MASK 0x1fff
#define DART_SIZE_U4_SIZE_SHIFT 0
#define DART_REG(r) (dart + ((r) >> 2))
#define DART_IN(r) (in_be32(DART_REG(r)))
#define DART_OUT(r,v) (out_be32(DART_REG(r), (v)))
#define DARTCNTL_FLUSHTLB 0x400
#define DARTCNTL_ENABLE 0x200
/* size of table in pages */ /* size of table in pages */
#define DARTCNTL_SIZE_MASK 0x1ff
#define DARTCNTL_SIZE_SHIFT 0
/* DART table fields */ /* DART table fields */
......
arch/powerpc/sysdev/u3_iommu.c → arch/powerpc/sysdev/dart_iommu.c
View file @ 1beb6a7d
/* /*
* arch/powerpc/sysdev/u3_iommu.c * arch/powerpc/sysdev/dart_iommu.c
* *
* Copyright (C) 2004 Olof Johansson <olof@lixom.net>, IBM Corporation * Copyright (C) 2004 Olof Johansson <olof@lixom.net>, IBM Corporation
* Copyright (C) 2005 Benjamin Herrenschmidt <benh@kernel.crashing.org>,
* IBM Corporation
* *
* Based on pSeries_iommu.c: * Based on pSeries_iommu.c:
* Copyright (C) 2001 Mike Corrigan & Dave Engebretsen, IBM Corporation * Copyright (C) 2001 Mike Corrigan & Dave Engebretsen, IBM Corporation
* Copyright (C) 2004 Olof Johansson <olof@lixom.net>, IBM Corporation * Copyright (C) 2004 Olof Johansson <olof@lixom.net>, IBM Corporation
* *
* Dynamic DMA mapping support, Apple U3 & IBM CPC925 "DART" iommu. * Dynamic DMA mapping support, Apple U3, U4 & IBM CPC925 "DART" iommu.
* *
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -57,21 +59,22 @@ static unsigned long dart_tablesize; ...@@ -57,21 +59,22 @@ static unsigned long dart_tablesize;
static u32 *dart_vbase; static u32 *dart_vbase;
/* Mapped base address for the dart */ /* Mapped base address for the dart */
static unsigned int *dart; static unsigned int *__iomem dart;
/* Dummy val that entries are set to when unused */ /* Dummy val that entries are set to when unused */
static unsigned int dart_emptyval; static unsigned int dart_emptyval;
static struct iommu_table iommu_table_u3; static struct iommu_table iommu_table_dart;
static int iommu_table_u3_inited; static int iommu_table_dart_inited;
static int dart_dirty; static int dart_dirty;
static int dart_is_u4;
#define DBG(...) #define DBG(...)
static inline void dart_tlb_invalidate_all(void) static inline void dart_tlb_invalidate_all(void)
{ {
unsigned long l = 0; unsigned long l = 0;
unsigned int reg; unsigned int reg, inv_bit;
unsigned long limit; unsigned long limit;
DBG("dart: flush\n"); DBG("dart: flush\n");
...@@ -85,25 +88,24 @@ static inline void dart_tlb_invalidate_all(void) ...@@ -85,25 +88,24 @@ static inline void dart_tlb_invalidate_all(void)
limit = 0; limit = 0;
inv_bit = dart_is_u4 ? DART_CNTL_U4_FLUSHTLB : DART_CNTL_U3_FLUSHTLB;
retry: retry:
reg = in_be32((unsigned int *)dart+DARTCNTL);
reg |= DARTCNTL_FLUSHTLB;
out_be32((unsigned int *)dart+DARTCNTL, reg);
l = 0; l = 0;
while ((in_be32((unsigned int *)dart+DARTCNTL) & DARTCNTL_FLUSHTLB) && reg = DART_IN(DART_CNTL);
l < (1L<<limit)) { reg |= inv_bit;
DART_OUT(DART_CNTL, reg);
while ((DART_IN(DART_CNTL) & inv_bit) && l < (1L << limit))
l++; l++;
} if (l == (1L << limit)) {
if (l == (1L<<limit)) {
if (limit < 4) { if (limit < 4) {
limit++; limit++;
reg = in_be32((unsigned int *)dart+DARTCNTL); reg = DART_IN(DART_CNTL);
reg &= ~DARTCNTL_FLUSHTLB; reg &= ~inv_bit;
out_be32((unsigned int *)dart+DARTCNTL, reg); DART_OUT(DART_CNTL, reg);
goto retry; goto retry;
} else } else
panic("U3-DART: TLB did not flush after waiting a long " panic("DART: TLB did not flush after waiting a long "
"time. Buggy U3 ?"); "time. Buggy U3 ?");
} }
} }
...@@ -168,20 +170,25 @@ static void dart_free(struct iommu_table *tbl, long index, long npages) ...@@ -168,20 +170,25 @@ static void dart_free(struct iommu_table *tbl, long index, long npages)
static int dart_init(struct device_node *dart_node) static int dart_init(struct device_node *dart_node)
{ {
unsigned int regword;
unsigned int i; unsigned int i;
unsigned long tmp; unsigned long tmp, base, size;
struct resource r;
if (dart_tablebase == 0 || dart_tablesize == 0) { if (dart_tablebase == 0 || dart_tablesize == 0) {
printk(KERN_INFO "U3-DART: table not allocated, using direct DMA\n"); printk(KERN_INFO "DART: table not allocated, using "
"direct DMA\n");
return -ENODEV; return -ENODEV;
} }
if (of_address_to_resource(dart_node, 0, &r))
panic("DART: can't get register base ! ");
/* Make sure nothing from the DART range remains in the CPU cache /* Make sure nothing from the DART range remains in the CPU cache
* from a previous mapping that existed before the kernel took * from a previous mapping that existed before the kernel took
* over * over
*/ */
flush_dcache_phys_range(dart_tablebase, dart_tablebase + dart_tablesize); flush_dcache_phys_range(dart_tablebase,
dart_tablebase + dart_tablesize);
/* Allocate a spare page to map all invalid DART pages. We need to do /* Allocate a spare page to map all invalid DART pages. We need to do
* that to work around what looks like a problem with the HT bridge * that to work around what looks like a problem with the HT bridge
...@@ -189,21 +196,16 @@ static int dart_init(struct device_node *dart_node) ...@@ -189,21 +196,16 @@ static int dart_init(struct device_node *dart_node)
*/ */
tmp = lmb_alloc(DART_PAGE_SIZE, DART_PAGE_SIZE); tmp = lmb_alloc(DART_PAGE_SIZE, DART_PAGE_SIZE);
if (!tmp) if (!tmp)
panic("U3-DART: Cannot allocate spare page!"); panic("DART: Cannot allocate spare page!");
dart_emptyval = DARTMAP_VALID | ((tmp >> DART_PAGE_SHIFT) & DARTMAP_RPNMASK); dart_emptyval = DARTMAP_VALID | ((tmp >> DART_PAGE_SHIFT) &
DARTMAP_RPNMASK);
/* Map in DART registers. FIXME: Use device node to get base address */ /* Map in DART registers */
dart = ioremap(DART_BASE, 0x7000); dart = ioremap(r.start, r.end - r.start + 1);
if (dart == NULL) if (dart == NULL)
panic("U3-DART: Cannot map registers!"); panic("DART: Cannot map registers!");
/* Set initial control register contents: table base, /* Map in DART table */
* table size and enable bit
*/
regword = DARTCNTL_ENABLE |
((dart_tablebase >> DART_PAGE_SHIFT) << DARTCNTL_BASE_SHIFT) |
(((dart_tablesize >> DART_PAGE_SHIFT) & DARTCNTL_SIZE_MASK)
<< DARTCNTL_SIZE_SHIFT);
dart_vbase = ioremap(virt_to_abs(dart_tablebase), dart_tablesize); dart_vbase = ioremap(virt_to_abs(dart_tablebase), dart_tablesize);
/* Fill initial table */ /* Fill initial table */
...@@ -211,36 +213,50 @@ static int dart_init(struct device_node *dart_node) ...@@ -211,36 +213,50 @@ static int dart_init(struct device_node *dart_node)
dart_vbase[i] = dart_emptyval; dart_vbase[i] = dart_emptyval;
/* Initialize DART with table base and enable it. */ /* Initialize DART with table base and enable it. */
out_be32((unsigned int *)dart, regword); base = dart_tablebase >> DART_PAGE_SHIFT;
size = dart_tablesize >> DART_PAGE_SHIFT;
if (dart_is_u4) {
BUG_ON(size & ~DART_SIZE_U4_SIZE_MASK);
DART_OUT(DART_BASE_U4, base);
DART_OUT(DART_SIZE_U4, size);
DART_OUT(DART_CNTL, DART_CNTL_U4_ENABLE);
} else {
BUG_ON(size & ~DART_CNTL_U3_SIZE_MASK);
DART_OUT(DART_CNTL,
DART_CNTL_U3_ENABLE |
(base << DART_CNTL_U3_BASE_SHIFT) |
(size << DART_CNTL_U3_SIZE_SHIFT));
}
/* Invalidate DART to get rid of possible stale TLBs */ /* Invalidate DART to get rid of possible stale TLBs */
dart_tlb_invalidate_all(); dart_tlb_invalidate_all();
printk(KERN_INFO "U3/CPC925 DART IOMMU initialized\n"); printk(KERN_INFO "DART IOMMU initialized for %s type chipset\n",
dart_is_u4 ? "U4" : "U3");
return 0; return 0;
} }
static void iommu_table_u3_setup(void) static void iommu_table_dart_setup(void)
{ {
iommu_table_u3.it_busno = 0; iommu_table_dart.it_busno = 0;
iommu_table_u3.it_offset = 0; iommu_table_dart.it_offset = 0;
/* it_size is in number of entries */ /* it_size is in number of entries */
iommu_table_u3.it_size = (dart_tablesize / sizeof(u32)) >> DART_PAGE_FACTOR; iommu_table_dart.it_size = (dart_tablesize / sizeof(u32)) >> DART_PAGE_FACTOR;
/* Initialize the common IOMMU code */ /* Initialize the common IOMMU code */
iommu_table_u3.it_base = (unsigned long)dart_vbase; iommu_table_dart.it_base = (unsigned long)dart_vbase;
iommu_table_u3.it_index = 0; iommu_table_dart.it_index = 0;
iommu_table_u3.it_blocksize = 1; iommu_table_dart.it_blocksize = 1;
iommu_init_table(&iommu_table_u3); iommu_init_table(&iommu_table_dart);
/* Reserve the last page of the DART to avoid possible prefetch /* Reserve the last page of the DART to avoid possible prefetch
* past the DART mapped area * past the DART mapped area
*/ */
set_bit(iommu_table_u3.it_size - 1, iommu_table_u3.it_map); set_bit(iommu_table_dart.it_size - 1, iommu_table_dart.it_map);
} }
static void iommu_dev_setup_u3(struct pci_dev *dev) static void iommu_dev_setup_dart(struct pci_dev *dev)
{ {
struct device_node *dn; struct device_node *dn;
...@@ -254,35 +270,39 @@ static void iommu_dev_setup_u3(struct pci_dev *dev) ...@@ -254,35 +270,39 @@ static void iommu_dev_setup_u3(struct pci_dev *dev)
dn = pci_device_to_OF_node(dev); dn = pci_device_to_OF_node(dev);
if (dn) if (dn)
PCI_DN(dn)->iommu_table = &iommu_table_u3; PCI_DN(dn)->iommu_table = &iommu_table_dart;
} }
static void iommu_bus_setup_u3(struct pci_bus *bus) static void iommu_bus_setup_dart(struct pci_bus *bus)
{ {
struct device_node *dn; struct device_node *dn;
if (!iommu_table_u3_inited) { if (!iommu_table_dart_inited) {
iommu_table_u3_inited = 1; iommu_table_dart_inited = 1;
iommu_table_u3_setup(); iommu_table_dart_setup();
} }
dn = pci_bus_to_OF_node(bus); dn = pci_bus_to_OF_node(bus);
if (dn) if (dn)
PCI_DN(dn)->iommu_table = &iommu_table_u3; PCI_DN(dn)->iommu_table = &iommu_table_dart;
} }
static void iommu_dev_setup_null(struct pci_dev *dev) { } static void iommu_dev_setup_null(struct pci_dev *dev) { }
static void iommu_bus_setup_null(struct pci_bus *bus) { } static void iommu_bus_setup_null(struct pci_bus *bus) { }
void iommu_init_early_u3(void) void iommu_init_early_dart(void)
{ {
struct device_node *dn; struct device_node *dn;
/* Find the DART in the device-tree */ /* Find the DART in the device-tree */
dn = of_find_compatible_node(NULL, "dart", "u3-dart"); dn = of_find_compatible_node(NULL, "dart", "u3-dart");
if (dn == NULL) {
dn = of_find_compatible_node(NULL, "dart", "u4-dart");
if (dn == NULL) if (dn == NULL)
return; goto bail;
dart_is_u4 = 1;
}
/* Setup low level TCE operations for the core IOMMU code */ /* Setup low level TCE operations for the core IOMMU code */
ppc_md.tce_build = dart_build; ppc_md.tce_build = dart_build;
...@@ -290,24 +310,27 @@ void iommu_init_early_u3(void) ...@@ -290,24 +310,27 @@ void iommu_init_early_u3(void)
ppc_md.tce_flush = dart_flush; ppc_md.tce_flush = dart_flush;
/* Initialize the DART HW */ /* Initialize the DART HW */
if (dart_init(dn)) { if (dart_init(dn) == 0) {
ppc_md.iommu_dev_setup = iommu_dev_setup_dart;
ppc_md.iommu_bus_setup = iommu_bus_setup_dart;
/* Setup pci_dma ops */
pci_iommu_init();
return;
}
bail:
/* If init failed, use direct iommu and null setup functions */ /* If init failed, use direct iommu and null setup functions */
ppc_md.iommu_dev_setup = iommu_dev_setup_null; ppc_md.iommu_dev_setup = iommu_dev_setup_null;
ppc_md.iommu_bus_setup = iommu_bus_setup_null; ppc_md.iommu_bus_setup = iommu_bus_setup_null;
/* Setup pci_dma ops */ /* Setup pci_dma ops */
pci_direct_iommu_init(); pci_direct_iommu_init();
} else {
ppc_md.iommu_dev_setup = iommu_dev_setup_u3;
ppc_md.iommu_bus_setup = iommu_bus_setup_u3;
/* Setup pci_dma ops */
pci_iommu_init();
}
} }
void __init alloc_u3_dart_table(void) void __init alloc_dart_table(void)
{ {
/* Only reserve DART space if machine has more than 2GB of RAM /* Only reserve DART space if machine has more than 2GB of RAM
* or if requested with iommu=on on cmdline. * or if requested with iommu=on on cmdline.
...@@ -323,5 +346,5 @@ void __init alloc_u3_dart_table(void) ...@@ -323,5 +346,5 @@ void __init alloc_u3_dart_table(void)
dart_tablebase = (unsigned long) dart_tablebase = (unsigned long)
abs_to_virt(lmb_alloc_base(1UL<<24, 1UL<<24, 0x80000000L)); abs_to_virt(lmb_alloc_base(1UL<<24, 1UL<<24, 0x80000000L));
printk(KERN_INFO "U3-DART allocated at: %lx\n", dart_tablebase); printk(KERN_INFO "DART table allocated at: %lx\n", dart_tablebase);
} }
arch/powerpc/sysdev/mpic.c
View file @ 1beb6a7d
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
*/ */
#undef DEBUG #undef DEBUG
#undef DEBUG_IPI
#undef DEBUG_IRQ
#undef DEBUG_LOW
#include <linux/config.h> #include <linux/config.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -168,35 +171,86 @@ static void __init mpic_test_broken_ipi(struct mpic *mpic) ...@@ -168,35 +171,86 @@ static void __init mpic_test_broken_ipi(struct mpic *mpic)
/* Test if an interrupt is sourced from HyperTransport (used on broken U3s) /* Test if an interrupt is sourced from HyperTransport (used on broken U3s)
* to force the edge setting on the MPIC and do the ack workaround. * to force the edge setting on the MPIC and do the ack workaround.
*/ */
static inline int mpic_is_ht_interrupt(struct mpic *mpic, unsigned int source_no) static inline int mpic_is_ht_interrupt(struct mpic *mpic, unsigned int source)
{ {
if (source_no >= 128 || !mpic->fixups) if (source >= 128 || !mpic->fixups)
return 0; return 0;
return mpic->fixups[source_no].base != NULL; return mpic->fixups[source].base != NULL;
} }
static inline void mpic_apic_end_irq(struct mpic *mpic, unsigned int source_no) static inline void mpic_ht_end_irq(struct mpic *mpic, unsigned int source)
{ {
struct mpic_irq_fixup *fixup = &mpic->fixups[source_no]; struct mpic_irq_fixup *fixup = &mpic->fixups[source];
if (fixup->applebase) {
unsigned int soff = (fixup->index >> 3) & ~3;
unsigned int mask = 1U << (fixup->index & 0x1f);
writel(mask, fixup->applebase + soff);
} else {
spin_lock(&mpic->fixup_lock); spin_lock(&mpic->fixup_lock);
writeb(0x11 + 2 * fixup->irq, fixup->base + 2); writeb(0x11 + 2 * fixup->index, fixup->base + 2);
writel(fixup->data, fixup->base + 4); writel(fixup->data, fixup->base + 4);
spin_unlock(&mpic->fixup_lock); spin_unlock(&mpic->fixup_lock);
}
}
static void mpic_startup_ht_interrupt(struct mpic *mpic, unsigned int source,
unsigned int irqflags)
{
struct mpic_irq_fixup *fixup = &mpic->fixups[source];
unsigned long flags;
u32 tmp;
if (fixup->base == NULL)
return;
DBG("startup_ht_interrupt(%u, %u) index: %d\n",
source, irqflags, fixup->index);
spin_lock_irqsave(&mpic->fixup_lock, flags);
/* Enable and configure */
writeb(0x10 + 2 * fixup->index, fixup->base + 2);
tmp = readl(fixup->base + 4);
tmp &= ~(0x23U);
if (irqflags & IRQ_LEVEL)
tmp |= 0x22;
writel(tmp, fixup->base + 4);
spin_unlock_irqrestore(&mpic->fixup_lock, flags);
} }
static void mpic_shutdown_ht_interrupt(struct mpic *mpic, unsigned int source,
unsigned int irqflags)
{
struct mpic_irq_fixup *fixup = &mpic->fixups[source];
unsigned long flags;
u32 tmp;
if (fixup->base == NULL)
return;
DBG("shutdown_ht_interrupt(%u, %u)\n", source, irqflags);
static void __init mpic_scan_ioapic(struct mpic *mpic, u8 __iomem *devbase) /* Disable */
spin_lock_irqsave(&mpic->fixup_lock, flags);
writeb(0x10 + 2 * fixup->index, fixup->base + 2);
tmp = readl(fixup->base + 4);
tmp &= ~1U;
writel(tmp, fixup->base + 4);
spin_unlock_irqrestore(&mpic->fixup_lock, flags);
}
static void __init mpic_scan_ht_pic(struct mpic *mpic, u8 __iomem *devbase,
unsigned int devfn, u32 vdid)
{ {
int i, irq, n; int i, irq, n;
u8 __iomem *base;
u32 tmp; u32 tmp;
u8 pos; u8 pos;
for (pos = readb(devbase + 0x34); pos; pos = readb(devbase + pos + 1)) { for (pos = readb(devbase + PCI_CAPABILITY_LIST); pos != 0;
u8 id = readb(devbase + pos); pos = readb(devbase + pos + PCI_CAP_LIST_NEXT)) {
u8 id = readb(devbase + pos + PCI_CAP_LIST_ID);
if (id == 0x08) { if (id == PCI_CAP_ID_HT_IRQCONF) {
id = readb(devbase + pos + 3); id = readb(devbase + pos + 3);
if (id == 0x80) if (id == 0x80)
break; break;
...@@ -205,33 +259,41 @@ static void __init mpic_scan_ioapic(struct mpic *mpic, u8 __iomem *devbase) ...@@ -205,33 +259,41 @@ static void __init mpic_scan_ioapic(struct mpic *mpic, u8 __iomem *devbase)
if (pos == 0) if (pos == 0)
return; return;
printk(KERN_INFO "mpic: - Workarounds @ %p, pos = 0x%02x\n", devbase, pos); base = devbase + pos;
writeb(0x01, base + 2);
devbase += pos; n = (readl(base + 4) >> 16) & 0xff;
writeb(0x01, devbase + 2); printk(KERN_INFO "mpic: - HT:%02x.%x [0x%02x] vendor %04x device %04x"
n = (readl(devbase + 4) >> 16) & 0xff; " has %d irqs\n",
devfn >> 3, devfn & 0x7, pos, vdid & 0xffff, vdid >> 16, n + 1);
for (i = 0; i <= n; i++) { for (i = 0; i <= n; i++) {
writeb(0x10 + 2 * i, devbase + 2); writeb(0x10 + 2 * i, base + 2);
tmp = readl(devbase + 4); tmp = readl(base + 4);
if ((tmp & 0x21) != 0x20)
continue;
irq = (tmp >> 16) & 0xff; irq = (tmp >> 16) & 0xff;
mpic->fixups[irq].irq = i; DBG("HT PIC index 0x%x, irq 0x%x, tmp: %08x\n", i, irq, tmp);
mpic->fixups[irq].base = devbase; /* mask it , will be unmasked later */
writeb(0x11 + 2 * i, devbase + 2); tmp |= 0x1;
mpic->fixups[irq].data = readl(devbase + 4) | 0x80000000; writel(tmp, base + 4);
mpic->fixups[irq].index = i;
mpic->fixups[irq].base = base;
/* Apple HT PIC has a non-standard way of doing EOIs */
if ((vdid & 0xffff) == 0x106b)
mpic->fixups[irq].applebase = devbase + 0x60;
else
mpic->fixups[irq].applebase = NULL;
writeb(0x11 + 2 * i, base + 2);
mpic->fixups[irq].data = readl(base + 4) | 0x80000000;
} }
} }
static void __init mpic_scan_ioapics(struct mpic *mpic) static void __init mpic_scan_ht_pics(struct mpic *mpic)
{ {
unsigned int devfn; unsigned int devfn;
u8 __iomem *cfgspace; u8 __iomem *cfgspace;
printk(KERN_INFO "mpic: Setting up IO-APICs workarounds for U3\n"); printk(KERN_INFO "mpic: Setting up HT PICs workarounds for U3/U4\n");
/* Allocate fixups array */ /* Allocate fixups array */
mpic->fixups = alloc_bootmem(128 * sizeof(struct mpic_irq_fixup)); mpic->fixups = alloc_bootmem(128 * sizeof(struct mpic_irq_fixup));
...@@ -247,13 +309,14 @@ static void __init mpic_scan_ioapics(struct mpic *mpic) ...@@ -247,13 +309,14 @@ static void __init mpic_scan_ioapics(struct mpic *mpic)
cfgspace = ioremap(0xf2000000, 0x10000); cfgspace = ioremap(0xf2000000, 0x10000);
BUG_ON(cfgspace == NULL); BUG_ON(cfgspace == NULL);
/* Now we scan all slots. We do a very quick scan, we read the header type, /* Now we scan all slots. We do a very quick scan, we read the header
* vendor ID and device ID only, that's plenty enough * type, vendor ID and device ID only, that's plenty enough
*/ */
for (devfn = 0; devfn < 0x100; devfn++) { for (devfn = 0; devfn < 0x100; devfn++) {
u8 __iomem *devbase = cfgspace + (devfn << 8); u8 __iomem *devbase = cfgspace + (devfn << 8);
u8 hdr_type = readb(devbase + PCI_HEADER_TYPE); u8 hdr_type = readb(devbase + PCI_HEADER_TYPE);
u32 l = readl(devbase + PCI_VENDOR_ID); u32 l = readl(devbase + PCI_VENDOR_ID);
u16 s;
DBG("devfn %x, l: %x\n", devfn, l); DBG("devfn %x, l: %x\n", devfn, l);
...@@ -261,8 +324,12 @@ static void __init mpic_scan_ioapics(struct mpic *mpic) ...@@ -261,8 +324,12 @@ static void __init mpic_scan_ioapics(struct mpic *mpic)
if (l == 0xffffffff || l == 0x00000000 || if (l == 0xffffffff || l == 0x00000000 ||
l == 0x0000ffff || l == 0xffff0000) l == 0x0000ffff || l == 0xffff0000)
goto next; goto next;
/* Check if is supports capability lists */
s = readw(devbase + PCI_STATUS);
if (!(s & PCI_STATUS_CAP_LIST))
goto next;
mpic_scan_ioapic(mpic, devbase); mpic_scan_ht_pic(mpic, devbase, devfn, l);
next: next:
/* next device, if function 0 */ /* next device, if function 0 */
...@@ -363,6 +430,31 @@ static void mpic_enable_irq(unsigned int irq) ...@@ -363,6 +430,31 @@ static void mpic_enable_irq(unsigned int irq)
break; break;
} }
} while(mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) & MPIC_VECPRI_MASK); } while(mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) & MPIC_VECPRI_MASK);
#ifdef CONFIG_MPIC_BROKEN_U3
if (mpic->flags & MPIC_BROKEN_U3) {
unsigned int src = irq - mpic->irq_offset;
if (mpic_is_ht_interrupt(mpic, src) &&
(irq_desc[irq].status & IRQ_LEVEL))
mpic_ht_end_irq(mpic, src);
}
#endif /* CONFIG_MPIC_BROKEN_U3 */
}
static unsigned int mpic_startup_irq(unsigned int irq)
{
#ifdef CONFIG_MPIC_BROKEN_U3
struct mpic *mpic = mpic_from_irq(irq);
unsigned int src = irq - mpic->irq_offset;
if (mpic_is_ht_interrupt(mpic, src))
mpic_startup_ht_interrupt(mpic, src, irq_desc[irq].status);
#endif /* CONFIG_MPIC_BROKEN_U3 */
mpic_enable_irq(irq);
return 0;
} }
static void mpic_disable_irq(unsigned int irq) static void mpic_disable_irq(unsigned int irq)
...@@ -386,12 +478,27 @@ static void mpic_disable_irq(unsigned int irq) ...@@ -386,12 +478,27 @@ static void mpic_disable_irq(unsigned int irq)
} while(!(mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) & MPIC_VECPRI_MASK)); } while(!(mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) & MPIC_VECPRI_MASK));
} }
static void mpic_shutdown_irq(unsigned int irq)
{
#ifdef CONFIG_MPIC_BROKEN_U3
struct mpic *mpic = mpic_from_irq(irq);
unsigned int src = irq - mpic->irq_offset;
if (mpic_is_ht_interrupt(mpic, src))
mpic_shutdown_ht_interrupt(mpic, src, irq_desc[irq].status);
#endif /* CONFIG_MPIC_BROKEN_U3 */
mpic_disable_irq(irq);
}
static void mpic_end_irq(unsigned int irq) static void mpic_end_irq(unsigned int irq)
{ {
struct mpic *mpic = mpic_from_irq(irq); struct mpic *mpic = mpic_from_irq(irq);
#ifdef DEBUG_IRQ
DBG("%s: end_irq: %d\n", mpic->name, irq); DBG("%s: end_irq: %d\n", mpic->name, irq);
#endif
/* We always EOI on end_irq() even for edge interrupts since that /* We always EOI on end_irq() even for edge interrupts since that
* should only lower the priority, the MPIC should have properly * should only lower the priority, the MPIC should have properly
* latched another edge interrupt coming in anyway * latched another edge interrupt coming in anyway
...@@ -400,8 +507,9 @@ static void mpic_end_irq(unsigned int irq) ...@@ -400,8 +507,9 @@ static void mpic_end_irq(unsigned int irq)
#ifdef CONFIG_MPIC_BROKEN_U3 #ifdef CONFIG_MPIC_BROKEN_U3
if (mpic->flags & MPIC_BROKEN_U3) { if (mpic->flags & MPIC_BROKEN_U3) {
unsigned int src = irq - mpic->irq_offset; unsigned int src = irq - mpic->irq_offset;
if (mpic_is_ht_interrupt(mpic, src)) if (mpic_is_ht_interrupt(mpic, src) &&
mpic_apic_end_irq(mpic, src); (irq_desc[irq].status & IRQ_LEVEL))
mpic_ht_end_irq(mpic, src);
} }
#endif /* CONFIG_MPIC_BROKEN_U3 */ #endif /* CONFIG_MPIC_BROKEN_U3 */
...@@ -482,6 +590,8 @@ struct mpic * __init mpic_alloc(unsigned long phys_addr, ...@@ -482,6 +590,8 @@ struct mpic * __init mpic_alloc(unsigned long phys_addr,
mpic->name = name; mpic->name = name;
mpic->hc_irq.typename = name; mpic->hc_irq.typename = name;
mpic->hc_irq.startup = mpic_startup_irq;
mpic->hc_irq.shutdown = mpic_shutdown_irq;
mpic->hc_irq.enable = mpic_enable_irq; mpic->hc_irq.enable = mpic_enable_irq;
mpic->hc_irq.disable = mpic_disable_irq; mpic->hc_irq.disable = mpic_disable_irq;
mpic->hc_irq.end = mpic_end_irq; mpic->hc_irq.end = mpic_end_irq;
...@@ -650,10 +760,10 @@ void __init mpic_init(struct mpic *mpic) ...@@ -650,10 +760,10 @@ void __init mpic_init(struct mpic *mpic)
mpic->irq_count = mpic->num_sources; mpic->irq_count = mpic->num_sources;
#ifdef CONFIG_MPIC_BROKEN_U3 #ifdef CONFIG_MPIC_BROKEN_U3
/* Do the ioapic fixups on U3 broken mpic */ /* Do the HT PIC fixups on U3 broken mpic */
DBG("MPIC flags: %x\n", mpic->flags); DBG("MPIC flags: %x\n", mpic->flags);
if ((mpic->flags & MPIC_BROKEN_U3) && (mpic->flags & MPIC_PRIMARY)) if ((mpic->flags & MPIC_BROKEN_U3) && (mpic->flags & MPIC_PRIMARY))
mpic_scan_ioapics(mpic); mpic_scan_ht_pics(mpic);
#endif /* CONFIG_MPIC_BROKEN_U3 */ #endif /* CONFIG_MPIC_BROKEN_U3 */
for (i = 0; i < mpic->num_sources; i++) { for (i = 0; i < mpic->num_sources; i++) {
...@@ -840,7 +950,9 @@ void mpic_send_ipi(unsigned int ipi_no, unsigned int cpu_mask) ...@@ -840,7 +950,9 @@ void mpic_send_ipi(unsigned int ipi_no, unsigned int cpu_mask)
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
#ifdef DEBUG_IPI
DBG("%s: send_ipi(ipi_no: %d)\n", mpic->name, ipi_no); DBG("%s: send_ipi(ipi_no: %d)\n", mpic->name, ipi_no);
#endif
mpic_cpu_write(MPIC_CPU_IPI_DISPATCH_0 + ipi_no * 0x10, mpic_cpu_write(MPIC_CPU_IPI_DISPATCH_0 + ipi_no * 0x10,
mpic_physmask(cpu_mask & cpus_addr(cpu_online_map)[0])); mpic_physmask(cpu_mask & cpus_addr(cpu_online_map)[0]));
...@@ -851,19 +963,28 @@ int mpic_get_one_irq(struct mpic *mpic, struct pt_regs *regs) ...@@ -851,19 +963,28 @@ int mpic_get_one_irq(struct mpic *mpic, struct pt_regs *regs)
u32 irq; u32 irq;
irq = mpic_cpu_read(MPIC_CPU_INTACK) & MPIC_VECPRI_VECTOR_MASK; irq = mpic_cpu_read(MPIC_CPU_INTACK) & MPIC_VECPRI_VECTOR_MASK;
#ifdef DEBUG_LOW
DBG("%s: get_one_irq(): %d\n", mpic->name, irq); DBG("%s: get_one_irq(): %d\n", mpic->name, irq);
#endif
if (mpic->cascade && irq == mpic->cascade_vec) { if (mpic->cascade && irq == mpic->cascade_vec) {
#ifdef DEBUG_LOW
DBG("%s: cascading ...\n", mpic->name); DBG("%s: cascading ...\n", mpic->name);
#endif
irq = mpic->cascade(regs, mpic->cascade_data); irq = mpic->cascade(regs, mpic->cascade_data);
mpic_eoi(mpic); mpic_eoi(mpic);
return irq; return irq;
} }
if (unlikely(irq == MPIC_VEC_SPURRIOUS)) if (unlikely(irq == MPIC_VEC_SPURRIOUS))
return -1; return -1;
if (irq < MPIC_VEC_IPI_0) if (irq < MPIC_VEC_IPI_0) {
#ifdef DEBUG_IRQ
DBG("%s: irq %d\n", mpic->name, irq + mpic->irq_offset);
#endif
return irq + mpic->irq_offset; return irq + mpic->irq_offset;
}
#ifdef DEBUG_IPI
DBG("%s: ipi %d !\n", mpic->name, irq - MPIC_VEC_IPI_0); DBG("%s: ipi %d !\n", mpic->name, irq - MPIC_VEC_IPI_0);
#endif
return irq - MPIC_VEC_IPI_0 + mpic->ipi_offset; return irq - MPIC_VEC_IPI_0 + mpic->ipi_offset;
} }
......
drivers/macintosh/smu.c
View file @ 1beb6a7d
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#undef DEBUG_SMU #undef DEBUG_SMU
#ifdef DEBUG_SMU #ifdef DEBUG_SMU
#define DPRINTK(fmt, args...) do { udbg_printf(KERN_DEBUG fmt , ##args); } while (0) #define DPRINTK(fmt, args...) do { printk(KERN_DEBUG fmt , ##args); } while (0)
#else #else
#define DPRINTK(fmt, args...) do { } while (0) #define DPRINTK(fmt, args...) do { } while (0)
#endif #endif
...@@ -909,10 +909,13 @@ static struct smu_sdbp_header *smu_create_sdb_partition(int id) ...@@ -909,10 +909,13 @@ static struct smu_sdbp_header *smu_create_sdb_partition(int id)
struct property *prop; struct property *prop;
/* First query the partition info */ /* First query the partition info */
DPRINTK("SMU: Query partition infos ... (irq=%d)\n", smu->db_irq);
smu_queue_simple(&cmd, SMU_CMD_PARTITION_COMMAND, 2, smu_queue_simple(&cmd, SMU_CMD_PARTITION_COMMAND, 2,
smu_done_complete, &comp, smu_done_complete, &comp,
SMU_CMD_PARTITION_LATEST, id); SMU_CMD_PARTITION_LATEST, id);
wait_for_completion(&comp); wait_for_completion(&comp);
DPRINTK("SMU: done, status: %d, reply_len: %d\n",
cmd.cmd.status, cmd.cmd.reply_len);
/* Partition doesn't exist (or other error) */ /* Partition doesn't exist (or other error) */
if (cmd.cmd.status != 0 || cmd.cmd.reply_len != 6) if (cmd.cmd.status != 0 || cmd.cmd.reply_len != 6)
...@@ -975,6 +978,8 @@ struct smu_sdbp_header *__smu_get_sdb_partition(int id, unsigned int *size, ...@@ -975,6 +978,8 @@ struct smu_sdbp_header *__smu_get_sdb_partition(int id, unsigned int *size,
sprintf(pname, "sdb-partition-%02x", id); sprintf(pname, "sdb-partition-%02x", id);
DPRINTK("smu_get_sdb_partition(%02x)\n", id);
if (interruptible) { if (interruptible) {
int rc; int rc;
rc = down_interruptible(&smu_part_access); rc = down_interruptible(&smu_part_access);
...@@ -986,6 +991,7 @@ struct smu_sdbp_header *__smu_get_sdb_partition(int id, unsigned int *size, ...@@ -986,6 +991,7 @@ struct smu_sdbp_header *__smu_get_sdb_partition(int id, unsigned int *size,
part = (struct smu_sdbp_header *)get_property(smu->of_node, part = (struct smu_sdbp_header *)get_property(smu->of_node,
pname, size); pname, size);
if (part == NULL) { if (part == NULL) {
DPRINTK("trying to extract from SMU ...\n");
part = smu_create_sdb_partition(id); part = smu_create_sdb_partition(id);
if (part != NULL && size) if (part != NULL && size)
*size = part->len << 2; *size = part->len << 2;
......
include/asm-powerpc/iommu.h
View file @ 1beb6a7d
...@@ -56,7 +56,7 @@ struct device_node; ...@@ -56,7 +56,7 @@ struct device_node;
/* Walks all buses and creates iommu tables */ /* Walks all buses and creates iommu tables */
extern void iommu_setup_pSeries(void); extern void iommu_setup_pSeries(void);
extern void iommu_setup_u3(void); extern void iommu_setup_dart(void);
/* Frees table for an individual device node */ /* Frees table for an individual device node */
extern void iommu_free_table(struct device_node *dn); extern void iommu_free_table(struct device_node *dn);
...@@ -104,7 +104,7 @@ extern void iommu_unmap_single(struct iommu_table *tbl, dma_addr_t dma_handle, ...@@ -104,7 +104,7 @@ extern void iommu_unmap_single(struct iommu_table *tbl, dma_addr_t dma_handle,
extern void iommu_init_early_pSeries(void); extern void iommu_init_early_pSeries(void);
extern void iommu_init_early_iSeries(void); extern void iommu_init_early_iSeries(void);
extern void iommu_init_early_u3(void); extern void iommu_init_early_dart(void);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
extern void pci_iommu_init(void); extern void pci_iommu_init(void);
...@@ -113,6 +113,6 @@ extern void pci_direct_iommu_init(void); ...@@ -113,6 +113,6 @@ extern void pci_direct_iommu_init(void);
static inline void pci_iommu_init(void) { } static inline void pci_iommu_init(void) { }
#endif #endif
extern void alloc_u3_dart_table(void); extern void alloc_dart_table(void);
#endif /* _ASM_IOMMU_H */ #endif /* _ASM_IOMMU_H */
include/asm-powerpc/mpic.h
View file @ 1beb6a7d
...@@ -117,8 +117,9 @@ typedef int (*mpic_cascade_t)(struct pt_regs *regs, void *data); ...@@ -117,8 +117,9 @@ typedef int (*mpic_cascade_t)(struct pt_regs *regs, void *data);
struct mpic_irq_fixup struct mpic_irq_fixup
{ {
u8 __iomem *base; u8 __iomem *base;
u8 __iomem *applebase;
u32 data; u32 data;
unsigned int irq; unsigned int index;
}; };
#endif /* CONFIG_MPIC_BROKEN_U3 */ #endif /* CONFIG_MPIC_BROKEN_U3 */
......
include/asm-powerpc/pmac_feature.h
View file @ 1beb6a7d
...@@ -121,6 +121,7 @@ ...@@ -121,6 +121,7 @@
#define PMAC_TYPE_IMAC_G5 0x152 /* iMac G5 */ #define PMAC_TYPE_IMAC_G5 0x152 /* iMac G5 */
#define PMAC_TYPE_XSERVE_G5 0x153 /* Xserve G5 */ #define PMAC_TYPE_XSERVE_G5 0x153 /* Xserve G5 */
#define PMAC_TYPE_UNKNOWN_K2 0x19f /* Any other K2 based */ #define PMAC_TYPE_UNKNOWN_K2 0x19f /* Any other K2 based */
#define PMAC_TYPE_UNKNOWN_SHASTA 0x19e /* Any other Shasta based */
/* /*
* Motherboard flags * Motherboard flags
...@@ -341,6 +342,7 @@ enum { ...@@ -341,6 +342,7 @@ enum {
macio_pangea, macio_pangea,
macio_intrepid, macio_intrepid,
macio_keylargo2, macio_keylargo2,
macio_shasta,
}; };
struct macio_chip struct macio_chip
......
include/linux/pci_regs.h
View file @ 1beb6a7d
...@@ -196,6 +196,7 @@ ...@@ -196,6 +196,7 @@
#define PCI_CAP_ID_MSI 0x05 /* Message Signalled Interrupts */ #define PCI_CAP_ID_MSI 0x05 /* Message Signalled Interrupts */
#define PCI_CAP_ID_CHSWP 0x06 /* CompactPCI HotSwap */ #define PCI_CAP_ID_CHSWP 0x06 /* CompactPCI HotSwap */
#define PCI_CAP_ID_PCIX 0x07 /* PCI-X */ #define PCI_CAP_ID_PCIX 0x07 /* PCI-X */
#define PCI_CAP_ID_HT_IRQCONF 0x08 /* HyperTransport IRQ Configuration */
#define PCI_CAP_ID_SHPC 0x0C /* PCI Standard Hot-Plug Controller */ #define PCI_CAP_ID_SHPC 0x0C /* PCI Standard Hot-Plug Controller */
#define PCI_CAP_ID_EXP 0x10 /* PCI Express */ #define PCI_CAP_ID_EXP 0x10 /* PCI Express */
#define PCI_CAP_ID_MSIX 0x11 /* MSI-X */ #define PCI_CAP_ID_MSIX 0x11 /* MSI-X */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7