* [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
* 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, 0 replies; 4+ messages in thread
From: Hong-Xing.Zhu @ 2014-02-21 2:34 UTC (permalink / raw)
To: jg1.han@samsung.com, Andrew Murray
Cc: linux-pci@vger.kernel.org, mohit.kumar@st.com,
shawn.guo@linaro.org
DQpCZXN0IFJlZ2FyZHMNClJpY2hhcmQgWmh1DQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0t
LS0NCj4gRnJvbTogbGludXgtcGNpLW93bmVyQHZnZXIua2VybmVsLm9yZyBbbWFpbHRvOmxpbnV4
LXBjaS1vd25lckB2Z2VyLmtlcm5lbC5vcmddDQo+IE9uIEJlaGFsZiBPZiBKaW5nb28gSGFuDQo+
IFNlbnQ6IEZyaWRheSwgRmVicnVhcnkgMjEsIDIwMTQgOTo1MyBBTQ0KPiBUbzogQW5kcmV3IE11
cnJheQ0KPiBDYzogbGludXgtcGNpQHZnZXIua2VybmVsLm9yZzsgbW9oaXQua3VtYXJAc3QuY29t
OyBaaHUgUmljaGFyZC1SNjUwMzc7DQo+IHNoYXduLmd1b0BsaW5hcm8ub3JnOyBKaW5nb28gSGFu
DQo+IFN1YmplY3Q6IFJlOiBbUEFUQ0hdIFBDSTogZGVzaWdud2FyZTogUmVtb3ZlIHVubmVjZXNz
YXJ5IHVzZSBvZiAnY29uZl9sb2NrJw0KPiBzcGlubG9jaw0KPiANCj4gT24gRnJpZGF5LCBGZWJy
dWFyeSAyMSwgMjAxNCA2OjQyIEFNLCBBbmRyZXcgTXVycmF5IHdyb3RlOg0KPiA+DQo+ID4gU2Vy
aWFsaXphdGlvbiBvZiBjb25maWd1cmF0aW9uIGFjY2Vzc2VzIGlzIHByb3ZpZGVkIGJ5ICdwY2lf
bG9jaycgaW4NCj4gPiBkcml2ZXJzL3BjaS9hY2Nlc3MuYyB0aHVzIG1ha2luZyB0aGUgZHJpdmVy
J3MgJ2NvbmZfbG9jaycgc3VwZXJmbHVvdXMuDQo+ID4NCj4gPiBTaWduZWQtb2ZmLWJ5OiBBbmRy
ZXcgTXVycmF5IDxhbXVycmF5QGVtYmVkZGVkLWJpdHMuY28udWs+DQo+IA0KPiAoK2NjIFJpY2hh
cmQgWmh1LCBTaGF3biBHdW8pDQo+IA0KPiBBY2tlZC1ieTogSmluZ29vIEhhbiA8amcxLmhhbkBz
YW1zdW5nLmNvbT4NCj4gDQo+IFJpZ2h0LCB0aGFuayB5b3UgZm9yIHNlbmRpbmcgdGhlIHBhdGNo
LiA6LSkNCg0KQWNrZWQtYnk6IFJpY2hhcmQgWmh1IDxyNjUwMzdAZnJlZXNjYWxlLmNvbT4NClRo
YW5rcy4NCkJlc3QgUmVnYXJkcw0KUmljaGFyZA0KPiANCj4gQmVzdCByZWdhcmRzLA0KPiBKaW5n
b28gSGFuDQo+IA0KPiA+IC0tLQ0KPiA+ICBkcml2ZXJzL3BjaS9ob3N0L3BjaS1leHlub3MuYyAg
ICAgIHwgMSAtDQo+ID4gIGRyaXZlcnMvcGNpL2hvc3QvcGNpLWlteDYuYyAgICAgICAgfCAxIC0N
Cj4gPiAgZHJpdmVycy9wY2kvaG9zdC9wY2llLWRlc2lnbndhcmUuYyB8IDYgLS0tLS0tDQo+ID4g
ZHJpdmVycy9wY2kvaG9zdC9wY2llLWRlc2lnbndhcmUuaCB8IDEgLQ0KPiA+ICA0IGZpbGVzIGNo
YW5nZWQsIDkgZGVsZXRpb25zKC0pDQo+ID4NCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kv
aG9zdC9wY2ktZXh5bm9zLmMNCj4gPiBiL2RyaXZlcnMvcGNpL2hvc3QvcGNpLWV4eW5vcy5jIGlu
ZGV4IDNkZTZiZmIuLjMyYzZkNTYgMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVycy9wY2kvaG9zdC9w
Y2ktZXh5bm9zLmMNCj4gPiArKysgYi9kcml2ZXJzL3BjaS9ob3N0L3BjaS1leHlub3MuYw0KPiA+
IEBAIC01NDYsNyArNTQ2LDYgQEAgc3RhdGljIGludCBhZGRfcGNpZV9wb3J0KHN0cnVjdCBwY2ll
X3BvcnQgKnBwLCBzdHJ1Y3QNCj4gcGxhdGZvcm1fZGV2aWNlICpwZGV2KQ0KPiA+ICAJcHAtPnJv
b3RfYnVzX25yID0gLTE7DQo+ID4gIAlwcC0+b3BzID0gJmV4eW5vc19wY2llX2hvc3Rfb3BzOw0K
PiA+DQo+ID4gLQlzcGluX2xvY2tfaW5pdCgmcHAtPmNvbmZfbG9jayk7DQo+ID4gIAlyZXQgPSBk
d19wY2llX2hvc3RfaW5pdChwcCk7DQo+ID4gIAlpZiAocmV0KSB7DQo+ID4gIAkJZGV2X2Vycigm
cGRldi0+ZGV2LCAiZmFpbGVkIHRvIGluaXRpYWxpemUgaG9zdFxuIik7IGRpZmYgLS1naXQNCj4g
PiBhL2RyaXZlcnMvcGNpL2hvc3QvcGNpLWlteDYuYyBiL2RyaXZlcnMvcGNpL2hvc3QvcGNpLWlt
eDYuYyBpbmRleA0KPiA+IGU4NjYzYTguLjc3NTg4ZjEgMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVy
cy9wY2kvaG9zdC9wY2ktaW14Ni5jDQo+ID4gKysrIGIvZHJpdmVycy9wY2kvaG9zdC9wY2ktaW14
Ni5jDQo+ID4gQEAgLTQ4MCw3ICs0ODAsNiBAQCBzdGF0aWMgaW50IGlteDZfYWRkX3BjaWVfcG9y
dChzdHJ1Y3QgcGNpZV9wb3J0ICpwcCwNCj4gPiAgCXBwLT5yb290X2J1c19uciA9IC0xOw0KPiA+
ICAJcHAtPm9wcyA9ICZpbXg2X3BjaWVfaG9zdF9vcHM7DQo+ID4NCj4gPiAtCXNwaW5fbG9ja19p
bml0KCZwcC0+Y29uZl9sb2NrKTsNCj4gPiAgCXJldCA9IGR3X3BjaWVfaG9zdF9pbml0KHBwKTsN
Cj4gPiAgCWlmIChyZXQpIHsNCj4gPiAgCQlkZXZfZXJyKCZwZGV2LT5kZXYsICJmYWlsZWQgdG8g
aW5pdGlhbGl6ZSBob3N0XG4iKTsgZGlmZiAtLWdpdA0KPiA+IGEvZHJpdmVycy9wY2kvaG9zdC9w
Y2llLWRlc2lnbndhcmUuYw0KPiA+IGIvZHJpdmVycy9wY2kvaG9zdC9wY2llLWRlc2lnbndhcmUu
Yw0KPiA+IGluZGV4IDE3Y2U4OGYuLmIyNWFkYjggMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVycy9w
Y2kvaG9zdC9wY2llLWRlc2lnbndhcmUuYw0KPiA+ICsrKyBiL2RyaXZlcnMvcGNpL2hvc3QvcGNp
ZS1kZXNpZ253YXJlLmMNCj4gPiBAQCAtNjQwLDcgKzY0MCw2IEBAIHN0YXRpYyBpbnQgZHdfcGNp
ZV9yZF9jb25mKHN0cnVjdCBwY2lfYnVzICpidXMsIHUzMg0KPiBkZXZmbiwgaW50IHdoZXJlLA0K
PiA+ICAJCQlpbnQgc2l6ZSwgdTMyICp2YWwpDQo+ID4gIHsNCj4gPiAgCXN0cnVjdCBwY2llX3Bv
cnQgKnBwID0gc3lzX3RvX3BjaWUoYnVzLT5zeXNkYXRhKTsNCj4gPiAtCXVuc2lnbmVkIGxvbmcg
ZmxhZ3M7DQo+ID4gIAlpbnQgcmV0Ow0KPiA+DQo+ID4gIAlpZiAoIXBwKSB7DQo+ID4gQEAgLTY1
MywxMyArNjUyLDExIEBAIHN0YXRpYyBpbnQgZHdfcGNpZV9yZF9jb25mKHN0cnVjdCBwY2lfYnVz
ICpidXMsIHUzMg0KPiBkZXZmbiwgaW50IHdoZXJlLA0KPiA+ICAJCXJldHVybiBQQ0lCSU9TX0RF
VklDRV9OT1RfRk9VTkQ7DQo+ID4gIAl9DQo+ID4NCj4gPiAtCXNwaW5fbG9ja19pcnFzYXZlKCZw
cC0+Y29uZl9sb2NrLCBmbGFncyk7DQo+ID4gIAlpZiAoYnVzLT5udW1iZXIgIT0gcHAtPnJvb3Rf
YnVzX25yKQ0KPiA+ICAJCXJldCA9IGR3X3BjaWVfcmRfb3RoZXJfY29uZihwcCwgYnVzLCBkZXZm
biwNCj4gPiAgCQkJCQkJd2hlcmUsIHNpemUsIHZhbCk7DQo+ID4gIAllbHNlDQo+ID4gIAkJcmV0
ID0gZHdfcGNpZV9yZF9vd25fY29uZihwcCwgd2hlcmUsIHNpemUsIHZhbCk7DQo+ID4gLQlzcGlu
X3VubG9ja19pcnFyZXN0b3JlKCZwcC0+Y29uZl9sb2NrLCBmbGFncyk7DQo+ID4NCj4gPiAgCXJl
dHVybiByZXQ7DQo+ID4gIH0NCj4gPiBAQCAtNjY4LDcgKzY2NSw2IEBAIHN0YXRpYyBpbnQgZHdf
cGNpZV93cl9jb25mKHN0cnVjdCBwY2lfYnVzICpidXMsIHUzMg0KPiBkZXZmbiwNCj4gPiAgCQkJ
aW50IHdoZXJlLCBpbnQgc2l6ZSwgdTMyIHZhbCkNCj4gPiAgew0KPiA+ICAJc3RydWN0IHBjaWVf
cG9ydCAqcHAgPSBzeXNfdG9fcGNpZShidXMtPnN5c2RhdGEpOw0KPiA+IC0JdW5zaWduZWQgbG9u
ZyBmbGFnczsNCj4gPiAgCWludCByZXQ7DQo+ID4NCj4gPiAgCWlmICghcHApIHsNCj4gPiBAQCAt
Njc5LDEzICs2NzUsMTEgQEAgc3RhdGljIGludCBkd19wY2llX3dyX2NvbmYoc3RydWN0IHBjaV9i
dXMgKmJ1cywgdTMyDQo+IGRldmZuLA0KPiA+ICAJaWYgKGR3X3BjaWVfdmFsaWRfY29uZmlnKHBw
LCBidXMsIFBDSV9TTE9UKGRldmZuKSkgPT0gMCkNCj4gPiAgCQlyZXR1cm4gUENJQklPU19ERVZJ
Q0VfTk9UX0ZPVU5EOw0KPiA+DQo+ID4gLQlzcGluX2xvY2tfaXJxc2F2ZSgmcHAtPmNvbmZfbG9j
aywgZmxhZ3MpOw0KPiA+ICAJaWYgKGJ1cy0+bnVtYmVyICE9IHBwLT5yb290X2J1c19ucikNCj4g
PiAgCQlyZXQgPSBkd19wY2llX3dyX290aGVyX2NvbmYocHAsIGJ1cywgZGV2Zm4sDQo+ID4gIAkJ
CQkJCXdoZXJlLCBzaXplLCB2YWwpOw0KPiA+ICAJZWxzZQ0KPiA+ICAJCXJldCA9IGR3X3BjaWVf
d3Jfb3duX2NvbmYocHAsIHdoZXJlLCBzaXplLCB2YWwpOw0KPiA+IC0Jc3Bpbl91bmxvY2tfaXJx
cmVzdG9yZSgmcHAtPmNvbmZfbG9jaywgZmxhZ3MpOw0KPiA+DQo+ID4gIAlyZXR1cm4gcmV0Ow0K
PiA+ICB9DQo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvcGNpL2hvc3QvcGNpZS1kZXNpZ253YXJl
LmgNCj4gPiBiL2RyaXZlcnMvcGNpL2hvc3QvcGNpZS1kZXNpZ253YXJlLmgNCj4gPiBpbmRleCAz
MDYzYjM1Li5hMTA3NDdkIDEwMDY0NA0KPiA+IC0tLSBhL2RyaXZlcnMvcGNpL2hvc3QvcGNpZS1k
ZXNpZ253YXJlLmgNCj4gPiArKysgYi9kcml2ZXJzL3BjaS9ob3N0L3BjaWUtZGVzaWdud2FyZS5o
DQo+ID4gQEAgLTQxLDcgKzQxLDYgQEAgc3RydWN0IHBjaWVfcG9ydCB7DQo+ID4gIAl2b2lkIF9f
aW9tZW0JCSp2YV9jZmcxX2Jhc2U7DQo+ID4gIAl1NjQJCQlpb19iYXNlOw0KPiA+ICAJdTY0CQkJ
bWVtX2Jhc2U7DQo+ID4gLQlzcGlubG9ja190CQljb25mX2xvY2s7DQo+ID4gIAlzdHJ1Y3QgcmVz
b3VyY2UJCWNmZzsNCj4gPiAgCXN0cnVjdCByZXNvdXJjZQkJaW87DQo+ID4gIAlzdHJ1Y3QgcmVz
b3VyY2UJCW1lbTsNCj4gPiAtLQ0KPiA+IDEuOC4zLjINCj4gBOe/gXsubj/CiT/vo6jCie+jp8KG
KyXCij96d23ChT/Cne+njeq/qT8/eljjjokaXMKKKT/vppt3Kmpn0J8/P8Kawo7CiuWttWovwoHl
hap667CbwpbCij/Cij/ikaHvo6c/Pw0KPiDlgpg/65u0f++jqj/vo6hHPz/vo6gPPzordsKJP3c/
5piODQo=
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] PCI: designware: Remove unnecessary use of 'conf_lock' spinlock
2014-02-20 21:41 [PATCH] PCI: designware: Remove unnecessary use of 'conf_lock' spinlock Andrew Murray
@ 2014-04-03 22:36 ` Bjorn Helgaas
0 siblings, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2014-04-03 22:36 UTC (permalink / raw)
To: Andrew Murray; +Cc: linux-pci, mohit.kumar, jg1.han
On Thu, Feb 20, 2014 at 09:41:34PM +0000, Andrew Murray wrote:
> 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>
Applied with Jingoo and Richard's acks to my pci/pending branch for v3.16.
After v3.15-rc1, I'll sort it into pci/host-mvebu as usual. Thanks!
> ---
> 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
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ 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).