Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1267048 > unrolled thread

[4.4 regression] 46a7fd8a : pcnet32: use pci_set_dma_mask insted of pci_dma_supported

Started by허종만 <jongman.heo@samsung.com>
First post2015-11-11 10:00 +0100
Last post2015-11-16 05:30 +0100
Articles 3 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [4.4 regression] 46a7fd8a : pcnet32: use pci_set_dma_mask insted of  pci_dma_supported 허종만 <jongman.heo@samsung.com> - 2015-11-11 10:00 +0100
    Re: [4.4 regression] 46a7fd8a : pcnet32: use pci_set_dma_mask  insted of pci_dma_supported Christoph Hellwig <hch@lst.de> - 2015-11-11 13:00 +0100
      Re: [4.4 regression] 46a7fd8a : pcnet32: use pci_set_dma_mask  insted of pci_dma_supported Don Fry <pcnet32@frontier.com> - 2015-11-16 05:30 +0100

#1267048 — [4.4 regression] 46a7fd8a : pcnet32: use pci_set_dma_mask insted of pci_dma_supported

From허종만 <jongman.heo@samsung.com>
Date2015-11-11 10:00 +0100
Subject[4.4 regression] 46a7fd8a : pcnet32: use pci_set_dma_mask insted of pci_dma_supported
Message-ID<qtzq2-t6-25@gated-at.bofh.it>
DQpIaSwNCg0KSSdtIHVzaW5nIEZlZG9yYSAyMyBMaW51eCBHdWVzdCBvbiB0b3Agb2YgVk1XYXJl
IHdvcmtzdGF0aW9uICh2ZXJzaW9uIDEwKSwgcnVubmluZyBvbiBXaW5kb3dzIDcgSG9zdC4NCg0K
QWZ0ZXIgcHVsbGluZyBNZXJnZSBicmFuY2ggJ2FrcG0nIGZyb20gbGF0ZXN0IExpbnVzIGdpdCwg
bXkgZXRoZXJuZXQgaW50ZXJmYWNlIGRvZXNuJ3Qgd29yay4NCg0KRnJvbSBkbWVzZywgSSBjYW4g
c2VlIHRoYXQgcGNuZXQzMiBkb2Vzbid0IHN1cHBvcnQgMzJiaXQgUENJIGJ1c21hc3RlciBETUEs
IGFzIGZvbGxvd3MuDQoNClsgICAgMS42MTY4NjddIGxpYnBoeTogRml4ZWQgTURJTyBCdXM6IHBy
b2JlZA0KWyAgICAxLjYxNjg3MV0gcGNuZXQzMjogcGNuZXQzMi5jOnYxLjM1IDIxLkFwci4yMDA4
IHRzYm9nZW5kQGFscGhhLmZyYW5rZW4uZGUNClsgICAgMS42MTcyMzJdIHBjbmV0MzI6IGFyY2hp
dGVjdHVyZSBkb2VzIG5vdCBzdXBwb3J0IDMyYml0IFBDSSBidXNtYXN0ZXIgRE1BDQpbICAgIDEu
NjE3MzA0XSBWTXdhcmUgdm14bmV0MyB2aXJ0dWFsIE5JQyBkcml2ZXIgLSB2ZXJzaW9uIDEuNC4z
LjAtay1OQVBJDQoNCldpdGhvdXQgdGhlIGNvbW1pdCwgcGNuZXQzMiBldGhlcm5ldCBpcyByZWNv
Z25pemVkIGNvcnJlY3RseS4NCg0KWyAgICAxLjE3MzM5NV0gbGlicGh5OiBGaXhlZCBNRElPIEJ1
czogcHJvYmVkDQpbICAgIDEuMTczMzk5XSBwY25ldDMyOiBwY25ldDMyLmM6djEuMzUgMjEuQXBy
LjIwMDggdHNib2dlbmRAYWxwaGEuZnJhbmtlbi5kZQ0KWyAgICAxLjE3MzYzN10gcGNuZXQzMjog
UENuZXQvUENJIElJIDc5Qzk3MEEgYXQgMHgyMDAwLCAwMDowYzoyOTowNzplMjo1MSBhc3NpZ25l
ZCBJUlEgMTkNClsgICAgMS4xNzM3NDZdIHBjbmV0MzI6IGV0aDA6IHJlZ2lzdGVyZWQgYXMgUENu
ZXQvUENJIElJIDc5Qzk3MEENClsgICAgMS4xNzM3OTldIHBjbmV0MzI6IDEgY2FyZHNfZm91bmQN
ClsgICAgMS4xNzM4MDJdIFZNd2FyZSB2bXhuZXQzIHZpcnR1YWwgTklDIGRyaXZlciAtIHZlcnNp
b24gMS40LjIuMC1rLU5BUEkNCg0KDQpCZWxvdyBpcyBnaXQgYmlzZWN0IGxvZy4NCg0KNDZhN2Zk
OGE5YjMwMjExNmIzMjYzYmM4ZTQ3ZjhmMDhjMGQzYTJjYSBpcyB0aGUgZmlyc3QgYmFkIGNvbW1p
dA0KY29tbWl0IDQ2YTdmZDhhOWIzMDIxMTZiMzI2M2JjOGU0N2Y4ZjA4YzBkM2EyY2ENCkF1dGhv
cjogQ2hyaXN0b3BoIEhlbGx3aWcgPGhjaEBsc3QuZGU+DQpEYXRlOiAgIFR1ZSBOb3YgMTAgMTQ6
NDU6MTcgMjAxNSAtMDgwMA0KDQogICAgcGNuZXQzMjogdXNlIHBjaV9zZXRfZG1hX21hc2sgaW5z
dGVkIG9mIHBjaV9kbWFfc3VwcG9ydGVkDQogICAgDQogICAgQWxsIGRyaXZlcnMgc2hvdWxkIGJl
IHVzaW5nIGRtYV9zZXRfbWFzayAvIHBjaV9zZXRfZG1hX21hc2sgdG8gdHJ5IHRvDQogICAgc2V0
IHRoZSBkbWEgbWFzayBpbnN0ZWFkIG9mIGp1c3QgcXVlcnlpbmcgaXQuICBXaXRob3V0IHRoYXQg
c29tZSBpb21tdQ0KICAgIGltcGxlbWVudGF0aW9ucyBtYXkgbm90IHdvcmsuDQogICAgDQogICAg
cGNpX2RtYV9zdXBwb3J0ZWQgaXMgcmVtb3ZlZCBlbnRpcmVseSwgYnV0IGRtYV9zdXBwb3J0ZWQg
c3RheXMgZm9yDQogICAgZG1hX29wcyBpbXBsZW1lbnRhdGlvbnMgZm9yIG5vdy4NCiAgICANCiAg
ICBUaGlzIHBhdGNoIChvZiAxNSk6DQogICAgDQogICAgVGhpcyBlbnN1cmVzIHRoZSBkbWEgbWFz
ayB0aGF0IGlzIHN1cHBvcnRlZCBieSB0aGUgZHJpdmVyIGlzIHJlY29yZGVkDQogICAgaW4gdGhl
IGRldmljZSBzdHJ1Y3R1cmUuDQogICAgDQogICAgU2lnbmVkLW9mZi1ieTogQ2hyaXN0b3BoIEhl
bGx3aWcgPGhjaEBsc3QuZGU+DQogICAgQWNrZWQtYnk6IERvbiBGcnkgPHBjbmV0MzJAZnJvbnRp
ZXIuY29tPg0KICAgIENjOiAiRGF2aWQgUy4gTWlsbGVyIiA8ZGF2ZW1AZGF2ZW1sb2Z0Lm5ldD4N
CiAgICBDYzogIkphbWVzIEUuSi4gQm90dG9tbGV5IiA8amVqYkBwYXJpc2MtbGludXgub3JnPg0K
ICAgIENjOiBBbGFuIFN0ZXJuIDxzdGVybkByb3dsYW5kLmhhcnZhcmQuZWR1Pg0KICAgIENjOiBB
bGV4YW5kcmUgQ291cmJvdCA8YWNvdXJib3RAbnZpZGlhLmNvbT4NCiAgICBDYzogQWxleGV5IEto
b3Jvc2hpbG92IDxraG9yb3NoaWxvdkBpc3ByYXMucnU+DQogICAgQ2M6IEJlbiBTa2VnZ3MgPGJz
a2VnZ3NAcmVkaGF0LmNvbT4NCiAgICBDYzogQ2hyaXN0b3BoIEhlbGx3aWcgPGhjaEBsc3QuZGU+
DQogICAgQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+DQogICAgQ2M6
IERhdmUgQWlybGllIDxhaXJsaWVkQHJlZGhhdC5jb20+DQogICAgQ2M6IERhdmlkIEFpcmxpZSA8
YWlybGllZEBsaW51eC5pZT4NCiAgICBDYzogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGlu
dXhmb3VuZGF0aW9uLm9yZz4NCiAgICBDYzogSGFucyBWZXJrdWlsIDxodmVya3VpbEB4czRhbGwu
bmw+DQogICAgQ2M6IEhlbGdlIERlbGxlciA8ZGVsbGVyQGdteC5kZT4NCiAgICBDYzogSmlyaSBT
bGFieSA8anNsYWJ5QHN1c2UuY29tPg0KICAgIENjOiBNYXVybyBDYXJ2YWxobyBDaGVoYWIgPG1j
aGVoYWJAb3NnLnNhbXN1bmcuY29tPg0KICAgIENjOiBQYXdlbCBPc2NpYWsgPHBhd2VsQG9zY2lh
ay5jb20+DQogICAgQ2M6IFNha2FyaSBBaWx1cyA8c2FrYXJpLmFpbHVzQGxpbnV4LmludGVsLmNv
bT4NCiAgICBDYzogU2VyZ2V5IEtvemxvdiA8c2VyamtAbmV0dXAucnU+DQogICAgQ2M6IFNocmFk
aGEgU2hhaCA8c3NoYWhAc29sYXJmbGFyZS5jb20+DQogICAgQ2M6IFNvbGFyZmxhcmUgbGludXgg
bWFpbnRhaW5lcnMgPGxpbnV4LW5ldC1kcml2ZXJzQHNvbGFyZmxhcmUuY29tPg0KICAgIENjOiBT
dGV2ZW4gVG90aCA8c3RvdGhAa2VybmVsbGFicy5jb20+DQogICAgQ2M6IFRoaWVycnkgUmVkaW5n
IDx0cmVkaW5nQG52aWRpYS5jb20+DQogICAgU2lnbmVkLW9mZi1ieTogQW5kcmV3IE1vcnRvbiA8
YWtwbUBsaW51eC1mb3VuZGF0aW9uLm9yZz4NCiAgICBTaWduZWQtb2ZmLWJ5OiBMaW51cyBUb3J2
YWxkcyA8dG9ydmFsZHNAbGludXgtZm91bmRhdGlvbi5vcmc+DQoNCjowNDAwMDAgMDQwMDAwIGRk
MGE2N2I2OTE4MGVkYzUyNDM1NzhjODUwNGNkMmJkNWQ0ZWZlMjQgMWY5MmNiM2Q4NjExMWQ3MjVm
NGNmNmE4NDA3NmU4ZDllZWUwNDM2MiBNCWRyaXZlcnMNCg0KIyBnaXQgYmlzZWN0IGxvZw0KZ2l0
IGJpc2VjdCBzdGFydA0KIyBiYWQ6IFtjNWEzNzg4M2Y0MmJlNzEyYTk4OWU1NGQ1ZDZjMDE1OWIw
ZTU2NTk5XSBNZXJnZSBicmFuY2ggJ2FrcG0nIChwYXRjaGVzIGZyb20gQW5kcmV3KQ0KZ2l0IGJp
c2VjdCBiYWQgYzVhMzc4ODNmNDJiZTcxMmE5ODllNTRkNWQ2YzAxNTliMGU1NjU5OQ0KIyBnb29k
OiBbYWUzNmNlMDdhYmJkZGUzNTIxZGMwZWY3ZTMyMTQzYjg4NzE4Y2QyMV0gTWVyZ2UgYnJhbmNo
ICdkcm0tZml4ZXMnIG9mIGdpdDovL3Blb3BsZS5mcmVlZGVza3RvcC5vcmcvfmFpcmxpZWQvbGlu
dXgNCmdpdCBiaXNlY3QgZ29vZCBhZTM2Y2UwN2FiYmRkZTM1MjFkYzBlZjdlMzIxNDNiODg3MThj
ZDIxDQojIGdvb2Q6IFtiZTU5NmFhYTc0MDkwZjU1M2M2MTUwNWFkMDNiYjdhNzQ2MGU1ZDIzXSBB
ZGQgY3VycmVudCBzZWxlY3Rpb24gY2hlY2suDQpnaXQgYmlzZWN0IGdvb2QgYmU1OTZhYWE3NDA5
MGY1NTNjNjE1MDVhZDAzYmI3YTc0NjBlNWQyMw0KIyBnb29kOiBbNWRmZTViMmM3MTRhNWJlYTA5
MDhjMWUwMGRhMGU4ZTAwNTM1ZjU1Y10gTWVyZ2UgYnJhbmNoICdtaXNjJyBvZiBnaXQ6Ly9naXQu
a2VybmVsLm9yZy9wdWIvc2NtL2xpbnV4L2tlcm5lbC9naXQvbW1hcmVrL2tidWlsZA0KZ2l0IGJp
c2VjdCBnb29kIDVkZmU1YjJjNzE0YTViZWEwOTA4YzFlMDBkYTBlOGUwMDUzNWY1NWMNCiMgYmFk
OiBbMTExYmU4YjI4ZDg3NzY5ZGZiZGU5MDE2MDJkMjYyOTAyNTc1ODA1ZF0gY3g4ODogdXNlIHBj
aV9zZXRfZG1hX21hc2sgaW5zdGVkIG9mIHBjaV9kbWFfc3VwcG9ydGVkDQpnaXQgYmlzZWN0IGJh
ZCAxMTFiZThiMjhkODc3NjlkZmJkZTkwMTYwMmQyNjI5MDI1NzU4MDVkDQojIGdvb2Q6IFszMzY4
ZThmYmNkYTUzOWU0ZjlkNmNkYjc1MGYyM2MyNTAyMTY5OGM5XSBsaWIvc3RyaW5nLmM6IGFkZCBV
TEwgc3VmZml4IHRvIHRoZSBjb25zdGFudCBkZWZpbml0aW9uDQpnaXQgYmlzZWN0IGdvb2QgMzM2
OGU4ZmJjZGE1MzllNGY5ZDZjZGI3NTBmMjNjMjUwMjE2OThjOQ0KIyBiYWQ6IFtiYWQwMDdiY2E3
Yjc2NDNmZWE3ODY3MzcwNzFjODYwODhiYTI4MDNiXSB0dzY4LWNvcmU6IHVzZSBwY2lfc2V0X2Rt
YV9tYXNrIGluc3RlZCBvZiBwY2lfZG1hX3N1cHBvcnRlZA0KZ2l0IGJpc2VjdCBiYWQgYmFkMDA3
YmNhN2I3NjQzZmVhNzg2NzM3MDcxYzg2MDg4YmEyODAzYg0KIyBiYWQ6IFs0NmE3ZmQ4YTliMzAy
MTE2YjMyNjNiYzhlNDdmOGYwOGMwZDNhMmNhXSBwY25ldDMyOiB1c2UgcGNpX3NldF9kbWFfbWFz
ayBpbnN0ZWQgb2YgcGNpX2RtYV9zdXBwb3J0ZWQNCmdpdCBiaXNlY3QgYmFkIDQ2YTdmZDhhOWIz
MDIxMTZiMzI2M2JjOGU0N2Y4ZjA4YzBkM2EyY2ENCiMgZmlyc3QgYmFkIGNvbW1pdDogWzQ2YTdm
ZDhhOWIzMDIxMTZiMzI2M2JjOGU0N2Y4ZjA4YzBkM2EyY2FdIHBjbmV0MzI6IHVzZSBwY2lfc2V0
X2RtYV9tYXNrIGluc3RlZCBvZiBwY2lfZG1hX3N1cHBvcnRlZA==


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]


