Unverified Commit 10cf8300 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Paul Burton
Browse files

MIPS: SGI-IP27: fix readb/writeb addressing 



Our chosen byte swapping, which is what firmware already uses, is to
do readl/writel by normal lw/sw intructions (data invariance). This
also means we need to mangle addresses for u8 and u16 accesses. The
mangling for 16bit has been done aready, but 8bit one was missing.
Correcting this causes different addresses for accesses to the
SuperIO and local bus of the IOC3 chip. This is fixed by changing
byte order in ioc3 and m48rtc_rtc structs.

Acked-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: linux-rtc@vger.kernel.org
parent 2634e5a6

arch/mips/include/asm/mach-ip27/mangle-port.h

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#ifndef __ASM_MACH_IP27_MANGLE_PORT_H

#define __ASM_MACH_IP27_MANGLE_PORT_H



#define __swizzle_addr_b(port)	(port)

#define __swizzle_addr_b(port)	((port) ^ 3)

#define __swizzle_addr_w(port)	((port) ^ 2)

#define __swizzle_addr_l(port)	(port)

#define __swizzle_addr_q(port)	(port)
@@ -20,6 +20,6 @@ 
# define ioswabl(a, x)		(x)

# define __mem_ioswabl(a, x)	cpu_to_le32(x)

# define ioswabq(a, x)		(x)

# define __mem_ioswabq(a, x)	cpu_to_le32(x)

# define __mem_ioswabq(a, x)	cpu_to_le64(x)



#endif /* __ASM_MACH_IP27_MANGLE_PORT_H */

arch/mips/include/asm/sn/ioc3.h

+19 −19
Original line number Diff line number Diff line
@@ -21,50 +21,50 @@ struct ioc3_serialregs { 


/* SUPERIO uart register map */

struct ioc3_uartregs {

	u8	iu_lcr;

	union {

		u8	iu_rbr;	/* read only, DLAB == 0 */

		u8	iu_thr;	/* write only, DLAB == 0 */

		u8	iu_dll;	/* DLAB == 1 */

		u8	iu_iir;	/* read only */

		u8	iu_fcr;	/* write only */

	};

	union {

		u8	iu_ier;	/* DLAB == 0 */

		u8	iu_dlm;	/* DLAB == 1 */

	};

	union {

		u8	iu_iir;	/* read only */

		u8	iu_fcr;	/* write only */

		u8	iu_rbr;	/* read only, DLAB == 0 */

		u8	iu_thr;	/* write only, DLAB == 0 */

		u8	iu_dll;	/* DLAB == 1 */

	};

	u8	iu_lcr;

	u8	iu_mcr;

	u8	iu_lsr;

	u8	iu_msr;

	u8	iu_scr;

	u8	iu_msr;

	u8	iu_lsr;

	u8	iu_mcr;

};



struct ioc3_sioregs {

	u8	fill[0x141];	/* starts at 0x141 */



	u8	uartc;

	u8	kbdcg;

	u8	uartc;



	u8	fill0[0x150 - 0x142 - 1];

	u8	fill0[0x151 - 0x142 - 1];



	u8	pp_data;

	u8	pp_dsr;

	u8	pp_dcr;

	u8	pp_dsr;

	u8	pp_data;



	u8	fill1[0x158 - 0x152 - 1];

	u8	fill1[0x159 - 0x153 - 1];



	u8	pp_fifa;

	u8	pp_cfgb;

	u8	pp_ecr;

	u8	pp_cfgb;

	u8	pp_fifa;



	u8	fill2[0x168 - 0x15a - 1];

	u8	fill2[0x16a - 0x15b - 1];



	u8	rtcad;

	u8	rtcdat;

	u8	rtcad;



	u8	fill3[0x170 - 0x169 - 1];

	u8	fill3[0x170 - 0x16b - 1];



	struct ioc3_uartregs	uartb;	/* 0x20170  */

	struct ioc3_uartregs	uarta;	/* 0x20178  */

drivers/net/ethernet/sgi/ioc3-eth.c

+12 −0
Original line number Diff line number Diff line
@@ -1079,6 +1079,16 @@ static int ioc3_is_menet(struct pci_dev *pdev) 
 * Can't use UPF_IOREMAP as the whole of IOC3 resources have already been

 * registered.

 */

static unsigned int ioc3_serial_in(struct uart_port *p, int offset)

{

	return readb(p->membase + (offset ^ 3));

}



static void ioc3_serial_out(struct uart_port *p, int offset, int value)

{

	writeb(value, p->membase + (offset ^ 3));

}



static void ioc3_8250_register(struct ioc3_uartregs __iomem *uart)

{

#define COSMISC_CONSTANT 6
@@ -1093,6 +1103,8 @@ static void ioc3_8250_register(struct ioc3_uartregs __iomem *uart) 


			.membase	= (unsigned char __iomem *)uart,

			.mapbase	= (unsigned long)uart,

			.serial_in	= ioc3_serial_in,

			.serial_out	= ioc3_serial_out,

		}

	};

	unsigned char lcr;

drivers/rtc/rtc-m48t35.c

+11 −0
Original line number Diff line number Diff line
@@ -20,6 +20,16 @@ 


struct m48t35_rtc {

	u8	pad[0x7ff8];    /* starts at 0x7ff8 */

#ifdef CONFIG_SGI_IP27

	u8	hour;

	u8	min;

	u8	sec;

	u8	control;

	u8	year;

	u8	month;

	u8	date;

	u8	day;

#else

	u8	control;

	u8	sec;

	u8	min;
@@ -28,6 +38,7 @@ struct m48t35_rtc { 
	u8	date;

	u8	month;

	u8	year;

#endif

};



#define M48T35_RTC_SET		0x80

CRA Git | Maintained and supported by SUSTech CRA and CCSE