Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ehci-fsl: fix cache coherency problem on system with large memory

The patch fixes bug http://bugzilla.kernel.org/show_bug.cgi?id=7482.

It sets USB snooping on 4G space for PowerPC platforms without
CONFIG_NOT_COHERENT_CACHE defined.

Reported-by: Stefan Meyer <reyems@telkomsa.net>
Signed-off-by: Li Yang <leoli@freescale.com>
Cc: Greg KH <greg@kroah.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Li Yang and committed by
Linus Torvalds
40acc095 3d6ac984

+14
+13
drivers/usb/host/ehci-fsl.c
··· 193 193 out_be32(non_ehci + FSL_SOC_USB_CTRL, 0x00000004); 194 194 out_be32(non_ehci + FSL_SOC_USB_SNOOP1, 0x0000001b); 195 195 196 + #if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE) 197 + /* 198 + * Turn on cache snooping hardware, since some PowerPC platforms 199 + * wholly rely on hardware to deal with cache coherent 200 + */ 201 + 202 + /* Setup Snooping for all the 4GB space */ 203 + /* SNOOP1 starts from 0x0, size 2G */ 204 + out_be32(non_ehci + FSL_SOC_USB_SNOOP1, 0x0 | SNOOP_SIZE_2GB); 205 + /* SNOOP2 starts from 0x80000000, size 2G */ 206 + out_be32(non_ehci + FSL_SOC_USB_SNOOP2, 0x80000000 | SNOOP_SIZE_2GB); 207 + #endif 208 + 196 209 if (pdata->operating_mode == FSL_USB2_DR_HOST) 197 210 mpc83xx_setup_phy(ehci, pdata->phy_mode, 0); 198 211
+1
drivers/usb/host/ehci-fsl.h
··· 34 34 #define FSL_SOC_USB_PRICTRL 0x40c /* NOTE: big-endian */ 35 35 #define FSL_SOC_USB_SICTRL 0x410 /* NOTE: big-endian */ 36 36 #define FSL_SOC_USB_CTRL 0x500 /* NOTE: big-endian */ 37 + #define SNOOP_SIZE_2GB 0x1e 37 38 #endif /* _EHCI_FSL_H */