rt2x00: Fix firmware loading regression on x86_64.

Wolfgang Kufner · linvjw · commit 412b31334b83 · 2010-12-13T15:23:37.000-05:00
Commit 6175ddf changes the way memcpy_toio() works for x86_64, causing firmware loading to fail for some Ralink WLAN devices with the rt2800pci driver since linux 2.6.34. This causes the log message: "phy0 -> rt2800pci_load_firmware: Error - PBF system register not ready.". Fix this by using __iowrite32_copy instead of memcpy_toio(). Signed-off-by: Wolfgang Kufner <wolfgang.kufner@gmail.com> Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/rt2x00/rt2x00pci.h
@@ -64,7 +64,7 @@ static inline void rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev,
 						 const void *value,
 						 const u32 length)
 {
-	memcpy_toio(rt2x00dev->csr.base + offset, value, length);
+	__iowrite32_copy(rt2x00dev->csr.base + offset, value, length >> 2);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ static inline void rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev,`
`64`	`64`	`const void *value,`
`65`	`65`	`const u32 length)`
`66`	`66`	`{`
`67`		`- memcpy_toio(rt2x00dev->csr.base + offset, value, length);`
	`67`	`+ __iowrite32_copy(rt2x00dev->csr.base + offset, value, length >> 2);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/**`