linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] PCI: designware: Remove unnecessary use of 'conf_lock' spinlock
@ 2014-02-20 21:41 Andrew Murray
  2014-04-03 22:36 ` Bjorn Helgaas
  0 siblings, 1 reply; 4+ messages in thread
From: Andrew Murray @ 2014-02-20 21:41 UTC (permalink / raw)
  To: linux-pci; +Cc: mohit.kumar, jg1.han, Andrew Murray

Serialization of configuration accesses is provided by 'pci_lock' in
drivers/pci/access.c thus making the driver's 'conf_lock' superfluous.

Signed-off-by: Andrew Murray <amurray@embedded-bits.co.uk>
---
 drivers/pci/host/pci-exynos.c      | 1 -
 drivers/pci/host/pci-imx6.c        | 1 -
 drivers/pci/host/pcie-designware.c | 6 ------
 drivers/pci/host/pcie-designware.h | 1 -
 4 files changed, 9 deletions(-)

diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c
index 3de6bfb..32c6d56 100644
--- a/drivers/pci/host/pci-exynos.c
+++ b/drivers/pci/host/pci-exynos.c
@@ -546,7 +546,6 @@ static int add_pcie_port(struct pcie_port *pp, struct platform_device *pdev)
 	pp->root_bus_nr = -1;
 	pp->ops = &exynos_pcie_host_ops;
 
-	spin_lock_init(&pp->conf_lock);
 	ret = dw_pcie_host_init(pp);
 	if (ret) {
 		dev_err(&pdev->dev, "failed to initialize host\n");
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
index e8663a8..77588f1 100644
--- a/drivers/pci/host/pci-imx6.c
+++ b/drivers/pci/host/pci-imx6.c
@@ -480,7 +480,6 @@ static int imx6_add_pcie_port(struct pcie_port *pp,
 	pp->root_bus_nr = -1;
 	pp->ops = &imx6_pcie_host_ops;
 
-	spin_lock_init(&pp->conf_lock);
 	ret = dw_pcie_host_init(pp);
 	if (ret) {
 		dev_err(&pdev->dev, "failed to initialize host\n");
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
index 17ce88f..b25adb8 100644
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -640,7 +640,6 @@ static int dw_pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where,
 			int size, u32 *val)
 {
 	struct pcie_port *pp = sys_to_pcie(bus->sysdata);
-	unsigned long flags;
 	int ret;
 
 	if (!pp) {
@@ -653,13 +652,11 @@ static int dw_pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where,
 		return PCIBIOS_DEVICE_NOT_FOUND;
 	}
 
-	spin_lock_irqsave(&pp->conf_lock, flags);
 	if (bus->number != pp->root_bus_nr)
 		ret = dw_pcie_rd_other_conf(pp, bus, devfn,
 						where, size, val);
 	else
 		ret = dw_pcie_rd_own_conf(pp, where, size, val);
-	spin_unlock_irqrestore(&pp->conf_lock, flags);
 
 	return ret;
 }
@@ -668,7 +665,6 @@ static int dw_pcie_wr_conf(struct pci_bus *bus, u32 devfn,
 			int where, int size, u32 val)
 {
 	struct pcie_port *pp = sys_to_pcie(bus->sysdata);
-	unsigned long flags;
 	int ret;
 
 	if (!pp) {
@@ -679,13 +675,11 @@ static int dw_pcie_wr_conf(struct pci_bus *bus, u32 devfn,
 	if (dw_pcie_valid_config(pp, bus, PCI_SLOT(devfn)) == 0)
 		return PCIBIOS_DEVICE_NOT_FOUND;
 
-	spin_lock_irqsave(&pp->conf_lock, flags);
 	if (bus->number != pp->root_bus_nr)
 		ret = dw_pcie_wr_other_conf(pp, bus, devfn,
 						where, size, val);
 	else
 		ret = dw_pcie_wr_own_conf(pp, where, size, val);
-	spin_unlock_irqrestore(&pp->conf_lock, flags);
 
 	return ret;
 }
diff --git a/drivers/pci/host/pcie-designware.h b/drivers/pci/host/pcie-designware.h
index 3063b35..a10747d 100644
--- a/drivers/pci/host/pcie-designware.h
+++ b/drivers/pci/host/pcie-designware.h
@@ -41,7 +41,6 @@ struct pcie_port {
 	void __iomem		*va_cfg1_base;
 	u64			io_base;
 	u64			mem_base;
-	spinlock_t		conf_lock;
 	struct resource		cfg;
 	struct resource		io;
 	struct resource		mem;
-- 
1.8.3.2


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] PCI: designware: Remove unnecessary use of 'conf_lock' spinlock
@ 2014-02-21  1:52 Jingoo Han
  2014-02-21  2:34 ` Hong-Xing.Zhu
  0 siblings, 1 reply; 4+ messages in thread
