sh: fix pci io access for r2d boards

PATCH New Magnus Damm 1 participant 2 messages Feb 14, 2008 SuperH

lore

Share & tools

lore

Magnus Damm

author

2008-02-14 05:04 UTC #0 lore raw

PATCH 1/1 sh: fix pci io access for r2d boards

This patch is a fix to make sure readsN/writesN are used over insN/outsN for ioreadN_rep/iowriteN_rep.

The current state of the sh io code is that mmio operations like readN/writeN and ioreadN/iowriteN are unaffected by the value of generic_io_base. This is different fom port based io like inN/outN which gets adjusted using the value in generic_io_base.

Without this patch ioreadN_rep/iowriteN_rep get their addresses adjusted. The address for mmio access is adjusted using generic_io_base. This is wrong. The ata core code currently crashes if generic_io_base is set.

This patch changes ioreadN_rep/iowriteN_rep to follow the same rules as the rest of the mmio operations, ie don't adjust using generic_io_base.

Signed-off-by Magnus Damm <[email protected]>

Acked-by Katsuya MATSUBARA <[email protected]>

---

 include/asm-sh/io.h |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

include/asm-sh/io.h +7 -7

@@ -182,13 +182,13 @@ __BUILD_MEMORY_STRING(w, u16)
 #define iowrite32(v,a)		writel((v),(a))
 #define iowrite32be(v,a)	__raw_writel(cpu_to_be32((v)),(a))
 
-#define ioread8_rep(a,d,c)	insb((a),(d),(c))
-#define ioread16_rep(a,d,c)	insw((a),(d),(c))
-#define ioread32_rep(a,d,c)	insl((a),(d),(c))
-
-#define iowrite8_rep(a,s,c)	outsb((a),(s),(c))
-#define iowrite16_rep(a,s,c)	outsw((a),(s),(c))
-#define iowrite32_rep(a,s,c)	outsl((a),(s),(c))
+#define ioread8_rep(a, d, c)	readsb((a), (d), (c))
+#define ioread16_rep(a, d, c)	readsw((a), (d), (c))
+#define ioread32_rep(a, d, c)	readsl((a), (d), (c))
+
+#define iowrite8_rep(a, s, c)	writesb((a), (s), (c))
+#define iowrite16_rep(a, s, c)	writesw((a), (s), (c))
+#define iowrite32_rep(a, s, c)	writesl((a), (s), (c))
 
 #define mmiowb()	wmb()	/* synco on SH-4A, otherwise a nop */

Magnus Damm

author

2008-02-14 05:05 UTC #1 lore raw

PATCH 1/1 sh: fix pci io access for r2d boards

Use generic_io_base to point out the pci io window, and make sure the highest port address used is SH7751_PCI_IO_SIZE - 1.

This patch fixes pci io port access for the r2d boards - CONFIG_8139TOO_PIO now works as expected. So does the alsa driver for CMI8738.

Signed-off-by Magnus Damm <[email protected]>

Acked-by Katsuya MATSUBARA <[email protected]>

---

(This is the correct patch, sorry about that)

 arch/sh/drivers/pci/ops-rts7751r2d.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

arch/sh/drivers/pci/ops-rts7751r2d.c +2 -1

@@ -33,7 +33,7 @@ int __init pcibios_map_platform_irq(stru
 static struct resource sh7751_io_resource = {
 	.name	= "SH7751_IO",
 	.start	= 0x4000,
-	.end	= 0x4000 + SH7751_PCI_IO_SIZE - 1,
+	.end	= SH7751_PCI_IO_SIZE - 1,
 	.flags	= IORESOURCE_IO
 };

@@ -68,6 +68,7 @@ static struct sh4_pci_address_map sh7751
 
 int __init pcibios_init_platform(void)
 {
+	__set_io_port_base(SH7751_PCI_IO_BASE);
 	return sh7751_pcic_init(&sh7751_pci_map);
 }