[pci] Replace pci_max_bus() with pci_num_bus()
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
parent
f9b3fae8d4
commit
abb5590b29
@ -29,11 +29,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determine maximum PCI bus number within system
|
* Determine number of PCI buses within system
|
||||||
*
|
*
|
||||||
* @ret max_bus Maximum bus number
|
* @ret num_bus Number of buses
|
||||||
*/
|
*/
|
||||||
static int pcibios_max_bus ( void ) {
|
static int pcibios_num_bus ( void ) {
|
||||||
int discard_a, discard_D;
|
int discard_a, discard_D;
|
||||||
uint8_t max_bus;
|
uint8_t max_bus;
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ static int pcibios_max_bus ( void ) {
|
|||||||
"D" ( 0 )
|
"D" ( 0 )
|
||||||
: "ebx", "edx" );
|
: "ebx", "edx" );
|
||||||
|
|
||||||
return max_bus;
|
return ( max_bus + 1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -105,7 +105,7 @@ int pcibios_write ( struct pci_device *pci, uint32_t command, uint32_t value ){
|
|||||||
return ( ( status >> 8 ) & 0xff );
|
return ( ( status >> 8 ) & 0xff );
|
||||||
}
|
}
|
||||||
|
|
||||||
PROVIDE_PCIAPI ( pcbios, pci_max_bus, pcibios_max_bus );
|
PROVIDE_PCIAPI ( pcbios, pci_num_bus, pcibios_num_bus );
|
||||||
PROVIDE_PCIAPI_INLINE ( pcbios, pci_read_config_byte );
|
PROVIDE_PCIAPI_INLINE ( pcbios, pci_read_config_byte );
|
||||||
PROVIDE_PCIAPI_INLINE ( pcbios, pci_read_config_word );
|
PROVIDE_PCIAPI_INLINE ( pcbios, pci_read_config_word );
|
||||||
PROVIDE_PCIAPI_INLINE ( pcbios, pci_read_config_dword );
|
PROVIDE_PCIAPI_INLINE ( pcbios, pci_read_config_dword );
|
||||||
|
@ -38,7 +38,7 @@ void pcidirect_prepare ( struct pci_device *pci, int where ) {
|
|||||||
PCIDIRECT_CONFIG_ADDRESS );
|
PCIDIRECT_CONFIG_ADDRESS );
|
||||||
}
|
}
|
||||||
|
|
||||||
PROVIDE_PCIAPI_INLINE ( direct, pci_max_bus );
|
PROVIDE_PCIAPI_INLINE ( direct, pci_num_bus );
|
||||||
PROVIDE_PCIAPI_INLINE ( direct, pci_read_config_byte );
|
PROVIDE_PCIAPI_INLINE ( direct, pci_read_config_byte );
|
||||||
PROVIDE_PCIAPI_INLINE ( direct, pci_read_config_word );
|
PROVIDE_PCIAPI_INLINE ( direct, pci_read_config_word );
|
||||||
PROVIDE_PCIAPI_INLINE ( direct, pci_read_config_dword );
|
PROVIDE_PCIAPI_INLINE ( direct, pci_read_config_dword );
|
||||||
|
@ -26,14 +26,14 @@ struct pci_device;
|
|||||||
extern void pcidirect_prepare ( struct pci_device *pci, int where );
|
extern void pcidirect_prepare ( struct pci_device *pci, int where );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determine maximum PCI bus number within system
|
* Determine number of PCI buses within system
|
||||||
*
|
*
|
||||||
* @ret max_bus Maximum bus number
|
* @ret num_bus Number of buses
|
||||||
*/
|
*/
|
||||||
static inline __always_inline int
|
static inline __always_inline int
|
||||||
PCIAPI_INLINE ( direct, pci_max_bus ) ( void ) {
|
PCIAPI_INLINE ( direct, pci_num_bus ) ( void ) {
|
||||||
/* No way to work this out via Type 1 accesses */
|
/* No way to work this out via Type 1 accesses */
|
||||||
return 0xff;
|
return 0x100;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -234,7 +234,7 @@ static int pcibus_probe ( struct root_device *rootdev ) {
|
|||||||
uint32_t tmp;
|
uint32_t tmp;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
num_bus = ( pci_max_bus() + 1 );
|
num_bus = pci_num_bus();
|
||||||
for ( busdevfn = 0 ; busdevfn < PCI_BUSDEVFN ( num_bus, 0, 0 ) ;
|
for ( busdevfn = 0 ; busdevfn < PCI_BUSDEVFN ( num_bus, 0, 0 ) ;
|
||||||
busdevfn++ ) {
|
busdevfn++ ) {
|
||||||
|
|
||||||
|
@ -33,14 +33,14 @@ extern int efipci_write ( struct pci_device *pci, unsigned long location,
|
|||||||
unsigned long value );
|
unsigned long value );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determine maximum PCI bus number within system
|
* Determine number of PCI buses within system
|
||||||
*
|
*
|
||||||
* @ret max_bus Maximum bus number
|
* @ret num_bus Number of buses
|
||||||
*/
|
*/
|
||||||
static inline __always_inline int
|
static inline __always_inline int
|
||||||
PCIAPI_INLINE ( efi, pci_max_bus ) ( void ) {
|
PCIAPI_INLINE ( efi, pci_num_bus ) ( void ) {
|
||||||
/* No way to work this out via EFI */
|
/* No way to work this out via EFI */
|
||||||
return 0xff;
|
return 0x100;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -49,11 +49,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
|||||||
#include <bits/pci_io.h>
|
#include <bits/pci_io.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determine maximum PCI bus number within system
|
* Determine number of PCI buses within system
|
||||||
*
|
*
|
||||||
* @ret max_bus Maximum bus number
|
* @ret num_bus Number of buses
|
||||||
*/
|
*/
|
||||||
int pci_max_bus ( void );
|
int pci_num_bus ( void );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read byte from PCI configuration space
|
* Read byte from PCI configuration space
|
||||||
|
@ -73,7 +73,7 @@ int efipci_write ( struct pci_device *pci, unsigned long location,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
PROVIDE_PCIAPI_INLINE ( efi, pci_max_bus );
|
PROVIDE_PCIAPI_INLINE ( efi, pci_num_bus );
|
||||||
PROVIDE_PCIAPI_INLINE ( efi, pci_read_config_byte );
|
PROVIDE_PCIAPI_INLINE ( efi, pci_read_config_byte );
|
||||||
PROVIDE_PCIAPI_INLINE ( efi, pci_read_config_word );
|
PROVIDE_PCIAPI_INLINE ( efi, pci_read_config_word );
|
||||||
PROVIDE_PCIAPI_INLINE ( efi, pci_read_config_dword );
|
PROVIDE_PCIAPI_INLINE ( efi, pci_read_config_dword );
|
||||||
|
Reference in New Issue
Block a user