From: Jingoo Han @ 2014-02-21  1:52 UTC (permalink / raw)
  To: Andrew Murray
  Cc: linux-pci@vger.kernel.org, mohit.kumar@st.com, r65037, shawn.guo,
	Jingoo Han

T24gRnJpZGF5LCBGZWJydWFyeSAyMSwgMjAxNCA2OjQyIEFNLCBBbmRyZXcgTXVycmF5IHdyb3Rl
Og0KPiANCj4gU2VyaWFsaXphdGlvbiBvZiBjb25maWd1cmF0aW9uIGFjY2Vzc2VzIGlzIHByb3Zp
ZGVkIGJ5ICdwY2lfbG9jaycgaW4NCj4gZHJpdmVycy9wY2kvYWNjZXNzLmMgdGh1cyBtYWtpbmcg
dGhlIGRyaXZlcidzICdjb25mX2xvY2snIHN1cGVyZmx1b3VzLg0KPiANCj4gU2lnbmVkLW9mZi1i
eTogQW5kcmV3IE11cnJheSA8YW11cnJheUBlbWJlZGRlZC1iaXRzLmNvLnVrPg0KDQooK2NjIFJp
Y2hhcmQgWmh1LCBTaGF3biBHdW8pDQoNCkFja2VkLWJ5OiBKaW5nb28gSGFuIDxqZzEuaGFuQHNh
bXN1bmcuY29tPg0KDQpSaWdodCwgdGhhbmsgeW91IGZvciBzZW5kaW5nIHRoZSBwYXRjaC4gOi0p
DQoNCkJlc3QgcmVnYXJkcywNCkppbmdvbyBIYW4NCg0KPiAtLS0NCj4gIGRyaXZlcnMvcGNpL2hv
c3QvcGNpLWV4eW5vcy5jICAgICAgfCAxIC0NCj4gIGRyaXZlcnMvcGNpL2hvc3QvcGNpLWlteDYu
YyAgICAgICAgfCAxIC0NCj4gIGRyaXZlcnMvcGNpL2hvc3QvcGNpZS1kZXNpZ253YXJlLmMgfCA2
IC0tLS0tLQ0KPiAgZHJpdmVycy9wY2kvaG9zdC9wY2llLWRlc2lnbndhcmUuaCB8IDEgLQ0KPiAg
NCBmaWxlcyBjaGFuZ2VkLCA5IGRlbGV0aW9ucygtKQ0KPiANCj4gZGlmZiAtLWdpdCBhL2RyaXZl
cnMvcGNpL2hvc3QvcGNpLWV4eW5vcy5jIGIvZHJpdmVycy9wY2kvaG9zdC9wY2ktZXh5bm9zLmMN
Cj4gaW5kZXggM2RlNmJmYi4uMzJjNmQ1NiAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9wY2kvaG9z
dC9wY2ktZXh5bm9zLmMNCj4gKysrIGIvZHJpdmVycy9wY2kvaG9zdC9wY2ktZXh5bm9zLmMNCj4g
QEAgLTU0Niw3ICs1NDYsNiBAQCBzdGF0aWMgaW50IGFkZF9wY2llX3BvcnQoc3RydWN0IHBjaWVf
cG9ydCAqcHAsIHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpDQo+ICAJcHAtPnJvb3RfYnVz
X25yID0gLTE7DQo+ICAJcHAtPm9wcyA9ICZleHlub3NfcGNpZV9ob3N0X29wczsNCj4gDQo+IC0J
c3Bpbl9sb2NrX2luaXQoJnBwLT5jb25mX2xvY2spOw0KPiAgCXJldCA9IGR3X3BjaWVfaG9zdF9p
bml0KHBwKTsNCj4gIAlpZiAocmV0KSB7DQo+ICAJCWRldl9lcnIoJnBkZXYtPmRldiwgImZhaWxl
ZCB0byBpbml0aWFsaXplIGhvc3RcbiIpOw0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvaG9z
dC9wY2ktaW14Ni5jIGIvZHJpdmVycy9wY2kvaG9zdC9wY2ktaW14Ni5jDQo+IGluZGV4IGU4NjYz
YTguLjc3NTg4ZjEgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvcGNpL2hvc3QvcGNpLWlteDYuYw0K
PiArKysgYi9kcml2ZXJzL3BjaS9ob3N0L3BjaS1pbXg2LmMNCj4gQEAgLTQ4MCw3ICs0ODAsNiBA
QCBzdGF0aWMgaW50IGlteDZfYWRkX3BjaWVfcG9ydChzdHJ1Y3QgcGNpZV9wb3J0ICpwcCwNCj4g
IAlwcC0+cm9vdF9idXNfbnIgPSAtMTsNCj4gIAlwcC0+b3BzID0gJmlteDZfcGNpZV9ob3N0X29w
czsNCj4gDQo+IC0Jc3Bpbl9sb2NrX2luaXQoJnBwLT5jb25mX2xvY2spOw0KPiAgCXJldCA9IGR3
X3BjaWVfaG9zdF9pbml0KHBwKTsNCj4gIAlpZiAocmV0KSB7DQo+ICAJCWRldl9lcnIoJnBkZXYt
PmRldiwgImZhaWxlZCB0byBpbml0aWFsaXplIGhvc3RcbiIpOw0KPiBkaWZmIC0tZ2l0IGEvZHJp
dmVycy9wY2kvaG9zdC9wY2llLWRlc2lnbndhcmUuYyBiL2RyaXZlcnMvcGNpL2hvc3QvcGNpZS1k
ZXNpZ253YXJlLmMNCj4gaW5kZXggMTdjZTg4Zi4uYjI1YWRiOCAxMDA2NDQNCj4gLS0tIGEvZHJp
dmVycy9wY2kvaG9zdC9wY2llLWRlc2lnbndhcmUuYw0KPiArKysgYi9kcml2ZXJzL3BjaS9ob3N0
L3BjaWUtZGVzaWdud2FyZS5jDQo+IEBAIC02NDAsNyArNjQwLDYgQEAgc3RhdGljIGludCBkd19w
Y2llX3JkX2NvbmYoc3RydWN0IHBjaV9idXMgKmJ1cywgdTMyIGRldmZuLCBpbnQgd2hlcmUsDQo+
ICAJCQlpbnQgc2l6ZSwgdTMyICp2YWwpDQo+ICB7DQo+ICAJc3RydWN0IHBjaWVfcG9ydCAqcHAg
PSBzeXNfdG9fcGNpZShidXMtPnN5c2RhdGEpOw0KPiAtCXVuc2lnbmVkIGxvbmcgZmxhZ3M7DQo+
ICAJaW50IHJldDsNCj4gDQo+ICAJaWYgKCFwcCkgew0KPiBAQCAtNjUzLDEzICs2NTIsMTEgQEAg
c3RhdGljIGludCBkd19wY2llX3JkX2NvbmYoc3RydWN0IHBjaV9idXMgKmJ1cywgdTMyIGRldmZu
LCBpbnQgd2hlcmUsDQo+ICAJCXJldHVybiBQQ0lCSU9TX0RFVklDRV9OT1RfRk9VTkQ7DQo+ICAJ
fQ0KPiANCj4gLQlzcGluX2xvY2tfaXJxc2F2ZSgmcHAtPmNvbmZfbG9jaywgZmxhZ3MpOw0KPiAg
CWlmIChidXMtPm51bWJlciAhPSBwcC0+cm9vdF9idXNfbnIpDQo+ICAJCXJldCA9IGR3X3BjaWVf
cmRfb3RoZXJfY29uZihwcCwgYnVzLCBkZXZmbiwNCj4gIAkJCQkJCXdoZXJlLCBzaXplLCB2YWwp
Ow0KPiAgCWVsc2UNCj4gIAkJcmV0ID0gZHdfcGNpZV9yZF9vd25fY29uZihwcCwgd2hlcmUsIHNp
emUsIHZhbCk7DQo+IC0Jc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmcHAtPmNvbmZfbG9jaywgZmxh
Z3MpOw0KPiANCj4gIAlyZXR1cm4gcmV0Ow0KPiAgfQ0KPiBAQCAtNjY4LDcgKzY2NSw2IEBAIHN0
YXRpYyBpbnQgZHdfcGNpZV93cl9jb25mKHN0cnVjdCBwY2lfYnVzICpidXMsIHUzMiBkZXZmbiwN
Cj4gIAkJCWludCB3aGVyZSwgaW50IHNpemUsIHUzMiB2YWwpDQo+ICB7DQo+ICAJc3RydWN0IHBj
aWVfcG9ydCAqcHAgPSBzeXNfdG9fcGNpZShidXMtPnN5c2RhdGEpOw0KPiAtCXVuc2lnbmVkIGxv
bmcgZmxhZ3M7DQo+ICAJaW50IHJldDsNCj4gDQo+ICAJaWYgKCFwcCkgew0KPiBAQCAtNjc5LDEz
ICs2NzUsMTEgQEAgc3RhdGljIGludCBkd19wY2llX3dyX2NvbmYoc3RydWN0IHBjaV9idXMgKmJ1
cywgdTMyIGRldmZuLA0KPiAgCWlmIChkd19wY2llX3ZhbGlkX2NvbmZpZyhwcCwgYnVzLCBQQ0lf
U0xPVChkZXZmbikpID09IDApDQo+ICAJCXJldHVybiBQQ0lCSU9TX0RFVklDRV9OT1RfRk9VTkQ7
DQo+IA0KPiAtCXNwaW5fbG9ja19pcnFzYXZlKCZwcC0+Y29uZl9sb2NrLCBmbGFncyk7DQo+ICAJ
aWYgKGJ1cy0+bnVtYmVyICE9IHBwLT5yb290X2J1c19ucikNCj4gIAkJcmV0ID0gZHdfcGNpZV93
cl9vdGhlcl9jb25mKHBwLCBidXMsIGRldmZuLA0KPiAgCQkJCQkJd2hlcmUsIHNpemUsIHZhbCk7
DQo+ICAJZWxzZQ0KPiAgCQlyZXQgPSBkd19wY2llX3dyX293bl9jb25mKHBwLCB3aGVyZSwgc2l6
ZSwgdmFsKTsNCj4gLQlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZwcC0+Y29uZl9sb2NrLCBmbGFn
cyk7DQo+IA0KPiAgCXJldHVybiByZXQ7DQo+ICB9DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3Bj
aS9ob3N0L3BjaWUtZGVzaWdud2FyZS5oIGIvZHJpdmVycy9wY2kvaG9zdC9wY2llLWRlc2lnbndh
cmUuaA0KPiBpbmRleCAzMDYzYjM1Li5hMTA3NDdkIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL3Bj
aS9ob3N0L3BjaWUtZGVzaWdud2FyZS5oDQo+ICsrKyBiL2RyaXZlcnMvcGNpL2hvc3QvcGNpZS1k
ZXNpZ253YXJlLmgNCj4gQEAgLTQxLDcgKzQxLDYgQEAgc3RydWN0IHBjaWVfcG9ydCB7DQo+ICAJ
dm9pZCBfX2lvbWVtCQkqdmFfY2ZnMV9iYXNlOw0KPiAgCXU2NAkJCWlvX2Jhc2U7DQo+ICAJdTY0
CQkJbWVtX2Jhc2U7DQo+IC0Jc3BpbmxvY2tfdAkJY29uZl9sb2NrOw0KPiAgCXN0cnVjdCByZXNv
dXJjZQkJY2ZnOw0KPiAgCXN0cnVjdCByZXNvdXJjZQkJaW87DQo+ICAJc3RydWN0IHJlc291cmNl
CQltZW07DQo+IC0tDQo+IDEuOC4zLjINCg==



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-04-03 22:36 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-20 21:41 [PATCH] PCI: designware: Remove unnecessary use of 'conf_lock' spinlock Andrew Murray
2014-04-03 22:36 ` Bjorn Helgaas
  -- strict thread matches above, loose matches on Subject: below --
2014-02-21  1:52 Jingoo Han
2014-02-21  2:34 ` Hong-Xing.Zhu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).