提交: b6c6b594c325009f1d2fb6029cbd0131b549de3d - uboot (git)

Commit MetaInfo

• 修訂: b6c6b594c325009f1d2fb6029cbd0131b549de3d (tree)
• 時間: 2016-04-17 19:24:47
• 作者: Yoshinori Sato <ysato@user...>
• Commiter: Yoshinori Sato

Log Message

PCI: SH4 PCI address fix.

Signed-off-by: Yoshinori Sato <[e-mail]>

Change Summary

• modified: drivers/pci/pci-uclass.c
• modified: drivers/pci/pci_common.c

差異

--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -843,9 +843,14 @@ static int decode_regions(struct pci_controller *hose, const void *blob,
 #endif
 	if (gd->pci_ram_top && gd->pci_ram_top < base + size)
 		size = gd->pci_ram_top - base;
+#ifndef CONFIG_SH4_PCI
 	pci_set_region(hose->regions + hose->region_count++, base, base,
 		       size, PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
-
+#else
+	/* SH4 use 29bit physical address */
+	pci_set_region(hose->regions + hose->region_count++, base & ~0xe0000000,
+		       base, size, PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
+#endif
 	return 0;
 }
 

--- a/drivers/pci/pci_common.c
+++ b/drivers/pci/pci_common.c
@@ -225,9 +225,8 @@ int __pci_hose_phys_to_bus(struct pci_controller *hose,
 			continue;
 
 #if defined(CONFIG_SH4_PCI)
-		/* from Logic address to Physical address */
-		if( (phys_addr & 0xF0000000) == 0x80000000)
-			phys_addr &= ~0x80000000;
+		/* SH4 use 29bit physical address */
+		phys_addr &= ~0xe0000000;
 #endif
 
 		bus_addr = phys_addr - res->phys_start + res->bus_start;