Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 268930
b: refs/heads/master
c: a1741e7
h: refs/heads/master
v: v3
  • Loading branch information
Mike Galbraith authored and Ingo Molnar committed Sep 13, 2011
1 parent 5afb51a commit 93e2961
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 35 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bccc2f7b4c1a7fd3d51e34f9dc3397312afb030b
refs/heads/master: a1741e7fcbc19a67520115df480ab17012cc3d0b
78 changes: 44 additions & 34 deletions trunk/drivers/dca/dca-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ MODULE_VERSION(DCA_VERSION);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Intel Corporation");

static DEFINE_SPINLOCK(dca_lock);
static DEFINE_RAW_SPINLOCK(dca_lock);

static LIST_HEAD(dca_domains);

Expand Down Expand Up @@ -101,10 +101,10 @@ static void unregister_dca_providers(void)

INIT_LIST_HEAD(&unregistered_providers);

spin_lock_irqsave(&dca_lock, flags);
raw_spin_lock_irqsave(&dca_lock, flags);

if (list_empty(&dca_domains)) {
spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);
return;
}

Expand All @@ -116,7 +116,7 @@ static void unregister_dca_providers(void)

dca_free_domain(domain);

spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);

list_for_each_entry_safe(dca, _dca, &unregistered_providers, node) {
dca_sysfs_remove_provider(dca);
Expand Down Expand Up @@ -144,13 +144,8 @@ static struct dca_domain *dca_get_domain(struct device *dev)
domain = dca_find_domain(rc);

if (!domain) {
if (dca_provider_ioat_ver_3_0(dev) && !list_empty(&dca_domains)) {
if (dca_provider_ioat_ver_3_0(dev) && !list_empty(&dca_domains))
dca_providers_blocked = 1;
} else {
domain = dca_allocate_domain(rc);
if (domain)
list_add(&domain->node, &dca_domains);
}
}

return domain;
Expand Down Expand Up @@ -198,19 +193,19 @@ int dca_add_requester(struct device *dev)
if (!dev)
return -EFAULT;

spin_lock_irqsave(&dca_lock, flags);
raw_spin_lock_irqsave(&dca_lock, flags);

/* check if the requester has not been added already */
dca = dca_find_provider_by_dev(dev);
if (dca) {
spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);
return -EEXIST;
}

pci_rc = dca_pci_rc_from_dev(dev);
domain = dca_find_domain(pci_rc);
if (!domain) {
spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);
return -ENODEV;
}

Expand All @@ -220,17 +215,17 @@ int dca_add_requester(struct device *dev)
break;
}

spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);

if (slot < 0)
return slot;

err = dca_sysfs_add_req(dca, dev, slot);
if (err) {
spin_lock_irqsave(&dca_lock, flags);
raw_spin_lock_irqsave(&dca_lock, flags);
if (dca == dca_find_provider_by_dev(dev))
dca->ops->remove_requester(dca, dev);
spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);
return err;
}

Expand All @@ -251,14 +246,14 @@ int dca_remove_requester(struct device *dev)
if (!dev)
return -EFAULT;

spin_lock_irqsave(&dca_lock, flags);
raw_spin_lock_irqsave(&dca_lock, flags);
dca = dca_find_provider_by_dev(dev);
if (!dca) {
spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);
return -ENODEV;
}
slot = dca->ops->remove_requester(dca, dev);
spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);

if (slot < 0)
return slot;
Expand All @@ -280,16 +275,16 @@ u8 dca_common_get_tag(struct device *dev, int cpu)
u8 tag;
unsigned long flags;

spin_lock_irqsave(&dca_lock, flags);
raw_spin_lock_irqsave(&dca_lock, flags);

dca = dca_find_provider_by_dev(dev);
if (!dca) {
spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);
return -ENODEV;
}
tag = dca->ops->get_tag(dca, dev, cpu);

spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);
return tag;
}

Expand Down Expand Up @@ -360,36 +355,51 @@ int register_dca_provider(struct dca_provider *dca, struct device *dev)
{
int err;
unsigned long flags;
struct dca_domain *domain;
struct dca_domain *domain, *newdomain = NULL;

spin_lock_irqsave(&dca_lock, flags);
raw_spin_lock_irqsave(&dca_lock, flags);
if (dca_providers_blocked) {
spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);
return -ENODEV;
}
spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);

err = dca_sysfs_add_provider(dca, dev);
if (err)
return err;

spin_lock_irqsave(&dca_lock, flags);
raw_spin_lock_irqsave(&dca_lock, flags);
domain = dca_get_domain(dev);
if (!domain) {
struct pci_bus *rc;

if (dca_providers_blocked) {
spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);
dca_sysfs_remove_provider(dca);
unregister_dca_providers();
} else {
spin_unlock_irqrestore(&dca_lock, flags);
return -ENODEV;
}

raw_spin_unlock_irqrestore(&dca_lock, flags);
rc = dca_pci_rc_from_dev(dev);
newdomain = dca_allocate_domain(rc);
if (!newdomain)
return -ENODEV;
raw_spin_lock_irqsave(&dca_lock, flags);
/* Recheck, we might have raced after dropping the lock */
domain = dca_get_domain(dev);
if (!domain) {
domain = newdomain;
newdomain = NULL;
list_add(&domain->node, &dca_domains);
}
return -ENODEV;
}
list_add(&dca->node, &domain->dca_providers);
spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);

blocking_notifier_call_chain(&dca_provider_chain,
DCA_PROVIDER_ADD, NULL);
kfree(newdomain);
return 0;
}
EXPORT_SYMBOL_GPL(register_dca_provider);
Expand All @@ -407,7 +417,7 @@ void unregister_dca_provider(struct dca_provider *dca, struct device *dev)
blocking_notifier_call_chain(&dca_provider_chain,
DCA_PROVIDER_REMOVE, NULL);

spin_lock_irqsave(&dca_lock, flags);
raw_spin_lock_irqsave(&dca_lock, flags);

list_del(&dca->node);

Expand All @@ -416,7 +426,7 @@ void unregister_dca_provider(struct dca_provider *dca, struct device *dev)
if (list_empty(&domain->dca_providers))
dca_free_domain(domain);

spin_unlock_irqrestore(&dca_lock, flags);
raw_spin_unlock_irqrestore(&dca_lock, flags);

dca_sysfs_remove_provider(dca);
}
Expand Down

0 comments on commit 93e2961

Please sign in to comment.