rpms/kernel/devel linux-2.6-usb-endian-ehci.patch, 1.1, 1.2 linux-2.6-usb-endian-toshiba.patch, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Dec 18 08:37:05 UTC 2006
Author: dwmw2
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27557
Modified Files:
linux-2.6-usb-endian-ehci.patch
linux-2.6-usb-endian-toshiba.patch
Log Message:
Fix build on arches without writel_be()
linux-2.6-usb-endian-ehci.patch:
Kconfig | 5 ++
ehci-dbg.c | 24 ++++++------
ehci-fsl.c | 8 ++--
ehci-hcd.c | 92 +++++++++++++++++++++++++---------------------
ehci-hub.c | 118 +++++++++++++++++++++++++++++++----------------------------
ehci-pci.c | 37 +++++++++++++-----
ehci-q.c | 16 ++++----
ehci-sched.c | 22 +++++------
ehci.h | 36 ++++++++++++++++++
9 files changed, 216 insertions(+), 142 deletions(-)
Index: linux-2.6-usb-endian-ehci.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-usb-endian-ehci.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-usb-endian-ehci.patch 17 Dec 2006 21:55:32 -0000 1.1
+++ linux-2.6-usb-endian-ehci.patch 18 Dec 2006 08:37:03 -0000 1.2
@@ -1002,7 +1002,7 @@
u8 sbrn; /* packed release number */
-@@ -651,6 +652,37 @@
+@@ -651,6 +652,41 @@
#define ehci_has_fsl_portno_bug(e) (0)
#endif
@@ -1025,17 +1025,21 @@
+static inline unsigned int ehci_readl (const struct ehci_hcd *ehci,
+ __u32 __iomem * regs)
+{
-+ return ehci_big_endian_mmio(ehci) ?
-+ readl_be((__force u32 *)regs) :
-+ readl((__force u32 *)regs);
++#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
++ if (ehci_big_endian_mmio(ehci))
++ return readl_be((__force u32 *)regs);
++#endif
++ return readl((__force u32 *)regs);
+}
+
+static inline void ehci_writel (const struct ehci_hcd *ehci,
+ const unsigned int val, __u32 __iomem *regs)
+{
-+ ehci_big_endian_mmio(ehci) ?
-+ writel_be(val, (__force u32 *)regs) :
-+ writel(val, (__force u32 *)regs);
++#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
++ if (ehci_big_endian_mmio(ehci))
++ writel_be(val, (__force u32 *)regs);
++#endif
++ writel(val, (__force u32 *)regs);
+}
/*-------------------------------------------------------------------------*/
@@ -1049,4 +1053,4 @@
_______________________________________________
linux-usb-devel at lists.sourceforge.net
To unsubscribe, use the last form field at:
-https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
\ No newline at end of file
+https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
linux-2.6-usb-endian-toshiba.patch:
linux-2.6.19.ppc/drivers/usb/host/u132-hcd.c | 5
linux-test-x86/drivers/usb/host/Kconfig | 10 +
linux-test-x86/drivers/usb/host/ohci-pci.c | 26 ++++
linux-test-x86/drivers/usb/host/ohci-ppc-soc.c | 2
linux-test-x86/drivers/usb/host/ohci.h | 151 ++++++++++++++++---------
5 files changed, 134 insertions(+), 60 deletions(-)
Index: linux-2.6-usb-endian-toshiba.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-usb-endian-toshiba.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-usb-endian-toshiba.patch 17 Dec 2006 21:55:32 -0000 1.1
+++ linux-2.6-usb-endian-toshiba.patch 18 Dec 2006 08:37:03 -0000 1.2
@@ -118,7 +118,7 @@
// there are also chip quirks/bugs in init logic
};
-@@ -439,117 +440,156 @@
+@@ -439,117 +440,160 @@
* a minority (notably the IBM STB04XXX and the Motorola MPC5200
* processors) implement them in big endian format.
*
@@ -194,9 +194,11 @@
+ __hc32 __iomem * regs)
{
- return big_endian(ohci) ? readl_be (regs) : readl ((__force u32 *)regs);
-+ return big_endian_mmio(ohci) ?
-+ readl_be ((__force u32 *)regs) :
-+ readl ((__force u32 *)regs);
++#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO
++ if (big_endian_mmio(ohci))
++ return readl_be ((__force u32 *)regs);
++#endif
++ return readl ((__force u32 *)regs);
}
-static inline void ohci_writel (const struct ohci_hcd *ohci,
@@ -206,9 +208,11 @@
{
- big_endian(ohci) ? writel_be (val, regs) :
- writel (val, (__force u32 *)regs);
-+ big_endian_mmio(ohci) ?
-+ writel_be (val, (__force u32 *)regs) :
-+ writel (val, (__force u32 *)regs);
++#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO
++ if (big_endian_mmio(ohci))
++ writel_be (val, (__force u32 *)regs);
++#endif
++ writel (val, (__force u32 *)regs);
}
-#else /* !CONFIG_USB_OHCI_BIG_ENDIAN */
@@ -351,13 +355,17 @@
&td->hwPSW[index ^ 1] : &td->hwPSW[index]);
}
-
--------------------------------------------------------------------------
-Take Surveys. Earn Cash. Influence the Future of IT
-Join SourceForge.net's Techsay panel and you'll get the chance to share your
-opinions on IT & business topics through brief surveys - and earn cash
-http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
-_______________________________________________
-linux-usb-devel at lists.sourceforge.net
-To unsubscribe, use the last form field at:
-https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
\ No newline at end of file
+--- linux-2.6.19.ppc/drivers/usb/host/u132-hcd.c~ 2006-12-18 08:20:52.000000000 +0000
++++ linux-2.6.19.ppc/drivers/usb/host/u132-hcd.c 2006-12-18 08:32:52.000000000 +0000
+@@ -173,11 +173,6 @@ struct u132_ring {
+ struct u132_endp *curr_endp;
+ struct delayed_work scheduler;
+ };
+-#define OHCI_QUIRK_AMD756 0x01
+-#define OHCI_QUIRK_SUPERIO 0x02
+-#define OHCI_QUIRK_INITRESET 0x04
+-#define OHCI_BIG_ENDIAN 0x08
+-#define OHCI_QUIRK_ZFMICRO 0x10
+ struct u132 {
+ struct kref kref;
+ struct list_head u132_list;
More information about the fedora-cvs-commits
mailing list