Commit 59094065 authored by Thierry Reding's avatar Thierry Reding Committed by Bjorn Helgaas

PCI: Allow driver-specific data in host bridge

Provide a way to allocate driver-specific data along with a PCI host bridge
structure. The bridge's ->private field points to this data.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarBjorn Helgaas <helgaas@kernel.org>
parent 37d6a0a6
...@@ -521,11 +521,11 @@ static void pci_release_host_bridge_dev(struct device *dev) ...@@ -521,11 +521,11 @@ static void pci_release_host_bridge_dev(struct device *dev)
kfree(bridge); kfree(bridge);
} }
static struct pci_host_bridge *pci_alloc_host_bridge(void) static struct pci_host_bridge *pci_alloc_host_bridge(size_t priv)
{ {
struct pci_host_bridge *bridge; struct pci_host_bridge *bridge;
bridge = kzalloc(sizeof(*bridge), GFP_KERNEL); bridge = kzalloc(sizeof(*bridge) + priv, GFP_KERNEL);
if (!bridge) if (!bridge)
return NULL; return NULL;
...@@ -2253,7 +2253,7 @@ static struct pci_bus *pci_create_root_bus_msi(struct device *parent, ...@@ -2253,7 +2253,7 @@ static struct pci_bus *pci_create_root_bus_msi(struct device *parent,
int error; int error;
struct pci_host_bridge *bridge; struct pci_host_bridge *bridge;
bridge = pci_alloc_host_bridge(); bridge = pci_alloc_host_bridge(0);
if (!bridge) if (!bridge)
return NULL; return NULL;
......
...@@ -434,10 +434,21 @@ struct pci_host_bridge { ...@@ -434,10 +434,21 @@ struct pci_host_bridge {
resource_size_t start, resource_size_t start,
resource_size_t size, resource_size_t size,
resource_size_t align); resource_size_t align);
unsigned long private[0] ____cacheline_aligned;
}; };
#define to_pci_host_bridge(n) container_of(n, struct pci_host_bridge, dev) #define to_pci_host_bridge(n) container_of(n, struct pci_host_bridge, dev)
static inline void *pci_host_bridge_priv(struct pci_host_bridge *bridge)
{
return (void *)bridge->private;
}
static inline struct pci_host_bridge *pci_host_bridge_from_priv(void *priv)
{
return container_of(priv, struct pci_host_bridge, private);
}
struct pci_host_bridge *pci_find_host_bridge(struct pci_bus *bus); struct pci_host_bridge *pci_find_host_bridge(struct pci_bus *bus);
void pci_set_host_bridge_release(struct pci_host_bridge *bridge, void pci_set_host_bridge_release(struct pci_host_bridge *bridge,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment