sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-17 01:52:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

[pci] Use single "busdevfn" field in struct pci_device

Browse Source 
Merge the "bus" and "devfn" fields into a single "busdevfn" field, to
match the format used by the majority of external code.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2011-02-09 00:32:58 +00:00
parent 00f5ba701f
commit f9b3fae8d4
10 changed files with 97 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/drivers/net/phantom/phantom.c
View File

@@ -1792,9 +1792,8 @@ static int phantom_map_crb ( struct phantom_nic *phantom,
bar0_start = pci_bar_start ( pci, PCI_BASE_ADDRESS_0 );
bar0_size = pci_bar_size ( pci, PCI_BASE_ADDRESS_0 );
DBGC ( phantom, "Phantom %p is PCI %02x:%02x.%x with BAR0 at "
"%08lx+%lx\n", phantom, pci->bus, PCI_SLOT ( pci->devfn ),
PCI_FUNC ( pci->devfn ), bar0_start, bar0_size );
DBGC ( phantom, "Phantom %p is " PCI_FMT " with BAR0 at %08lx+%lx\n",
phantom, PCI_ARGS ( pci ), bar0_start, bar0_size );
if ( ! bar0_start ) {
DBGC ( phantom, "Phantom %p BAR not assigned; ignoring\n",
@@ -2057,7 +2056,7 @@ static int phantom_probe ( struct pci_device *pci,
pci_set_drvdata ( pci, netdev );
netdev->dev = &pci->dev;
memset ( phantom, 0, sizeof ( *phantom ) );
phantom->port = PCI_FUNC ( pci->devfn );
phantom->port = PCI_FUNC ( pci->busdevfn );
assert ( phantom->port < PHN_MAX_NUM_PORTS );
settings_init ( &phantom->settings,
&phantom_settings_operations,
@@ -2074,16 +2073,19 @@ static int phantom_probe ( struct pci_device *pci,
* B2 will have this fixed; remove this hack when B1 is no
* longer in use.
*/
if ( PCI_FUNC ( pci->devfn ) == 0 ) {
if ( PCI_FUNC ( pci->busdevfn ) == 0 ) {
unsigned int i;
for ( i = 0 ; i < 8 ; i++ ) {
uint32_t temp;
pci->devfn = PCI_DEVFN ( PCI_SLOT ( pci->devfn ), i );
pci->busdevfn =
PCI_BUSDEVFN ( PCI_BUS ( pci->busdevfn ),
PCI_SLOT ( pci->busdevfn ), i );
pci_read_config_dword ( pci, 0xc8, &temp );
pci_read_config_dword ( pci, 0xc8, &temp );
pci_write_config_dword ( pci, 0xc8, 0xf1000 );
}
pci->devfn = PCI_DEVFN ( PCI_SLOT ( pci->devfn ), 0 );
pci->busdevfn = PCI_BUSDEVFN ( PCI_BUS ( pci->busdevfn ),
PCI_SLOT ( pci->busdevfn ), 0 );
}
/* Initialise the command PEG */

2
src/drivers/net/tg3.c
View File

@@ -2909,7 +2909,7 @@ static int tg3_get_device_address(struct tg3 *tp)
struct nic *nic = tp->nic;
uint32_t hi, lo, mac_offset;
if (PCI_FUNC(tp->pdev->devfn) == 0)
if (PCI_FUNC(tp->pdev->busdevfn) == 0)
mac_offset = 0x7c;
else
mac_offset = 0xcc;

5
src/drivers/net/vxge/vxge_main.c
View File

@@ -511,9 +511,8 @@ vxge_probe(struct pci_device *pdev, const struct pci_device_id *id __unused)
struct vxge_hw_device_hw_info hw_info;
struct vxge_hw_device_version *fw_version;
vxge_debug(VXGE_INFO, "vxge_probe for device %02X:%02X.%X\n",
pdev->bus, PCI_SLOT(pdev->devfn),
PCI_FUNC(pdev->devfn));
vxge_debug(VXGE_INFO, "vxge_probe for device " PCI_FMT "\n",
PCI_ARGS(pdev));
pci_read_config_byte(pdev, PCI_REVISION_ID, &revision);
titan1 = is_titan1(pdev->device, revision);