Hi all, The followings are updated version of patches I've posted to implement IOCHK interface for I/O error handling/detecting.
The abstraction of patches hasn't changed, so please refer archives if you need, e.g.: http://lwn.net/Articles/139240/ Tony, how do you think about applying my patches to your tree? Thanks, H.Seto [This is 1 of 10 patches, "iochk-01-generic.patch"] - It defines: a pair of function : iochk_clear and iochk_read a function for init : iochk_init type of control var : iocookie and describe "no-ops" as its "generic" action. - HAVE_ARCH_IOMAP_CHECK allows us to change whole definition of these functions and type from generic one to specific one. See next patch (2 of 10). Changes from previous one for 2.6.11.11: - reform default "nop" functions in static inline style. - I don't mind using EXPORT_SYMBOL_GPL but keep them as before. Does anyone worry about this? Signed-off-by: Hidetoshi Seto <[EMAIL PROTECTED]> --- drivers/pci/pci.c | 2 ++ include/asm-generic/iomap.h | 32 ++++++++++++++++++++++++++++++++ lib/iomap.c | 6 ++++++ 3 files changed, 40 insertions(+) Index: linux-2.6.13-rc1/lib/iomap.c =================================================================== --- linux-2.6.13-rc1.orig/lib/iomap.c +++ linux-2.6.13-rc1/lib/iomap.c @@ -230,3 +230,9 @@ void pci_iounmap(struct pci_dev *dev, vo } EXPORT_SYMBOL(pci_iomap); EXPORT_SYMBOL(pci_iounmap); + +#ifndef HAVE_ARCH_IOMAP_CHECK +/* Since generic funcs are inlined and defined in header, just export */ +EXPORT_SYMBOL(iochk_clear); +EXPORT_SYMBOL(iochk_read); +#endif Index: linux-2.6.13-rc1/include/asm-generic/iomap.h =================================================================== --- linux-2.6.13-rc1.orig/include/asm-generic/iomap.h +++ linux-2.6.13-rc1/include/asm-generic/iomap.h @@ -65,4 +65,36 @@ struct pci_dev; extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); extern void pci_iounmap(struct pci_dev *dev, void __iomem *); +/* + * IOMAP_CHECK provides additional interfaces for drivers to detect + * some IO errors, supports drivers having ability to recover errors. + * + * All works around iomap-check depends on the design of "iocookie" + * structure. Every architecture owning its iomap-check is free to + * define the actual design of iocookie to fit its special style. + */ +#ifndef HAVE_ARCH_IOMAP_CHECK +/* Dummy definition of default iocookie */ +typedef int iocookie; +#endif + +/* + * Clear/Read iocookie to check IO error while using iomap. + * + * Note that default iochk_clear-read pair interfaces don't have + * any effective error check, but some high-reliable platforms + * would provide useful information to you. + * And note that some action may be limited (ex. irq-unsafe) + * between the pair depend on the facility of the platform. + */ +#ifdef HAVE_ARCH_IOMAP_CHECK +extern void iochk_init(void); +extern void iochk_clear(iocookie *cookie, struct pci_dev *dev); +extern int iochk_read(iocookie *cookie); +#else +static inline void iochk_init(void) {} +static inline void iochk_clear(iocookie *cookie, struct pci_dev *dev) {} +static inline int iochk_read(iocookie *cookie) { return 0; } +#endif + #endif Index: linux-2.6.13-rc1/drivers/pci/pci.c =================================================================== --- linux-2.6.13-rc1.orig/drivers/pci/pci.c +++ linux-2.6.13-rc1/drivers/pci/pci.c @@ -767,6 +767,8 @@ static int __devinit pci_init(void) while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { pci_fixup_device(pci_fixup_final, dev); } + + iochk_init(); return 0; } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
