random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-18 14:48:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

dm: pci: Correct primary/secondary/subordinate bus number assignment

Browse Source 
In driver model, each pci bridge device has its own hose structure.
hose->first_busno points to the bridge device's device number, so
we should not substract hose->first_busno before programming the
bridge device's primary/secondary/subordinate bus number registers.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Bin Meng 2015-07-19 00:20:03 +08:00 committed by Simon Glass
parent 7e378b8bfc
commit 95f3aa209a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/pci/pci_auto.c
View File

@ -224,10 +224,15 @@ void pciauto_prescan_setup_bridge(struct pci_controller *hose,
prefechable_64 &= PCI_PREF_RANGE_TYPE_MASK; prefechable_64 &= PCI_PREF_RANGE_TYPE_MASK;
/* Configure bus number registers */ /* Configure bus number registers */
#ifdef CONFIG_DM_PCI
pci_hose_write_config_byte(hose, dev, PCI_PRIMARY_BUS, PCI_BUS(dev));
pci_hose_write_config_byte(hose, dev, PCI_SECONDARY_BUS, sub_bus);
#else
pci_hose_write_config_byte(hose, dev, PCI_PRIMARY_BUS, pci_hose_write_config_byte(hose, dev, PCI_PRIMARY_BUS,
PCI_BUS(dev) - hose->first_busno); PCI_BUS(dev) - hose->first_busno);
pci_hose_write_config_byte(hose, dev, PCI_SECONDARY_BUS, pci_hose_write_config_byte(hose, dev, PCI_SECONDARY_BUS,
sub_bus - hose->first_busno); sub_bus - hose->first_busno);
#endif
pci_hose_write_config_byte(hose, dev, PCI_SUBORDINATE_BUS, 0xff); pci_hose_write_config_byte(hose, dev, PCI_SUBORDINATE_BUS, 0xff);
if (pci_mem) { if (pci_mem) {
@ -295,8 +300,12 @@ void pciauto_postscan_setup_bridge(struct pci_controller *hose,
struct pci_region *pci_io = hose->pci_io; struct pci_region *pci_io = hose->pci_io;
/* Configure bus number registers */ /* Configure bus number registers */
#ifdef CONFIG_DM_PCI
pci_hose_write_config_byte(hose, dev, PCI_SUBORDINATE_BUS, sub_bus);
#else
pci_hose_write_config_byte(hose, dev, PCI_SUBORDINATE_BUS, pci_hose_write_config_byte(hose, dev, PCI_SUBORDINATE_BUS,
sub_bus - hose->first_busno); sub_bus - hose->first_busno);
#endif
if (pci_mem) { if (pci_mem) {
/* Round memory allocator to 1MB boundary */ /* Round memory allocator to 1MB boundary */