d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r299467 to fix the kernel build.

Browse Source 
$ svn merge -c -299467 .

Approved by:	build being broken for six hours
This commit is contained in:
Conrad Meyer 2016-05-11 23:00:12 +00:00
parent cbb928798d
commit f41be0f076
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=299493
9 changed files with 20 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
share/man/man9/Makefile
View File

@ -1290,7 +1290,6 @@ MLINKS+=pci.9 pci_alloc_msi.9 \
pci.9 pci_find_extcap.9 \
pci.9 pci_find_htcap.9 \
pci.9 pci_find_pcie_root_port.9 \
pci.9 pci_get_id.9 \
pci.9 pci_get_max_read_req.9 \
pci.9 pci_get_powerstate.9 \
pci.9 pci_get_vpd_ident.9 \

17
share/man/man9/pci.9
View File

@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd May 11, 2016
.Dd December 23, 2015
.Dt PCI 9
.Os
.Sh NAME
@ -43,7 +43,6 @@
.Nm pci_find_extcap ,
.Nm pci_find_htcap ,
.Nm pci_find_pcie_root_port ,
.Nm pci_get_id ,
.Nm pci_get_max_read_req ,
.Nm pci_get_powerstate ,
.Nm pci_get_vpd_ident ,
@ -98,8 +97,6 @@
.Ft device_t
.Fn pci_find_pcie_root_port "device_t dev"
.Ft int
.Fn pci_get_id "device_t dev" "enum pci_id_type type" "uintptr_t *id"
.Ft int
.Fn pci_get_max_read_req "device_t dev"
.Ft int
.Fn pci_get_powerstate "device_t dev"
@ -360,18 +357,6 @@ returns
.Dv NULL .
.Pp
The
.Fn pci_get_id
function is used to read an identifier from a device.
The
.Fa type
flag is used to specify which identifier to read.
The following flags are supported:
.Bl -hang -width ".Dv PCI_ID_RID"
.It Dv PCI_ID_RID
Read the routing identifier for the device.
.El
.Pp
The
.Fn pci_get_vpd_ident
function is used to fetch a device's Vital Product Data
.Pq VPD

12
sys/dev/pci/pci.c
View File

@ -122,8 +122,7 @@ static void pci_resume_msix(device_t dev);
static int pci_remap_intr_method(device_t bus, device_t dev,
u_int irq);
static int pci_get_id_method(device_t dev, device_t child,
enum pci_id_type type, uintptr_t *rid);
static uint16_t pci_get_rid_method(device_t dev, device_t child);
static struct pci_devinfo * pci_fill_devinfo(device_t pcib, device_t bus, int d,
int b, int s, int f, uint16_t vid, uint16_t did);
@ -191,7 +190,7 @@ static device_method_t pci_methods[] = {
DEVMETHOD(pci_msix_count, pci_msix_count_method),
DEVMETHOD(pci_msix_pba_bar, pci_msix_pba_bar_method),
DEVMETHOD(pci_msix_table_bar, pci_msix_table_bar_method),
DEVMETHOD(pci_get_id, pci_get_id_method),
DEVMETHOD(pci_get_rid, pci_get_rid_method),
DEVMETHOD(pci_alloc_devinfo, pci_alloc_devinfo_method),
DEVMETHOD(pci_child_added, pci_child_added_method),
#ifdef PCI_IOV
@ -5824,12 +5823,11 @@ pci_restore_state(device_t dev)
pci_cfg_restore(dev, dinfo);
}
static int
pci_get_id_method(device_t dev, device_t child, enum pci_id_type type,
uintptr_t *id)
static uint16_t
pci_get_rid_method(device_t dev, device_t child)
{
return (PCIB_GET_ID(device_get_parent(dev), child, type, id));
return (PCIB_GET_RID(device_get_parent(dev), child));
}
/* Find the upstream port of a given PCI device in a root complex. */

5
sys/dev/pci/pci_if.m
View File

