source: patches/linux-2.6.17.4-mips_fixes-2.patch@ f3e9c8a

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since f3e9c8a was 31d07f11, checked in by Jim Gifford <clfs@…>, 18 years ago

Updated Linux MIPS Fixes patch

  • Property mode set to 100644
File size: 10.0 KB
  • arch/mips/lib/iomap.c

    Submitted By: Jim Gifford (patches at jg555 dot com)
    Date: 2006-07-08
    Initial Package Version: 2.6.17.4
    Origin: Linux-MIPS Mailing List
    Upstream Status: Not Applied
    Description: These are patches that have not been accepted by
    	     Linux-MIPS.
    
    	1 - iomap for MIPS - iomap.c io.h
    	2 - Cobalt ide fixes
    
    diff -Naur linux-2.6.17.4/arch/mips/lib/iomap.c linux-2.6.17.4.kernel/arch/mips/lib/iomap.c
    old new  
     1/*
     2 *  iomap.c, Memory Mapped I/O routines for MIPS architecture.
     3 *
     4 *  This code is based on lib/iomap.c, by Linus Torvalds.
     5 *
     6 *  Copyright (C) 2004-2005  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
     7 *
     8 *  This program is free software; you can redistribute it and/or modify
     9 *  it under the terms of the GNU General Public License as published by
     10 *  the Free Software Foundation; either version 2 of the License, or
     11 *  (at your option) any later version.
     12 *
     13 *  This program is distributed in the hope that it will be useful,
     14 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
     15 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     16 *  GNU General Public License for more details.
     17 *
     18 *  You should have received a copy of the GNU General Public License
     19 *  along with this program; if not, write to the Free Software
     20 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     21 */
     22#include <linux/ioport.h>
     23#include <linux/module.h>
     24#include <linux/pci.h>
     25
     26#include <asm/io.h>
     27
     28void __iomem *ioport_map(unsigned long port, unsigned int nr)
     29{
     30        unsigned long end;
     31
     32        end = port + nr - 1UL;
     33        if (ioport_resource.start > port ||
     34            ioport_resource.end < end || port > end)
     35                return NULL;
     36
     37        return (void __iomem *)(mips_io_port_base + port);
     38}
     39
     40void ioport_unmap(void __iomem *addr)
     41{
     42}
     43EXPORT_SYMBOL(ioport_map);
     44EXPORT_SYMBOL(ioport_unmap);
     45
     46void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
     47{
     48        unsigned long start, len, flags;
     49
     50        if (dev == NULL)
     51                return NULL;
     52
     53        start = pci_resource_start(dev, bar);
     54        len = pci_resource_len(dev, bar);
     55        if (!start || !len)
     56                return NULL;
     57
     58        if (maxlen != 0 && len > maxlen)
     59                len = maxlen;
     60
     61        flags = pci_resource_flags(dev, bar);
     62        if (flags & IORESOURCE_IO)
     63                return ioport_map(start, len);
     64        if (flags & IORESOURCE_MEM) {
     65                if (flags & IORESOURCE_CACHEABLE)
     66                        return ioremap_cachable(start, len);
     67                return ioremap_nocache(start, len);
     68        }
     69
     70        return NULL;
     71}
     72
     73void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
     74{
     75        iounmap(addr);
     76}
     77EXPORT_SYMBOL(pci_iomap);
     78EXPORT_SYMBOL(pci_iounmap);
  • arch/mips/lib/Makefile

    diff -Naur linux-2.6.17.4/arch/mips/lib/Makefile linux-2.6.17.4.kernel/arch/mips/lib/Makefile
    old new  
    55lib-y   += csum_partial_copy.o memcpy.o promlib.o strlen_user.o strncpy_user.o \
    66           strnlen_user.o uncached.o
    77
     8obj-y   += iomap.o
     9
    810# libgcc-style stuff needed in the kernel
    911lib-y += ashldi3.o ashrdi3.o lshrdi3.o
    1012
  • include/asm-mips/io.h

    diff -Naur linux-2.6.17.4/include/asm-mips/io.h linux-2.6.17.4.kernel/include/asm-mips/io.h
    old new  
    519519}
    520520
    521521/*
     522 * Memory Mapped I/O
     523 */
     524#define ioread8(addr)           readb(addr)
     525#define ioread16(addr)          readw(addr)
     526#define ioread32(addr)          readl(addr)
     527
     528#define iowrite8(b,addr)        writeb(b,addr)
     529#define iowrite16(w,addr)       writew(w,addr)
     530#define iowrite32(l,addr)       writel(l,addr)
     531
     532#define ioread8_rep(a,b,c)      readsb(a,b,c)
     533#define ioread16_rep(a,b,c)     readsw(a,b,c)
     534#define ioread32_rep(a,b,c)     readsl(a,b,c)
     535
     536#define iowrite8_rep(a,b,c)     writesb(a,b,c)
     537#define iowrite16_rep(a,b,c)    writesw(a,b,c)
     538#define iowrite32_rep(a,b,c)    writesl(a,b,c)
     539
     540/* Create a virtual mapping cookie for an IO port range */
     541extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
     542extern void ioport_unmap(void __iomem *);
     543
     544/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
     545struct pci_dev;
     546extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
     547extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
     548
     549/*
    522550 * ISA space is 'always mapped' on currently supported MIPS systems, no need
    523551 * to explicitly ioremap() it. The fact that the ISA IO space is mapped
    524552 * to PAGE_OFFSET is pure coincidence - it does not mean ISA values
  • include/asm-mips/mach-cobalt/ide.h

    diff -Naur linux-2.6.17.4/include/asm-mips/mach-cobalt/ide.h linux-2.6.17.4.kernel/include/asm-mips/mach-cobalt/ide.h
    old new  
     1
     2/*
     3 * PIO "in" transfers can cause D-cache lines to be allocated
     4 * to the data being read. If the target is the page cache then
     5 * the kernel can create a user space mapping of the same page
     6 * without flushing it from the D-cache. This has large potential
     7 * to create cache aliases. The Cobalts seem to trigger this
     8 * problem easily.
     9 *
     10 * MIPs doesn't have a flush_dcache_range() so we roll
     11 * our own.
     12 *
     13 * -- pdh
     14 */
     15
     16#define MAX_HWIFS                       2
     17
     18#include <asm/r4kcache.h>
     19
     20static inline void __flush_dcache(void)
     21{
     22        unsigned long dc_size, dc_line, addr, end;
     23
     24        dc_size = current_cpu_data.dcache.ways << current_cpu_data.dcache.waybit;
     25        dc_line = current_cpu_data.dcache.linesz;
     26
     27        addr = CKSEG0;
     28        end = addr + dc_size;
     29
     30        for (; addr < end; addr += dc_line)
     31                flush_dcache_line_indexed(addr);
     32}
     33
     34static inline void __flush_dcache_range(unsigned long start, unsigned long end)
     35{
     36        unsigned long dc_size, dc_line, addr;
     37
     38        dc_size = current_cpu_data.dcache.ways << current_cpu_data.dcache.waybit;
     39        dc_line = current_cpu_data.dcache.linesz;
     40
     41        addr = start & ~(dc_line - 1);
     42        end += dc_line - 1;
     43
     44        if (end - addr < dc_size)
     45                for (; addr < end; addr += dc_line)
     46                        flush_dcache_line(addr);
     47        else
     48                __flush_dcache();
     49}
     50
     51static inline void __ide_insw(unsigned long port, void *addr, unsigned int count)
     52{
     53        insw(port, addr, count);
     54
     55        __flush_dcache_range((unsigned long) addr, (unsigned long) addr + count * 2);
     56}
     57
     58static inline void __ide_insl(unsigned long port, void *addr, unsigned int count)
     59{
     60        insl(port, addr, count);
     61
     62        __flush_dcache_range((unsigned long) addr, (unsigned long) addr + count * 4);
     63}
     64
     65static inline void __ide_mm_insw(volatile void __iomem *port, void *addr, unsigned int count)
     66{
     67        readsw(port, addr, count);
     68
     69        __flush_dcache_range((unsigned long) addr, (unsigned long) addr + count * 2);
     70}
     71
     72static inline void __ide_mm_insl(volatile void __iomem *port, void *addr, unsigned int count)
     73{
     74        readsl(port, addr, count);
     75
     76        __flush_dcache_range((unsigned long) addr, (unsigned long) addr + count * 4);
     77}
     78
     79#define insw                    __ide_insw
     80#define insl                    __ide_insl
     81
     82#define __ide_mm_outsw          writesw
     83#define __ide_mm_outsl          writesl
  • linux-2.6.17.4/arch/mips/lib/ashldi3.c

    diff -Naur linux-2.6.17.4/arch/mips/lib/ashldi3.c linux-2.6.17.4/arch/mips/lib/ashldi3.c
     
     1#include <linux/module.h>
     2
     3#include "libgcc.h"
     4
     5long long __ashldi3(long long u, word_type b)
     6{
     7        DWunion uu, w;
     8        word_type bm;
     9
     10        if (b == 0)
     11                return u;
     12
     13        uu.ll = u;
     14        bm = 32 - b;
     15
     16        if (bm <= 0) {
     17                w.s.low = 0;
     18                w.s.high = (unsigned int) uu.s.low << -bm;
     19        } else {
     20                const unsigned int carries = (unsigned int) uu.s.low >> bm;
     21
     22                w.s.low = (unsigned int) uu.s.low << b;
     23                w.s.high = ((unsigned int) uu.s.high << b) | carries;
     24        }
     25
     26        return w.ll;
     27}
     28
     29EXPORT_SYMBOL(__ashldi3);
  • linux-2.6.17.4/arch/mips/lib/ashrdi3.c

    diff -Naur linux-2.6.17.4/arch/mips/lib/ashrdi3.c linux-2.6.17.4/arch/mips/lib/ashrdi3.c
     
     1#include <linux/module.h>
     2
     3#include "libgcc.h"
     4
     5long long __ashrdi3(long long u, word_type b)
     6{
     7        DWunion uu, w;
     8        word_type bm;
     9
     10        if (b == 0)
     11                return u;
     12
     13        uu.ll = u;
     14        bm = 32 - b;
     15
     16        if (bm <= 0) {
     17                /* w.s.high = 1..1 or 0..0 */
     18                w.s.high =
     19                    uu.s.high >> 31;
     20                w.s.low = uu.s.high >> -bm;
     21        } else {
     22                const unsigned int carries = (unsigned int) uu.s.high << bm;
     23
     24                w.s.high = uu.s.high >> b;
     25                w.s.low = ((unsigned int) uu.s.low >> b) | carries;
     26        }
     27
     28        return w.ll;
     29}
     30
     31EXPORT_SYMBOL(__ashrdi3);
  • linux-2.6.17.4/arch/mips/lib/libgcc.h

    diff -Naur linux-2.6.17.4/arch/mips/lib/libgcc.h linux-2.6.17.4/arch/mips/lib/libgcc.h
     
     1#ifndef __ASM_LIBGCC_H
     2#define __ASM_LIBGCC_H
     3
     4#include <asm/byteorder.h>
     5
     6typedef int word_type __attribute__ ((mode (__word__)));
     7
     8#ifdef __BIG_ENDIAN
     9struct DWstruct {
     10        int high, low;
     11};
     12#elif defined(__LITTLE_ENDIAN)
     13struct DWstruct {
     14        int low, high;
     15};
     16#else
     17#error I feel sick.
     18#endif
     19
     20typedef union
     21{
     22        struct DWstruct s;
     23        long long ll;
     24} DWunion;
     25
     26#endif /* __ASM_LIBGCC_H */
  • linux-2.6.17.4/arch/mips/lib/lshrdi3.c

    diff -Naur linux-2.6.17.4/arch/mips/lib/lshrdi3.c linux-2.6.17.4/arch/mips/lib/lshrdi3.c
     
     1#include <linux/module.h>
     2
     3#include "libgcc.h"
     4
     5long long __lshrdi3(long long u, word_type b)
     6{
     7        DWunion uu, w;
     8        word_type bm;
     9
     10        if (b == 0)
     11                return u;
     12
     13        uu.ll = u;
     14        bm = 32 - b;
     15
     16        if (bm <= 0) {
     17                w.s.high = 0;
     18                w.s.low = (unsigned int) uu.s.high >> -bm;
     19        } else {
     20                const unsigned int carries = (unsigned int) uu.s.high << bm;
     21
     22                w.s.high = (unsigned int) uu.s.high >> b;
     23                w.s.low = ((unsigned int) uu.s.low >> b) | carries;
     24        }
     25
     26        return w.ll;
     27}
     28
     29EXPORT_SYMBOL(__lshrdi3);
Note: See TracBrowser for help on using the repository browser.