#1267119 — Re: [4.4 regression] 46a7fd8a : pcnet32: use pci_set_dma_mask insted of pci_dma_supported

FromChristoph Hellwig <hch@lst.de>
Date2015-11-11 13:00 +0100
SubjectRe: [4.4 regression] 46a7fd8a : pcnet32: use pci_set_dma_mask insted of pci_dma_supported
Message-ID<qtCef-2hA-15@gated-at.bofh.it>
In reply to#1267048
Can you try the patch below?

diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index e2afabf..7ccebae 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -1500,10 +1500,11 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
 		return -ENODEV;
 	}
 
-	if (!pci_set_dma_mask(pdev, PCNET32_DMA_MASK)) {
+	err = pci_set_dma_mask(pdev, PCNET32_DMA_MASK);
+	if (err) {
 		if (pcnet32_debug & NETIF_MSG_PROBE)
 			pr_err("architecture does not support 32bit PCI busmaster DMA\n");
-		return -ENODEV;
+		return err;
 	}
 	if (!request_region(ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_pci")) {
 		if (pcnet32_debug & NETIF_MSG_PROBE)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1269845 — Re: [4.4 regression] 46a7fd8a : pcnet32: use pci_set_dma_mask insted of pci_dma_supported

FromDon Fry <pcnet32@frontier.com>
Date2015-11-16 05:30 +0100
SubjectRe: [4.4 regression] 46a7fd8a : pcnet32: use pci_set_dma_mask insted of pci_dma_supported
Message-ID<qvjAu-2w5-1@gated-at.bofh.it>
In reply to#1267119
On Wed, 2015-11-11 at 12:58 +0100, Christoph Hellwig wrote:
> Can you try the patch below?

Acked-by: Don Fry <pcnet32@frontier.com>
-- 
Since pci_set_dma_mask() returns the opposite of pci_dma_supported(),
this fix is required for proper operation.  The original patch in
October was faulty.
> 
> diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
> index e2afabf..7ccebae 100644
> --- a/drivers/net/ethernet/amd/pcnet32.c
> +++ b/drivers/net/ethernet/amd/pcnet32.c
> @@ -1500,10 +1500,11 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
>  		return -ENODEV;
>  	}
>  
> -	if (!pci_set_dma_mask(pdev, PCNET32_DMA_MASK)) {
> +	err = pci_set_dma_mask(pdev, PCNET32_DMA_MASK);
> +	if (err) {
>  		if (pcnet32_debug & NETIF_MSG_PROBE)
>  			pr_err("architecture does not support 32bit PCI busmaster DMA\n");
> -		return -ENODEV;
> +		return err;
>  	}
>  	if (!request_region(ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_pci")) {
>  		if (pcnet32_debug & NETIF_MSG_PROBE)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web