@ -27,7 +27,6 @@
#
#include <sys/bus.h>
#include <dev/pci/pcivar.h>
INTERFACE pci;
@ -209,11 +208,9 @@ METHOD int msix_table_bar {
device_t child;
} DEFAULT null_msix_bar;
METHOD int get_id {
METHOD uint16_t get_rid {
device_t dev;
device_t child;
enum pci_id_type type;
uintptr_t *id;
};
METHOD struct pci_devinfo * alloc_devinfo {

19
sys/dev/pci/pci_pci.c
View File

@ -59,8 +59,7 @@ static int pcib_suspend(device_t dev);
static int pcib_resume(device_t dev);
static int pcib_power_for_sleep(device_t pcib, device_t dev,
int *pstate);
static int pcib_ari_get_id(device_t pcib, device_t dev,
enum pci_id_type type, uintptr_t *id);
static uint16_t pcib_ari_get_rid(device_t pcib, device_t dev);
static uint32_t pcib_read_config(device_t dev, u_int b, u_int s,
u_int f, u_int reg, int width);
static void pcib_write_config(device_t dev, u_int b, u_int s,
@ -115,7 +114,7 @@ static device_method_t pcib_methods[] = {
DEVMETHOD(pcib_release_msix, pcib_release_msix),
DEVMETHOD(pcib_map_msi, pcib_map_msi),
DEVMETHOD(pcib_power_for_sleep, pcib_power_for_sleep),
DEVMETHOD(pcib_get_id, pcib_ari_get_id),
DEVMETHOD(pcib_get_rid, pcib_ari_get_rid),
DEVMETHOD(pcib_try_enable_ari, pcib_try_enable_ari),
DEVMETHOD(pcib_ari_enabled, pcib_ari_enabled),
DEVMETHOD(pcib_decode_rid, pcib_ari_decode_rid),
@ -2575,32 +2574,26 @@ pcib_ari_enabled(device_t pcib)
return ((sc->flags & PCIB_ENABLE_ARI) != 0);
}
static int
pcib_ari_get_id(device_t pcib, device_t dev, enum pci_id_type type,
uintptr_t *id)
static uint16_t
pcib_ari_get_rid(device_t pcib, device_t dev)
{
struct pcib_softc *sc;
uint8_t bus, slot, func;
if (type != PCI_ID_RID)
return (ENXIO);
sc = device_get_softc(pcib);
if (sc->flags & PCIB_ENABLE_ARI) {
bus = pci_get_bus(dev);
func = pci_get_function(dev);
*id = (PCI_ARI_RID(bus, func));
return (PCI_ARI_RID(bus, func));
} else {
bus = pci_get_bus(dev);
slot = pci_get_slot(dev);
func = pci_get_function(dev);
*id = (PCI_RID(bus, slot, func));
return (PCI_RID(bus, slot, func));
}
return (0);
}
/*

6
sys/dev/pci/pcib_if.m
View File

@ -175,12 +175,10 @@ METHOD int power_for_sleep {
#
# Return the PCI Routing Identifier (RID) for the device.
#
METHOD int get_id {
METHOD uint16_t get_rid {
device_t pcib;
device_t dev;
enum pci_id_type type;
uintptr_t *id;
} DEFAULT pcib_get_id;
} DEFAULT pcib_get_rid;
#
# Enable Alternative RID Interpretation if both the downstream port (pcib)

3
sys/dev/pci/pcib_private.h
View File

@ -190,8 +190,7 @@ int pcib_release_msi(device_t pcib, device_t dev, int count, int *irqs);
int pcib_alloc_msix(device_t pcib, device_t dev, int *irq);
int pcib_release_msix(device_t pcib, device_t dev, int irq);
int pcib_map_msi(device_t pcib, device_t dev, int irq, uint64_t *addr, uint32_t *data);
int pcib_get_id(device_t pcib, device_t dev, enum pci_id_type type,
uintptr_t *id);
uint16_t pcib_get_rid(device_t pcib, device_t dev);
void pcib_decode_rid(device_t pcib, uint16_t rid, int *bus,
int *slot, int *func);

10
sys/dev/pci/pcib_support.c
View File

@ -54,20 +54,16 @@ pcib_maxfuncs(device_t dev)
return (PCI_FUNCMAX);
}
int
pcib_get_id(device_t pcib, device_t dev, enum pci_id_type type, uintptr_t *id)
uint16_t
pcib_get_rid(device_t pcib, device_t dev)
{
uint8_t bus, slot, func;
if (type != PCI_ID_RID)
return (ENXIO);
bus = pci_get_bus(dev);
slot = pci_get_slot(dev);
func = pci_get_function(dev);
*id = (PCI_RID(bus, slot, func));
return (0);
return (PCI_RID(bus, slot, func));
}
void

22
sys/dev/pci/pcivar.h
View File

@ -268,10 +268,6 @@ struct pci_devinfo {
#ifdef _SYS_BUS_H_
enum pci_id_type {
PCI_ID_RID,
};
#include "pci_if.h"
enum pci_device_ivars {
@ -546,26 +542,10 @@ pci_msix_table_bar(device_t dev)
return (PCI_MSIX_TABLE_BAR(device_get_parent(dev), dev));
}
static __inline int
pci_get_id(device_t dev, enum pci_id_type type, uintptr_t *id)
{
return (PCI_GET_ID(device_get_parent(dev), dev, type, id));
}
/*
* This is the deprecated interface, there is no way to tell the difference
* between a failure and a valid value that happens to be the same as the
* failure value.
*/
static __inline uint16_t
pci_get_rid(device_t dev)
{
uintptr_t rid;
if (pci_get_id(dev, PCI_ID_RID, &rid) != 0)
return (0);
return (rid);
return (PCI_GET_RID(device_get_parent(dev), dev));
}
static __inline void