* [PATCH v2] r8169: set coherent DMA mask as well as streaming DMA mask
@ 2016-10-14 13:40 Ard Biesheuvel
2016-10-14 13:42 ` David Laight
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Ard Biesheuvel @ 2016-10-14 13:40 UTC (permalink / raw)
To: romieu, nic_swsd, netdev, linux-kernel, davem; +Cc: Ard Biesheuvel
PCI devices that are 64-bit DMA capable should set the coherent
DMA mask as well as the streaming DMA mask. On some architectures,
these are managed separately, and so the coherent DMA mask will be
left at its default value of 32 if it is not set explicitly. This
results in errors such as
r8169 Gigabit Ethernet driver 2.3LK-NAPI loaded
hwdev DMA mask = 0x00000000ffffffff, dev_addr = 0x00000080fbfff000
swiotlb: coherent allocation failed for device 0000:02:00.0 size=4096
CPU: 0 PID: 1062 Comm: systemd-udevd Not tainted 4.8.0+ #35
Hardware name: AMD Seattle/Seattle, BIOS 10:53:24 Oct 13 2016
on systems without memory that is 32-bit addressable by PCI devices.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
v2: dropped the hunk that sets the coherent DMA mask to DMA_BIT_MASK(32),
which is unnecessary given that it is the default
drivers/net/ethernet/realtek/r8169.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index e55638c7505a..bf000d819a21 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -8273,7 +8273,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
if ((sizeof(dma_addr_t) > 4) &&
(use_dac == 1 || (use_dac == -1 && pci_is_pcie(pdev) &&
tp->mac_version >= RTL_GIGA_MAC_VER_18)) &&
- !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
+ !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
+ !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
/* CPlusCmd Dual Access Cycle is only needed for non-PCIe */
if (!pci_is_pcie(pdev))
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* RE: [PATCH v2] r8169: set coherent DMA mask as well as streaming DMA mask
2016-10-14 13:40 [PATCH v2] r8169: set coherent DMA mask as well as streaming DMA mask Ard Biesheuvel
@ 2016-10-14 13:42 ` David Laight
2016-10-14 13:46 ` Ard Biesheuvel
2016-10-14 13:48 ` Ard Biesheuvel
2016-10-14 20:48 ` Francois Romieu
2016-10-15 21:29 ` David Miller
2 siblings, 2 replies; 7+ messages in thread
From: David Laight @ 2016-10-14 13:42 UTC (permalink / raw)
To: 'Ard Biesheuvel', romieu@fr.zoreil.com,
nic_swsd@realtek.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, davem@davemloft.net
From: Of Ard Biesheuvel
> Sent: 14 October 2016 14:41
> PCI devices that are 64-bit DMA capable should set the coherent
> DMA mask as well as the streaming DMA mask. On some architectures,
> these are managed separately, and so the coherent DMA mask will be
> left at its default value of 32 if it is not set explicitly. This
> results in errors such as
>
> r8169 Gigabit Ethernet driver 2.3LK-NAPI loaded
> hwdev DMA mask = 0x00000000ffffffff, dev_addr = 0x00000080fbfff000
> swiotlb: coherent allocation failed for device 0000:02:00.0 size=4096
> CPU: 0 PID: 1062 Comm: systemd-udevd Not tainted 4.8.0+ #35
> Hardware name: AMD Seattle/Seattle, BIOS 10:53:24 Oct 13 2016
>
> on systems without memory that is 32-bit addressable by PCI devices.
>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> v2: dropped the hunk that sets the coherent DMA mask to DMA_BIT_MASK(32),
> which is unnecessary given that it is the default
>
> drivers/net/ethernet/realtek/r8169.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
> index e55638c7505a..bf000d819a21 100644
> --- a/drivers/net/ethernet/realtek/r8169.c
> +++ b/drivers/net/ethernet/realtek/r8169.c
> @@ -8273,7 +8273,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
> if ((sizeof(dma_addr_t) > 4) &&
> (use_dac == 1 || (use_dac == -1 && pci_is_pcie(pdev) &&
> tp->mac_version >= RTL_GIGA_MAC_VER_18)) &&
> - !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
> + !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
> + !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
Isn't there a dma_set_mask_and_coherent() function ?
David
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2] r8169: set coherent DMA mask as well as streaming DMA mask
2016-10-14 13:42 ` David Laight
@ 2016-10-14 13:46 ` Ard Biesheuvel
2016-10-14 13:48 ` Ard Biesheuvel
1 sibling, 0 replies; 7+ messages in thread
From: Ard Biesheuvel @ 2016-10-14 13:46 UTC (permalink / raw)
To: David Laight
Cc: romieu@fr.zoreil.com, nic_swsd@realtek.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
davem@davemloft.net
> On 14 Oct 2016, at 14:42, David Laight<David.Laight@ACULAB.COM> wrote:
>
> From: Of Ard Biesheuvel
>> Sent: 14 October 2016 14:41
>> PCI devices that are 64-bit DMA capable should set the coherent
>> DMA mask as well as the streaming DMA mask. On some architectures,
>> these are managed separately, and so the coherent DMA mask will be
>> left at its default value of 32 if it is not set explicitly. This
>> results in errors such as
>>
>> r8169 Gigabit Ethernet driver 2.3LK-NAPI loaded
>> hwdev DMA mask = 0x00000000ffffffff, dev_addr = 0x00000080fbfff000
>> swiotlb: coherent allocation failed for device 0000:02:00.0 size=4096
>> CPU: 0 PID: 1062 Comm: systemd-udevd Not tainted 4.8.0+ #35
>> Hardware name: AMD Seattle/Seattle, BIOS 10:53:24 Oct 13 2016
>>
>> on systems without memory that is 32-bit addressable by PCI devices.
>>
>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> ---
>> v2: dropped the hunk that sets the coherent DMA mask to DMA_BIT_MASK(32),
>> which is unnecessary given that it is the default
>>
>> drivers/net/ethernet/realtek/r8169.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
>> index e55638c7505a..bf000d819a21 100644
>> --- a/drivers/net/ethernet/realtek/r8169.c
>> +++ b/drivers/net/ethernet/realtek/r8169.c
>> @@ -8273,7 +8273,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
>> if ((sizeof(dma_addr_t) > 4) &&
>> (use_dac == 1 || (use_dac == -1 && pci_is_pcie(pdev) &&
>> tp->mac_version >= RTL_GIGA_MAC_VER_18)) &&
>> - !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
>> + !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
>> + !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
>
> Isn't there a dma_set_mask_and_coherent() function ?
>
> David
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2] r8169: set coherent DMA mask as well as streaming DMA mask
2016-10-14 13:42 ` David Laight
2016-10-14 13:46 ` Ard Biesheuvel
@ 2016-10-14 13:48 ` Ard Biesheuvel
2016-10-15 21:31 ` David Miller
1 sibling, 1 reply; 7+ messages in thread
From: Ard Biesheuvel @ 2016-10-14 13:48 UTC (permalink / raw)
To: David Laight
Cc: romieu@fr.zoreil.com, nic_swsd@realtek.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
davem@davemloft.net
> On 14 Oct 2016, at 14:42, David Laight <David.Laight@ACULAB.COM> wrote:
>
> From: Of Ard Biesheuvel
>> Sent: 14 October 2016 14:41
>> PCI devices that are 64-bit DMA capable should set the coherent
>> DMA mask as well as the streaming DMA mask. On some architectures,
>> these are managed separately, and so the coherent DMA mask will be
>> left at its default value of 32 if it is not set explicitly. This
>> results in errors such as
>>
>> r8169 Gigabit Ethernet driver 2.3LK-NAPI loaded
>> hwdev DMA mask = 0x00000000ffffffff, dev_addr = 0x00000080fbfff000
>> swiotlb: coherent allocation failed for device 0000:02:00.0 size=4096
>> CPU: 0 PID: 1062 Comm: systemd-udevd Not tainted 4.8.0+ #35
>> Hardware name: AMD Seattle/Seattle, BIOS 10:53:24 Oct 13 2016
>>
>> on systems without memory that is 32-bit addressable by PCI devices.
>>
>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> ---
>> v2: dropped the hunk that sets the coherent DMA mask to DMA_BIT_MASK(32),
>> which is unnecessary given that it is the default
>>
>> drivers/net/ethernet/realtek/r8169.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
>> index e55638c7505a..bf000d819a21 100644
>> --- a/drivers/net/ethernet/realtek/r8169.c
>> +++ b/drivers/net/ethernet/realtek/r8169.c
>> @@ -8273,7 +8273,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
>> if ((sizeof(dma_addr_t) > 4) &&
>> (use_dac == 1 || (use_dac == -1 && pci_is_pcie(pdev) &&
>> tp->mac_version >= RTL_GIGA_MAC_VER_18)) &&
>> - !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
>> + !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
>> + !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
>
> Isn't there a dma_set_mask_and_coherent() function ?
>
Not of the pci_xxx variety afaik
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2] r8169: set coherent DMA mask as well as streaming DMA mask
2016-10-14 13:48 ` Ard Biesheuvel
@ 2016-10-15 21:31 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2016-10-15 21:31 UTC (permalink / raw)
To: ard.biesheuvel; +Cc: David.Laight, romieu, nic_swsd, netdev, linux-kernel
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Fri, 14 Oct 2016 14:48:51 +0100
>
>> On 14 Oct 2016, at 14:42, David Laight <David.Laight@ACULAB.COM> wrote:
>>
>> From: Of Ard Biesheuvel
>>> Sent: 14 October 2016 14:41
>>> PCI devices that are 64-bit DMA capable should set the coherent
>>> DMA mask as well as the streaming DMA mask. On some architectures,
>>> these are managed separately, and so the coherent DMA mask will be
>>> left at its default value of 32 if it is not set explicitly. This
>>> results in errors such as
>>>
>>> r8169 Gigabit Ethernet driver 2.3LK-NAPI loaded
>>> hwdev DMA mask = 0x00000000ffffffff, dev_addr = 0x00000080fbfff000
>>> swiotlb: coherent allocation failed for device 0000:02:00.0 size=4096
>>> CPU: 0 PID: 1062 Comm: systemd-udevd Not tainted 4.8.0+ #35
>>> Hardware name: AMD Seattle/Seattle, BIOS 10:53:24 Oct 13 2016
>>>
>>> on systems without memory that is 32-bit addressable by PCI devices.
>>>
>>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>> ---
>>> v2: dropped the hunk that sets the coherent DMA mask to DMA_BIT_MASK(32),
>>> which is unnecessary given that it is the default
>>>
>>> drivers/net/ethernet/realtek/r8169.c | 3 ++-
>>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
>>> index e55638c7505a..bf000d819a21 100644
>>> --- a/drivers/net/ethernet/realtek/r8169.c
>>> +++ b/drivers/net/ethernet/realtek/r8169.c
>>> @@ -8273,7 +8273,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
>>> if ((sizeof(dma_addr_t) > 4) &&
>>> (use_dac == 1 || (use_dac == -1 && pci_is_pcie(pdev) &&
>>> tp->mac_version >= RTL_GIGA_MAC_VER_18)) &&
>>> - !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
>>> + !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
>>> + !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
>>
>> Isn't there a dma_set_mask_and_coherent() function ?
>>
>
> Not of the pci_xxx variety afaik
You can often use the "dev_*" variants intechangably with the pci_*()
ones.
In fact you'll find that for several architectures pci_*() is
implemented via calls to dev_*().
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] r8169: set coherent DMA mask as well as streaming DMA mask
2016-10-14 13:40 [PATCH v2] r8169: set coherent DMA mask as well as streaming DMA mask Ard Biesheuvel
2016-10-14 13:42 ` David Laight
@ 2016-10-14 20:48 ` Francois Romieu
2016-10-15 21:29 ` David Miller
2 siblings, 0 replies; 7+ messages in thread
From: Francois Romieu @ 2016-10-14 20:48 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: nic_swsd, netdev, linux-kernel, davem
Ard Biesheuvel <ard.biesheuvel@linaro.org> :
> PCI devices that are 64-bit DMA capable should set the coherent
> DMA mask as well as the streaming DMA mask. On some architectures,
> these are managed separately, and so the coherent DMA mask will be
> left at its default value of 32 if it is not set explicitly. This
> results in errors such as
>
> r8169 Gigabit Ethernet driver 2.3LK-NAPI loaded
> hwdev DMA mask = 0x00000000ffffffff, dev_addr = 0x00000080fbfff000
> swiotlb: coherent allocation failed for device 0000:02:00.0 size=4096
> CPU: 0 PID: 1062 Comm: systemd-udevd Not tainted 4.8.0+ #35
> Hardware name: AMD Seattle/Seattle, BIOS 10:53:24 Oct 13 2016
>
> on systems without memory that is 32-bit addressable by PCI devices.
>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Unless someone plans to plug an acenic, a 83820 (pci-e gem board, anyone ?)
on top of a pci <-> pci-e adapter on this kind of motherboard, no other
network driver that uses the pci_... dma api exhibits this mixed 32 / 64 bit
support bug. I haven't checked devices with 32 < mask < 64 nor plain DMA api
converted ones.
--
Ueimor
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] r8169: set coherent DMA mask as well as streaming DMA mask
2016-10-14 13:40 [PATCH v2] r8169: set coherent DMA mask as well as streaming DMA mask Ard Biesheuvel
2016-10-14 13:42 ` David Laight
2016-10-14 20:48 ` Francois Romieu
@ 2016-10-15 21:29 ` David Miller
2 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2016-10-15 21:29 UTC (permalink / raw)
To: ard.biesheuvel; +Cc: romieu, nic_swsd, netdev, linux-kernel
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Fri, 14 Oct 2016 14:40:33 +0100
> PCI devices that are 64-bit DMA capable should set the coherent
> DMA mask as well as the streaming DMA mask. On some architectures,
> these are managed separately, and so the coherent DMA mask will be
> left at its default value of 32 if it is not set explicitly. This
> results in errors such as
>
> r8169 Gigabit Ethernet driver 2.3LK-NAPI loaded
> hwdev DMA mask = 0x00000000ffffffff, dev_addr = 0x00000080fbfff000
> swiotlb: coherent allocation failed for device 0000:02:00.0 size=4096
> CPU: 0 PID: 1062 Comm: systemd-udevd Not tainted 4.8.0+ #35
> Hardware name: AMD Seattle/Seattle, BIOS 10:53:24 Oct 13 2016
>
> on systems without memory that is 32-bit addressable by PCI devices.
>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Applied.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-10-15 21:31 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-14 13:40 [PATCH v2] r8169: set coherent DMA mask as well as streaming DMA mask Ard Biesheuvel
2016-10-14 13:42 ` David Laight
2016-10-14 13:46 ` Ard Biesheuvel
2016-10-14 13:48 ` Ard Biesheuvel
2016-10-15 21:31 ` David Miller
2016-10-14 20:48 ` Francois Romieu
2016-10-15 21:29 ` David Miller
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).