* Re: Re: Problems with a PCI SMC2802W [not found] ` <20050310103608.GB1416@taniwha.stupidest.org> @ 2005-03-10 16:30 ` Luis R. Rodriguez 2005-03-16 16:24 ` Luis R. Rodriguez 0 siblings, 1 reply; 5+ messages in thread From: Luis R. Rodriguez @ 2005-03-10 16:30 UTC (permalink / raw) To: Chris Wedgwood, Jeff Garzik, Netdev; +Cc: prism54-devel, Feyd [-- Attachment #1.1: Type: text/plain, Size: 3185 bytes --] On Thu, Mar 10, 2005 at 02:36:08AM -0800, Chris Wedgwood wrote: > On Thu, Mar 10, 2005 at 05:28:03AM -0500, Adam K Kirchhoff wrote: > > > Unfortunately, the latest svn checkout doesn't want to compile for > > me on 2.6.11: > > I have these diffs. Forward to the list if you like since it never > accepts email from me (grr) > > > Index: ksrc/islpci_eth.c > =================================================================== > --- ksrc/islpci_eth.c (revision 528) > +++ ksrc/islpci_eth.c (working copy) > @@ -90,7 +90,9 @@ > struct sk_buff *newskb; > int newskb_offset; > unsigned long flags; > +#ifdef CONFIG_PRISM54_WDS > unsigned char wds_mac[6]; > +#endif > u32 curr_frag; > int err = 0; > > @@ -362,9 +364,9 @@ > struct sk_buff *skb; > u16 size; > u32 index, offset; > - unsigned char *src; > int discard = 0; > #ifdef CONFIG_PRISM54_WDS > + unsigned char *src; > struct wds_priv *wdsp = priv->wdsp; > struct net_device *wds_dev = NULL; > struct wds_net_local *wds_lp; > Index: ksrc/islpci_hotplug.c > =================================================================== > --- ksrc/islpci_hotplug.c (revision 528) > +++ ksrc/islpci_hotplug.c (working copy) > @@ -277,7 +277,7 @@ > printk(KERN_NOTICE "%s: got suspend request (state %d)\n", > ndev->name, state); > > - pci_save_state(pdev, priv->pci_state); > + pci_save_state(pdev); > > /* tell the device not to trigger interrupts for now... */ > isl38xx_disable_interrupts(priv->device_base); > @@ -303,7 +303,7 @@ > > printk(KERN_NOTICE "%s: got resume request\n", ndev->name); > > - pci_restore_state(pdev, priv->pci_state); > + pci_restore_state(pdev); > > /* alright let's go into the PREBOOT state */ > islpci_reset(priv, 1); > Index: ksrc/islpci_dev.h > =================================================================== > --- ksrc/islpci_dev.h (revision 528) > +++ ksrc/islpci_dev.h (working copy) > @@ -112,7 +112,6 @@ > > /* PCI bus allocation & configuration members */ > struct pci_dev *pdev; /* PCI structure information */ > - u32 pci_state[16]; /* used for suspend/resume */ > char firmware[33]; > > void __iomem *device_base; /* ioremapped device base address */ > Index: ksrc/islpci_mgt.c > =================================================================== > --- ksrc/islpci_mgt.c (revision 528) > +++ ksrc/islpci_mgt.c (working copy) > @@ -345,7 +345,7 @@ > } > > /* Ensure the results of device DMA are visible to the CPU. */ > - pci_dma_sync_single(priv->pdev, buf->pci_addr, > + pci_dma_sync_single_for_cpu(priv->pdev, buf->pci_addr, > frag_len, PCI_DMA_FROMDEVICE); > > /* Perform endianess conversion for PIMFOR header in-place. */ Thanks, but the pci_[restore|save]_state changes requires testing/backporting to 2.4. Same goes for pci_dma_sync_single_for_cpu(). We can macro this but ugh, it's just so horrible. Margit, where are you? Jeff, what's better a prismcompat24.h edit or a check for LINUX_VERSION_CODE here? 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: Problems with a PCI SMC2802W 2005-03-10 16:30 ` Re: Problems with a PCI SMC2802W Luis R. Rodriguez @ 2005-03-16 16:24 ` Luis R. Rodriguez 2005-03-16 18:14 ` Jeff Garzik ` (2 more replies) 0 siblings, 3 replies; 5+ messages in thread From: Luis R. Rodriguez @ 2005-03-16 16:24 UTC (permalink / raw) To: Chris Wedgwood, Jeff Garzik, Netdev, Adam K Kirchhoff, prism54-devel, Feyd [-- Attachment #1.1: Type: text/plain, Size: 1307 bytes --] Jeff/netdev, If no comment is given on how we should deal with pci_dma_sync_single/pci_dma_sync_single_for_cpu for 2.4 I'm just going to put in a nasty ifdef there. Comemnts? Luis On Thu, Mar 10, 2005 at 11:30:07AM -0500, Luis R. Rodriguez wrote: > > Index: ksrc/islpci_mgt.c > > =================================================================== > > --- ksrc/islpci_mgt.c (revision 528) > > +++ ksrc/islpci_mgt.c (working copy) > > @@ -345,7 +345,7 @@ > > } > > > > /* Ensure the results of device DMA are visible to the CPU. */ > > - pci_dma_sync_single(priv->pdev, buf->pci_addr, > > + pci_dma_sync_single_for_cpu(priv->pdev, buf->pci_addr, > > frag_len, PCI_DMA_FROMDEVICE); > > > > /* Perform endianess conversion for PIMFOR header in-place. */ > > Thanks, but the pci_[restore|save]_state changes requires testing/backporting to 2.4. > Same goes for pci_dma_sync_single_for_cpu(). We can macro this but ugh, it's just so > horrible. > > Margit, where are you? > > Jeff, what's better a prismcompat24.h edit or a check for > LINUX_VERSION_CODE here? > > Luis > > -- > GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84 A34A 6ADD 4937 E20A 525E -- 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: Problems with a PCI SMC2802W 2005-03-16 16:24 ` Luis R. Rodriguez @ 2005-03-16 18:14 ` Jeff Garzik 2005-03-16 18:15 ` [Prism54-devel] " Chris Wedgwood 2005-03-16 18:33 ` Francois Romieu 2 siblings, 0 replies; 5+ messages in thread From: Jeff Garzik @ 2005-03-16 18:14 UTC (permalink / raw) To: Luis R. Rodriguez; +Cc: Netdev, Chris Wedgwood, prism54-devel, Feyd Luis R. Rodriguez wrote: > Jeff/netdev, > > If no comment is given on how we should deal with > pci_dma_sync_single/pci_dma_sync_single_for_cpu for 2.4 I'm just going > to put in a nasty ifdef there. Comemnts? For 2.4, why not define pci_dma_sync_single_for_{device,cpu} as equivalent to pci_dma_sync_single? Jeff ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Prism54-devel] Re: Problems with a PCI SMC2802W 2005-03-16 16:24 ` Luis R. Rodriguez 2005-03-16 18:14 ` Jeff Garzik @ 2005-03-16 18:15 ` Chris Wedgwood 2005-03-16 18:33 ` Francois Romieu 2 siblings, 0 replies; 5+ messages in thread From: Chris Wedgwood @ 2005-03-16 18:15 UTC (permalink / raw) To: Jeff Garzik, Netdev, Adam K Kirchhoff, prism54-devel, Feyd On Wed, Mar 16, 2005 at 11:24:48AM -0500, Luis R. Rodriguez wrote: > If no comment is given on how we should deal with > pci_dma_sync_single/pci_dma_sync_single_for_cpu for 2.4 I'm just > going to put in a nasty ifdef there. Comemnts? How about just put: #ifndef pci_dma_sync_single_for_cpu #define pci_dma_sync_single_for_cpu pci_dma_sync_single #endif In one of the prism headers? ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Re: Problems with a PCI SMC2802W 2005-03-16 16:24 ` Luis R. Rodriguez 2005-03-16 18:14 ` Jeff Garzik 2005-03-16 18:15 ` [Prism54-devel] " Chris Wedgwood @ 2005-03-16 18:33 ` Francois Romieu 2 siblings, 0 replies; 5+ messages in thread From: Francois Romieu @ 2005-03-16 18:33 UTC (permalink / raw) To: Chris Wedgwood, Jeff Garzik, Netdev, Adam K Kirchhoff, prism54-devel, Feyd Luis R. Rodriguez <mcgrof@ruslug.rutgers.edu> : [...] > If no comment is given on how we should deal with > pci_dma_sync_single/pci_dma_sync_single_for_cpu for 2.4 I'm just going > to put in a nasty ifdef there. Comemnts? My out of tree 2.4.x driver for the 8169 exhibits a few differences with the 2.6.x driver for these kind of things. Over several months, it happened once that a 2.6.x patch hit this part of the code. Let's say an extra 5 minutes to merge in 2.4.x and no side effects as I had to actually look at the code (of course orthogonal patches helped). Imho it is not a heavy maintenance/taste issue. -- Ueimor ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2005-03-16 18:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <422F118D.8070704@voicenet.com>
[not found] ` <20050309160744.GN4017@Redstar.dorchain.net>
[not found] ` <20050309202718.4f94b871@veagle.suse.cz>
[not found] ` <20050310021724.GD17854@ruslug.rutgers.edu>
[not found] ` <42302133.2060103@voicenet.com>
[not found] ` <20050310103608.GB1416@taniwha.stupidest.org>
2005-03-10 16:30 ` Re: Problems with a PCI SMC2802W Luis R. Rodriguez
2005-03-16 16:24 ` Luis R. Rodriguez
2005-03-16 18:14 ` Jeff Garzik
2005-03-16 18:15 ` [Prism54-devel] " Chris Wedgwood
2005-03-16 18:33 ` Francois Romieu
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).