machine vectors for readX routines
PATCH 1/1 machine vectors for readX routines
It's unfortunate that our platform requires this, but the overhead of the extra cycles for the indirect call should be small compared to how long it takes the read to complete. I'm not sure if I got this patch right, it's against the nommiob patch I sent you earlier, so hopefully you won't have any conflicts when applying it.
Thanks,
Jesse
arch/ia64/lib/io.c +28 -5
@@ -87,12 +87,31 @@__ia64_outl (val, port); } -void -ia64_mmiob (void ) +unsigned char +ia64_readb (void *addr) { -__ia64_mmiob (); +return __ia64_readb (addr); } +unsigned short +ia64_readw (void *addr) +{ +return __ia64_readw (addr); +} + +unsigned int +ia64_readl (void *addr) +{ +return __ia64_readl (addr); +} + +unsigned long +ia64_readq (void *addr) +{ + return __ia64_readq (addr) +} + +/* define aliases: */ asm (".global __ia64_inb, __ia64_inw, __ia64_inl" );
@@ -105,7 +124,11 @@ asm ("__ia64_outw = ia64_outw" ); asm ("__ia64_outl = ia64_outl" ); -asm (".global __ia64_mmiob" ); -asm ("__ia64_mmiob = ia64_mmiob" ); +asm (".global __ia64_readb, __ia64_readw, __ia64_readl, __ia64_readq" ); +asm ("__ia64_readb = ia64_readb" ); +asm ("__ia64_readw = ia64_readw" ); +asm ("__ia64_readl = ia64_readl" ); +asm ("__ia64_readq = ia64_readq" ); +#endif /* CONFIG_IA64_GENERIC */
arch/ia64/sn/kernel/sn2/io.c +98 -0
98 lines not on this page · raw message
arch/ia64/sn/kernel/sn2/iomv.c +7 -4
@@ -3,10 +3,11 @@* License. See the file "COPYING" in the main directory of this archive * for more details. * -* Copyright (C) 2000-2002 Silicon Graphics, Inc. All rights reserved. +* Copyright (C) 2000-2003 Silicon Graphics, Inc. All rights reserved. */ #include <linux/pci.h> +#include <linux/module.h> #include <asm/io.h> #include <asm/delay.h> #include <asm/sn/simulator.h>
@@ -46,8 +47,10 @@ } } +EXPORT_SYMBOL (sn_io_addr); +/** -* sn2_mmiob - I/O space memory barrier +* sn_mmiob - I/O space memory barrier * * Acts as a memory mapped I/O barrier for platforms that queue writes to * I/O space. This ensures that subsequent writes to I/O space arrive after
@@ -60,9 +63,9 @@* */ void -sn2_mmiob (void ) +sn_mmiob (void ) { -while ((((volatile unsigned long ) (*pda->pio_write_status_addr)) &SH_PIO_WRITE_STATUS_0_PENDING_WRITE_COUNT_MASK ) != +while ((((volatile unsigned long ) (*pda.pio_write_status_addr)) &SH_PIO_WRITE_STATUS_0_PENDING_WRITE_COUNT_MASK ) !=SH_PIO_WRITE_STATUS_0_PENDING_WRITE_COUNT_MASK )udelay (1 ); }
include/asm-ia64/io.h +9 -4
@@ -289,25 +289,25 @@* The address passed to these functions are ioremap()ped already. */ static inline unsigned char -__readb (void *addr) +__ia64_readb (void *addr) {return *(volatile unsigned char *)addr; }static inline unsigned short -__readw (void *addr) +__ia64_readw (void *addr) {return *(volatile unsigned short *)addr; }static inline unsigned int -__readl (void *addr) +__ia64_readl (void *addr) {return *(volatile unsigned int *) addr; }static inline unsigned long -__readq (void *addr) +__ia64_readq (void *addr) {return *(volatile unsigned long *) addr; }
@@ -335,6 +335,11 @@ { *(volatile unsigned long *) addr = val; } + +#define __readb platform_readb +#define __readw platform_readw +#define __readl platform_readl +#define __readq platform_readq#define readb (a) __readb((void *)(a))#define readw (a) __readw((void *)(a))
include/asm-ia64/machvec.h +29 -1
@@ -61,6 +61,10 @@typedef void ia64_mv_outb_t (unsigned char ,unsigned long );typedef void ia64_mv_outw_t (unsigned short ,unsigned long );typedef void ia64_mv_outl_t (unsigned int ,unsigned long ); +typedef unsigned char ia64_mv_readb_t (void *); +typedef unsigned short ia64_mv_readw_t (void *); +typedef unsigned int ia64_mv_readl_t (void *); +typedef unsigned long ia64_mv_readq_t (void *);extern void machvec_noop (void );
@@ -109,6 +113,10 @@# define platform_outb ia64_mv.outb# define platform_outw ia64_mv.outw# define platform_outl ia64_mv.outl +# define platform_readb ia64_mv.readb +# define platform_readw ia64_mv.readw +# define platform_readl ia64_mv.readl +# define platform_readq ia64_mv.readq# endif /* __attribute__((__aligned__(16))) is required to make size of the
@@ -147,7 +155,11 @@ia64_mv_outb_t *outb;ia64_mv_outw_t *outw;ia64_mv_outl_t *outl; -} __attribute__((__aligned__(16))); +ia64_mv_readb_t *readb; +ia64_mv_readw_t *readw; +ia64_mv_readl_t *readl; +ia64_mv_readq_t *readq; +};#define MACHVEC_INIT (name) \ { \
@@ -181,6 +193,10 @@ platform_outb, \ platform_outw, \ platform_outl, \ + platform_readb, \ + platform_readw, \ + platform_readl, \ + platform_readq, \ } extern struct ia64_machine_vector ia64_mv;
@@ -295,6 +311,18 @@#endif #ifndef platform_outl# define platform_outl __ia64_outl +#endif +#ifndef platform_readb +# define platform_readb __ia64_readb +#endif +#ifndef platform_readw +# define platform_readw __ia64_readw +#endif +#ifndef platform_readl +# define platform_readl __ia64_readl +#endif +#ifndef platform_readq +# define platform_readq __ia64_readq#endif #endif /* _ASM_IA64_MACHVEC_H */
include/asm-ia64/machvec_sn2.h +22 -13
@@ -1,5 +1,5 @@/* -* Copyright (c) 2002 Silicon Graphics, Inc. All Rights Reserved. +* Copyright (c) 2002-2003 Silicon Graphics, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License
@@ -41,12 +41,16 @@extern ia64_mv_irq_desc sn_irq_desc;extern ia64_mv_irq_to_vector sn_irq_to_vector;extern ia64_mv_local_vector_to_irq sn_local_vector_to_irq; -extern ia64_mv_inb_t sn_inb; -extern ia64_mv_inw_t sn_inw; -extern ia64_mv_inl_t sn_inl; -extern ia64_mv_outb_t sn_outb; -extern ia64_mv_outw_t sn_outw; -extern ia64_mv_outl_t sn_outl; +extern ia64_mv_inb_t __sn_inb; +extern ia64_mv_inw_t __sn_inw; +extern ia64_mv_inl_t __sn_inl; +extern ia64_mv_outb_t __sn_outb; +extern ia64_mv_outw_t __sn_outw; +extern ia64_mv_outl_t __sn_outl; +extern ia64_mv_readb_t __sn_readb; +extern ia64_mv_readw_t __sn_readw; +extern ia64_mv_readl_t __sn_readl; +extern ia64_mv_readq_t __sn_readq;extern ia64_mv_pci_alloc_consistent sn_pci_alloc_consistent;extern ia64_mv_pci_free_consistent sn_pci_free_consistent;extern ia64_mv_pci_map_single sn_pci_map_single;
@@ -71,12 +75,17 @@#define platform_irq_init sn_irq_init#define platform_send_ipi sn2_send_IPI#define platform_global_tlb_purge sn2_global_tlb_purge -#define platform_inb sn_inb -#define platform_inw sn_inw -#define platform_inl sn_inl -#define platform_outb sn_outb -#define platform_outw sn_outw -#define platform_outl sn_outl +#define platform_pci_fixup sn_pci_fixup +#define platform_inb __sn_inb +#define platform_inw __sn_inw +#define platform_inl __sn_inl +#define platform_outb __sn_outb +#define platform_outw __sn_outw +#define platform_outl __sn_outl +#define platform_readb __sn_readb +#define platform_readw __sn_readw +#define platform_readl __sn_readl +#define platform_readq __sn_readq#define platform_irq_desc sn_irq_desc#define platform_irq_to_vector sn_irq_to_vector#define platform_local_vector_to_irq sn_local_vector_to_irq
include/asm-ia64/sn/io.h +6 -1
@@ -3,8 +3,8 @@* License. See the file "COPYING" in the main directory of this archive * for more details. * +* Copyright (C) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. * Copyright (C) 2000 Ralf Baechle -* Copyright (C) 2000-2001 Silicon Graphics, Inc. */ #ifndef _ASM_IA64_SN_IO_H#define _ASM_IA64_SN_IO_H
@@ -77,5 +77,10 @@#include <asm/sn/sn2/shub.h> #include <asm/sn/sn2/shubio.h> #endif + +/* +* Used to ensure write ordering (like mb(), but for I/O space) +*/ +extern void sn_mmiob (void );#endif /* _ASM_IA64_SN_IO_H */
include/asm-ia64/sn/sn2/io.h +206 -0
206 lines not on this page · raw message