* [patch 2/3] drivers/net/wireless/prism54/islpci_hotplug: Use the DMA_{64, 32}BIT_MASK constants
@ 2005-03-06 22:23 domen
2005-03-07 17:14 ` Luis R. Rodriguez
0 siblings, 1 reply; 5+ messages in thread
From: domen @ 2005-03-06 22:23 UTC (permalink / raw)
To: prism54-private; +Cc: netdev, domen, tklauser
Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h
when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
kj-domen/drivers/net/wireless/prism54/islpci_hotplug.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplug drivers/net/wireless/prism54/islpci_hotplug.c
--- kj/drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplug 2005-03-05 16:12:02.000000000 +0100
+++ kj-domen/drivers/net/wireless/prism54/islpci_hotplug.c 2005-03-05 16:12:02.000000000 +0100
@@ -125,7 +125,7 @@ prism54_probe(struct pci_dev *pdev, cons
}
/* enable PCI DMA */
- if (pci_set_dma_mask(pdev, 0xffffffff)) {
+ if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
printk(KERN_ERR "%s: 32-bit PCI DMA not supported", DRV_NAME);
goto do_pci_disable_device;
}
_
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch 2/3] drivers/net/wireless/prism54/islpci_hotplug: Use the DMA_{64, 32}BIT_MASK constants
2005-03-06 22:23 [patch 2/3] drivers/net/wireless/prism54/islpci_hotplug: Use the DMA_{64, 32}BIT_MASK constants domen
@ 2005-03-07 17:14 ` Luis R. Rodriguez
2005-03-07 17:24 ` Jeff Garzik
0 siblings, 1 reply; 5+ messages in thread
From: Luis R. Rodriguez @ 2005-03-07 17:14 UTC (permalink / raw)
To: domen; +Cc: prism54-private, netdev, tklauser
[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]
On Sun, Mar 06, 2005 at 11:23:55PM +0100, domen@coderock.org wrote:
>
> Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h
> when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
>
> Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
> Signed-off-by: Domen Puncer <domen@coderock.org>
> ---
>
>
> kj-domen/drivers/net/wireless/prism54/islpci_hotplug.c | 2 +-
> 1 files changed, 1 insertion(+), 1 deletion(-)
>
> diff -puN drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplug drivers/net/wireless/prism54/islpci_hotplug.c
> --- kj/drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplug 2005-03-05 16:12:02.000000000 +0100
> +++ kj-domen/drivers/net/wireless/prism54/islpci_hotplug.c 2005-03-05 16:12:02.000000000 +0100
> @@ -125,7 +125,7 @@ prism54_probe(struct pci_dev *pdev, cons
> }
>
> /* enable PCI DMA */
> - if (pci_set_dma_mask(pdev, 0xffffffff)) {
> + if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
Is this 2.4 backward compatible? If not we'll have to add to 2.4 compat
file on prism54.
Luis
--
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84 A34A 6ADD 4937 E20A 525E
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch 2/3] drivers/net/wireless/prism54/islpci_hotplug: Use the DMA_{64, 32}BIT_MASK constants
2005-03-07 17:14 ` Luis R. Rodriguez
@ 2005-03-07 17:24 ` Jeff Garzik
2005-03-07 17:29 ` Luis R. Rodriguez
0 siblings, 1 reply; 5+ messages in thread
From: Jeff Garzik @ 2005-03-07 17:24 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: domen, prism54-private, netdev, tklauser
Luis R. Rodriguez wrote:
> On Sun, Mar 06, 2005 at 11:23:55PM +0100, domen@coderock.org wrote:
>
>>Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h
>>when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
>>
>>Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
>>Signed-off-by: Domen Puncer <domen@coderock.org>
>>---
>>
>>
>> kj-domen/drivers/net/wireless/prism54/islpci_hotplug.c | 2 +-
>> 1 files changed, 1 insertion(+), 1 deletion(-)
>>
>>diff -puN drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplug drivers/net/wireless/prism54/islpci_hotplug.c
>>--- kj/drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplug 2005-03-05 16:12:02.000000000 +0100
>>+++ kj-domen/drivers/net/wireless/prism54/islpci_hotplug.c 2005-03-05 16:12:02.000000000 +0100
>>@@ -125,7 +125,7 @@ prism54_probe(struct pci_dev *pdev, cons
>> }
>>
>> /* enable PCI DMA */
>>- if (pci_set_dma_mask(pdev, 0xffffffff)) {
>>+ if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
>
>
> Is this 2.4 backward compatible? If not we'll have to add to 2.4 compat
> file on prism54.
Not compatible, but it is preferred to patch the file and add that
definition to a compat header.
For pci_module_init(), it is preferred to keep pci_module_init() rather
than adding compat gunk.
Jeff
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch 2/3] drivers/net/wireless/prism54/islpci_hotplug: Use the DMA_{64, 32}BIT_MASK constants
2005-03-07 17:24 ` Jeff Garzik
@ 2005-03-07 17:29 ` Luis R. Rodriguez
2005-03-08 15:22 ` Luis R. Rodriguez
0 siblings, 1 reply; 5+ messages in thread
From: Luis R. Rodriguez @ 2005-03-07 17:29 UTC (permalink / raw)
To: Jeff Garzik; +Cc: tklauser, netdev, prism54-devel, domen, prism54-private
[-- Attachment #1.1: Type: text/plain, Size: 1849 bytes --]
On Mon, Mar 07, 2005 at 12:24:24PM -0500, Jeff Garzik wrote:
> Luis R. Rodriguez wrote:
> >On Sun, Mar 06, 2005 at 11:23:55PM +0100, domen@coderock.org wrote:
> >
> >>Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h
> >>when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
> >>
> >>Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
> >>Signed-off-by: Domen Puncer <domen@coderock.org>
> >>---
> >>
> >>
> >>kj-domen/drivers/net/wireless/prism54/islpci_hotplug.c | 2 +-
> >>1 files changed, 1 insertion(+), 1 deletion(-)
> >>
> >>diff -puN
> >>drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplug drivers/net/wireless/prism54/islpci_hotplug.c
> >>---
> >>kj/drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplug 2005-03-05 16:12:02.000000000 +0100
> >>+++ kj-domen/drivers/net/wireless/prism54/islpci_hotplug.c 2005-03-05
> >>16:12:02.000000000 +0100
> >>@@ -125,7 +125,7 @@ prism54_probe(struct pci_dev *pdev, cons
> >> }
> >>
> >> /* enable PCI DMA */
> >>- if (pci_set_dma_mask(pdev, 0xffffffff)) {
> >>+ if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
> >
> >
> >Is this 2.4 backward compatible? If not we'll have to add to 2.4 compat
> >file on prism54.
>
> Not compatible, but it is preferred to patch the file and add that
> definition to a compat header.
>
> For pci_module_init(), it is preferred to keep pci_module_init() rather
> than adding compat gunk.
>
> Jeff
Alright, I'll add DMA_32BIT_MASK through compat and leave
pci_module_init as is. That said:
Patch 1 applied
Patch 2 will be applied after compat work
Patch 3 rejected per Jeff's recomendation due to 2.4 compat
Luis
--
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84 A34A 6ADD 4937 E20A 525E
[-- Attachment #1.2: Type: application/pgp-signature, Size: 189 bytes --]
[-- Attachment #2: Type: text/plain, Size: 151 bytes --]
_______________________________________________
Prism54-devel mailing list
Prism54-devel@prism54.org
http://prism54.org/mailman/listinfo/prism54-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Re: [patch 2/3] drivers/net/wireless/prism54/islpci_hotplug: Use the DMA_{64, 32}BIT_MASK constants
2005-03-07 17:29 ` Luis R. Rodriguez
@ 2005-03-08 15:22 ` Luis R. Rodriguez
0 siblings, 0 replies; 5+ messages in thread
From: Luis R. Rodriguez @ 2005-03-08 15:22 UTC (permalink / raw)
To: Jeff Garzik, domen, prism54-private, netdev, tklauser,
prism54-devel
[-- Attachment #1.1: Type: text/plain, Size: 454 bytes --]
On Mon, Mar 07, 2005 at 12:29:57PM -0500, Luis R. Rodriguez wrote:
>
> Alright, I'll add DMA_32BIT_MASK through compat and leave
> pci_module_init as is. That said:
>
> Patch 1 applied
> Patch 2 will be applied after compat work
> Patch 3 rejected per Jeff's recomendation due to 2.4 compat
>
> Luis
This has been committed on to prism54 tree.
Luis
--
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84 A34A 6ADD 4937 E20A 525E
[-- Attachment #1.2: Type: application/pgp-signature, Size: 189 bytes --]
[-- Attachment #2: Type: text/plain, Size: 151 bytes --]
_______________________________________________
Prism54-devel mailing list
Prism54-devel@prism54.org
http://prism54.org/mailman/listinfo/prism54-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2005-03-08 15:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-03-06 22:23 [patch 2/3] drivers/net/wireless/prism54/islpci_hotplug: Use the DMA_{64, 32}BIT_MASK constants domen
2005-03-07 17:14 ` Luis R. Rodriguez
2005-03-07 17:24 ` Jeff Garzik
2005-03-07 17:29 ` Luis R. Rodriguez
2005-03-08 15:22 ` Luis R. Rodriguez
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).