| 
					
				 | 
			
			
				@@ -271,3 +271,185 @@ static int orion5x_pci_local_bus_nr(void) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 static int orion5x_pci_hw_rd_conf(int bus, int dev, u32 func, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					u32 where, u32 size, u32 *val) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	unsigned long flags; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	spin_lock_irqsave(&orion5x_pci_lock, flags); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	writel(PCI_CONF_BUS(bus) | 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		PCI_CONF_DEV(dev) | PCI_CONF_REG(where) | 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	*val = readl(PCI_CONF_DATA); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	if (size == 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		*val = (*val >> (8*(where & 0x3))) & 0xff; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	else if (size == 2) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		*val = (*val >> (8*(where & 0x3))) & 0xffff; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	spin_unlock_irqrestore(&orion5x_pci_lock, flags); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	return PCIBIOS_SUCCESSFUL; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+static int orion5x_pci_hw_wr_conf(int bus, int dev, u32 func, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					u32 where, u32 size, u32 val) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	unsigned long flags; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	int ret = PCIBIOS_SUCCESSFUL; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	spin_lock_irqsave(&orion5x_pci_lock, flags); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	writel(PCI_CONF_BUS(bus) | 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		PCI_CONF_DEV(dev) | PCI_CONF_REG(where) | 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	if (size == 4) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		__raw_writel(val, PCI_CONF_DATA); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	} else if (size == 2) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		__raw_writew(val, PCI_CONF_DATA + (where & 0x3)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	} else if (size == 1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		__raw_writeb(val, PCI_CONF_DATA + (where & 0x3)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	} else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		ret = PCIBIOS_BAD_REGISTER_NUMBER; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	spin_unlock_irqrestore(&orion5x_pci_lock, flags); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	return ret; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+static int orion5x_pci_valid_config(int bus, u32 devfn) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	if (bus == orion5x_pci_local_bus_nr()) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		/* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 * Don't go out for local device 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		if (PCI_SLOT(devfn) == 0 && PCI_FUNC(devfn) != 0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			return 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		/* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 * When the PCI signals are directly connected to a 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 * Cardbus slot, ignore all but device IDs 0 and 1. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		if (orion5x_pci_cardbus_mode && PCI_SLOT(devfn) > 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			return 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	return 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+static int orion5x_pci_rd_conf(struct pci_bus *bus, u32 devfn, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				int where, int size, u32 *val) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	if (!orion5x_pci_valid_config(bus->number, devfn)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		*val = 0xffffffff; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		return PCIBIOS_DEVICE_NOT_FOUND; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	return orion5x_pci_hw_rd_conf(bus->number, PCI_SLOT(devfn), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					PCI_FUNC(devfn), where, size, val); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+static int orion5x_pci_wr_conf(struct pci_bus *bus, u32 devfn, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				int where, int size, u32 val) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	if (!orion5x_pci_valid_config(bus->number, devfn)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		return PCIBIOS_DEVICE_NOT_FOUND; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	return orion5x_pci_hw_wr_conf(bus->number, PCI_SLOT(devfn), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					PCI_FUNC(devfn), where, size, val); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+static struct pci_ops pci_ops = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	.read = orion5x_pci_rd_conf, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	.write = orion5x_pci_wr_conf, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+static void __init orion5x_pci_set_bus_nr(int nr) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	u32 p2p = readl(PCI_P2P_CONF); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	if (readl(PCI_MODE) & PCI_MODE_PCIX) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		/* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 * PCI-X mode 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		u32 pcix_status, bus, dev; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		bus = (p2p & PCI_P2P_BUS_MASK) >> PCI_P2P_BUS_OFFS; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		dev = (p2p & PCI_P2P_DEV_MASK) >> PCI_P2P_DEV_OFFS; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		orion5x_pci_hw_rd_conf(bus, dev, 0, PCIX_STAT, 4, &pcix_status); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		pcix_status &= ~PCIX_STAT_BUS_MASK; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		pcix_status |= (nr << PCIX_STAT_BUS_OFFS); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		orion5x_pci_hw_wr_conf(bus, dev, 0, PCIX_STAT, 4, pcix_status); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	} else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		/* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 * PCI Conventional mode 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		p2p &= ~PCI_P2P_BUS_MASK; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		p2p |= (nr << PCI_P2P_BUS_OFFS); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		writel(p2p, PCI_P2P_CONF); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+static void __init orion5x_pci_master_slave_enable(void) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	int bus_nr, func, reg; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	u32 val; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	bus_nr = orion5x_pci_local_bus_nr(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	func = PCI_CONF_FUNC_STAT_CMD; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	reg = PCI_CONF_REG_STAT_CMD; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	orion5x_pci_hw_rd_conf(bus_nr, 0, func, reg, 4, &val); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	val |= (PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	orion5x_pci_hw_wr_conf(bus_nr, 0, func, reg, 4, val | 0x7); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+static void __init orion5x_setup_pci_wins(struct mbus_dram_target_info *dram) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	u32 win_enable; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	int bus; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	int i; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	/* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	 * First, disable windows. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	win_enable = 0xffffffff; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	writel(win_enable, PCI_BAR_ENABLE); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	/* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	 * Setup windows for DDR banks. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	bus = orion5x_pci_local_bus_nr(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	for (i = 0; i < dram->num_cs; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		struct mbus_dram_window *cs = dram->cs + i; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		u32 func = PCI_CONF_FUNC_BAR_CS(cs->cs_index); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		u32 reg; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		u32 val; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		/* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 * Write DRAM bank base address register. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		reg = PCI_CONF_REG_BAR_LO_CS(cs->cs_index); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		orion5x_pci_hw_rd_conf(bus, 0, func, reg, 4, &val); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		val = (cs->base & 0xfffff000) | (val & 0xfff); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		orion5x_pci_hw_wr_conf(bus, 0, func, reg, 4, val); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		/* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 * Write DRAM bank size register. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		reg = PCI_CONF_REG_BAR_HI_CS(cs->cs_index); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		orion5x_pci_hw_wr_conf(bus, 0, func, reg, 4, 0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		writel((cs->size - 1) & 0xfffff000, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			PCI_BAR_SIZE_DDR_CS(cs->cs_index)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		writel(cs->base & 0xfffff000, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			PCI_BAR_REMAP_DDR_CS(cs->cs_index)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		/* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 * Enable decode window for this chip select. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		win_enable &= ~(1 << cs->cs_index); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	/* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	 * Re-enable decode windows. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	writel(win_enable, PCI_BAR_ENABLE); 
			 |