Commit e9d52234 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

parents 955c5038 09af7b44

Documentation/mips/AU1xxx_IDE.README

0 → 100644
+168 −0
Original line number Diff line number Diff line 
README for MIPS AU1XXX IDE driver - Released 2005-07-15



ABOUT

-----

This file describes the 'drivers/ide/mips/au1xxx-ide.c', related files and the

services they provide.



If you are short in patience and just want to know how to add your hard disc to

the white or black list, go to the 'ADD NEW HARD DISC TO WHITE OR BLACK LIST'

section.





LICENSE

-------



Copyright (c) 2003-2005 AMD, Personal Connectivity Solutions



This program is free software; you can redistribute it and/or modify it under

the terms of the GNU General Public License as published by the Free Software

Foundation; either version 2 of the License, or (at your option) any later

version.



THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,

INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR

BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

POSSIBILITY OF SUCH DAMAGE.



You should have received a copy of the GNU General Public License along with

this program; if not, write to the Free Software Foundation, Inc.,

675 Mass Ave, Cambridge, MA 02139, USA.



Note: for more information, please refer "AMD Alchemy Au1200/Au1550 IDE

      Interface and Linux Device Driver" Application Note.





FILES, CONFIGS AND COMPATABILITY

--------------------------------



Two files are introduced:



  a) 'include/asm-mips/mach-au1x00/au1xxx_ide.h'

     containes : struct _auide_hwif

                 struct drive_list_entry dma_white_list

                 struct drive_list_entry dma_black_list

                 timing parameters for PIO mode 0/1/2/3/4

                 timing parameters for MWDMA 0/1/2



  b) 'drivers/ide/mips/au1xxx-ide.c'

     contains the functionality of the AU1XXX IDE driver



Four configs variables are introduced:



  CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA    - enable the PIO+DBDMA mode

  CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA  - enable the MWDMA mode

  CONFIG_BLK_DEV_IDE_AU1XXX_BURSTABLE_ON - set Burstable FIFO in DBDMA

                                           controler

  CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ - maximum transfer size

                                           per descriptor



If MWDMA is enabled and the connected hard disc is not on the white list, the

kernel switches to a "safe mwdma mode" at boot time. In this mode the IDE

performance is substantial slower then in full speed mwdma. In this case

please add your hard disc to the white list (follow instruction from 'ADD NEW

HARD DISC TO WHITE OR BLACK LIST' section).





SUPPORTED IDE MODES

-------------------



The AU1XXX IDE driver supported all PIO modes - PIO mode 0/1/2/3/4 - and all

MWDMA modes - MWDMA 0/1/2 -. There is no support for SWDMA and UDMA mode.



To change the PIO mode use the program hdparm with option -p, e.g.

'hdparm -p0 [device]' for PIO mode 0. To enable the MWDMA mode use the option

-X, e.g. 'hdparm -X32 [device]' for MWDMA mode 0.





PERFORMANCE CONFIGURATIONS

--------------------------



If the used system doesn't need USB support enable the following kernel configs:



CONFIG_IDE=y

CONFIG_BLK_DEV_IDE=y

CONFIG_IDE_GENERIC=y

CONFIG_BLK_DEV_IDEPCI=y

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_IDEDMA_PCI=y

CONFIG_IDEDMA_PCI_AUTO=y

CONFIG_BLK_DEV_IDE_AU1XXX=y

CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA=y

CONFIG_BLK_DEV_IDE_AU1XXX_BURSTABLE_ON=y

CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ=128

CONFIG_BLK_DEV_IDEDMA=y

CONFIG_IDEDMA_AUTO=y



If the used system need the USB support enable the following kernel configs for

high IDE to USB throughput.



CONFIG_BLK_DEV_IDEDISK=y

CONFIG_IDE_GENERIC=y

CONFIG_BLK_DEV_IDEPCI=y

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_IDEDMA_PCI=y

CONFIG_IDEDMA_PCI_AUTO=y

CONFIG_BLK_DEV_IDE_AU1XXX=y

CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA=y

CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ=128

CONFIG_BLK_DEV_IDEDMA=y

CONFIG_IDEDMA_AUTO=y





ADD NEW HARD DISC TO WHITE OR BLACK LIST

----------------------------------------



Step 1 : detect the model name of your hard disc



  a) connect your hard disc to the AU1XXX



  b) boot your kernel and get the hard disc model.



     Example boot log:



     --snipped--

     Uniform Multi-Platform E-IDE driver Revision: 7.00alpha2

     ide: Assuming 50MHz system bus speed for PIO modes; override with idebus=xx

     Au1xxx IDE(builtin) configured for MWDMA2

     Probing IDE interface ide0...

     hda: Maxtor 6E040L0, ATA DISK drive

     ide0 at 0xac800000-0xac800007,0xac8001c0 on irq 64

     hda: max request size: 64KiB

     hda: 80293248 sectors (41110 MB) w/2048KiB Cache, CHS=65535/16/63, (U)DMA

     --snipped--



     In this example 'Maxtor 6E040L0'.



Step  2 : edit 'include/asm-mips/mach-au1x00/au1xxx_ide.h'



  Add your hard disc to the dma_white_list or dma_black_list structur.



Step 3 : Recompile the kernel



  Enable MWDMA support in the kernel configuration. Recompile the kernel and

  reboot.



Step 4 : Tests



  If you have add a hard disc to the white list, please run some stress tests

  for verification.





ACKNOWLEDGMENTS

---------------



These drivers wouldn't have been done without the base of kernel 2.4.x AU1XXX

IDE driver from AMD.



Additional input also from:

Matthias Lenk <matthias.lenk@amd.com>



Happy hacking!

Enrico Walther <enrico.walther@amd.com>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1643,7 +1643,7 @@ S: Maintained 
MIPS

P:	Ralf Baechle

M:	ralf@linux-mips.org

W:	http://oss.sgi.com/mips/mips-howto.html

W:	http://www.linux-mips.org/

L:	linux-mips@linux-mips.org

S:	Maintained

arch/mips/Kconfig

+790 −720

File changed.

Preview size limit exceeded, changes collapsed.

arch/mips/Makefile

+112 −6
Original line number Diff line number Diff line
@@ -52,6 +52,21 @@ ifdef CONFIG_CROSSCOMPILE 
CROSS_COMPILE		:= $(tool-prefix)

endif



CHECKFLAGS-y				+= -D__linux__ -D__mips__ \

					   -D_ABIO32=1 \

					   -D_ABIN32=2 \

					   -D_ABI64=3

CHECKFLAGS-$(CONFIG_32BIT)		+= -D_MIPS_SIM=_ABIO32 \

					   -D_MIPS_SZLONG=32 \

					   -D__PTRDIFF_TYPE__=int

CHECKFLAGS-$(CONFIG_64BIT)		+= -m64 -D_MIPS_SIM=_ABI64 \

					   -D_MIPS_SZLONG=64 \

					   -D__PTRDIFF_TYPE__="long int"

CHECKFLAGS-$(CONFIG_CPU_BIG_ENDIAN)	+= -D__MIPSEB__

CHECKFLAGS-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -D__MIPSEL__



CHECKFLAGS				= $(CHECKFLAGS-y)



ifdef CONFIG_BUILD_ELF64

gas-abi			= 64

ld-emul			= $(64bit-emul)
@@ -79,9 +94,18 @@ endif 
cflags-y			+= -I $(TOPDIR)/include/asm/gcc

cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe

cflags-y			+= $(call cc-option, -finline-limit=100000)

LDFLAGS_vmlinux			+= -G 0 -static -n

LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib

MODFLAGS			+= -mlong-calls



#

# We explicitly add the endianness specifier if needed, this allows

# to compile kernels with a toolchain for the other endianness. We

# carefully avoid to add it redundantly because gcc 3.3/3.4 complains

# when fed the toolchain default!

#

cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB)

cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL)



cflags-$(CONFIG_SB1XXX_CORELIS)	+= -mno-sched-prolog -fno-omit-frame-pointer



#
@@ -167,14 +191,22 @@ cflags-$(CONFIG_CPU_TX49XX) += \ 
			$(call set_gccflags,r4600,mips3,r4600,mips3,mips2)  \

			-Wa,--trap



cflags-$(CONFIG_CPU_MIPS32)	+= \

cflags-$(CONFIG_CPU_MIPS32_R1)	+= \

			$(call set_gccflags,mips32,mips32,r4600,mips3,mips2) \

			-Wa,--trap



cflags-$(CONFIG_CPU_MIPS64)	+= \

cflags-$(CONFIG_CPU_MIPS32_R2)	+= \

			$(call set_gccflags,mips32r2,mips32r2,r4600,mips3,mips2) \

			-Wa,--trap



cflags-$(CONFIG_CPU_MIPS64_R1)	+= \

			$(call set_gccflags,mips64,mips64,r4600,mips3,mips2) \

			-Wa,--trap



cflags-$(CONFIG_CPU_MIPS64_R2)	+= \

			$(call set_gccflags,mips64r2,mips64r2,r4600,mips3,mips2) \

			-Wa,--trap



cflags-$(CONFIG_CPU_R5000)	+= \

			$(call set_gccflags,r5000,mips4,r5000,mips4,mips2) \

			-Wa,--trap
@@ -196,6 +228,7 @@ cflags-$(CONFIG_CPU_RM9000) += \ 
			$(call set_gccflags,rm9000,mips4,r5000,mips4,mips2) \

			-Wa,--trap





cflags-$(CONFIG_CPU_SB1)	+= \

			$(call set_gccflags,sb1,mips64,r5000,mips4,mips2) \

			-Wa,--trap
@@ -265,6 +298,13 @@ libs-$(CONFIG_MIPS_PB1550) += arch/mips/au1000/pb1550/ 
cflags-$(CONFIG_MIPS_PB1550)	+= -Iinclude/asm-mips/mach-pb1x00

load-$(CONFIG_MIPS_PB1550)	+= 0xffffffff80100000



#

# AMD Alchemy Pb1200 eval board

#

libs-$(CONFIG_MIPS_PB1200)	+= arch/mips/au1000/pb1200/

cflags-$(CONFIG_MIPS_PB1200)	+= -Iinclude/asm-mips/mach-pb1x00

load-$(CONFIG_MIPS_PB1200)	+= 0xffffffff80100000



#

# AMD Alchemy Db1000 eval board

#
@@ -293,6 +333,13 @@ libs-$(CONFIG_MIPS_DB1550) += arch/mips/au1000/db1x00/ 
cflags-$(CONFIG_MIPS_DB1550)	+= -Iinclude/asm-mips/mach-db1x00

load-$(CONFIG_MIPS_DB1550)	+= 0xffffffff80100000



#

# AMD Alchemy Db1200 eval board

#

libs-$(CONFIG_MIPS_DB1200)	+= arch/mips/au1000/pb1200/

cflags-$(CONFIG_MIPS_DB1200)	+= -Iinclude/asm-mips/mach-db1x00

load-$(CONFIG_MIPS_DB1200)	+= 0xffffffff80100000



#

# AMD Alchemy Bosporus eval board

#
@@ -323,6 +370,7 @@ load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000 
# Cobalt Server

#

core-$(CONFIG_MIPS_COBALT)	+= arch/mips/cobalt/

cflags-$(CONFIG_MIPS_COBALT)	+= -Iinclude/asm-mips/cobalt

load-$(CONFIG_MIPS_COBALT)	+= 0xffffffff80080000



#
@@ -388,6 +436,13 @@ load-$(CONFIG_MIPS_MALTA) += 0xffffffff80100000 
core-$(CONFIG_MIPS_SEAD)	+= arch/mips/mips-boards/sead/

load-$(CONFIG_MIPS_SEAD)	+= 0xffffffff80100000



#

# MIPS SIM

#

core-$(CONFIG_MIPS_SIM)		+= arch/mips/mips-boards/sim/

cflags-$(CONFIG_MIPS_SIM)	+= -Iinclude/asm-mips/mach-sim

load-$(CONFIG_MIPS_SIM)		+= 0x80100000



#

# Momentum Ocelot board

#
@@ -513,6 +568,19 @@ load-$(CONFIG_CASIO_E55) += 0xffffffff80004000 
#

load-$(CONFIG_TANBAC_TB022X)	+= 0xffffffff80000000



#

# Common Philips PNX8550

#

core-$(CONFIG_SOC_PNX8550)	+= arch/mips/philips/pnx8550/common/

cflags-$(CONFIG_SOC_PNX8550)	+= -Iinclude/asm-mips/mach-pnx8550



#

# Philips PNX8550 JBS board

#

libs-$(CONFIG_PNX8550_JBS)	+= arch/mips/philips/pnx8550/jbs/

#cflags-$(CONFIG_PNX8550_JBS)	+= -Iinclude/asm-mips/mach-pnx8550

load-$(CONFIG_PNX8550_JBS)	+= 0xffffffff80060000



#

# SGI IP22 (Indy/Indigo2)

#
@@ -582,10 +650,20 @@ load-$(CONFIG_SGI_IP32) += 0xffffffff80004000 
# removed (as happens, even if they have __initcall/module_init)

#

core-$(CONFIG_SIBYTE_BCM112X)	+= arch/mips/sibyte/sb1250/

cflags-$(CONFIG_SIBYTE_BCM112X)	+= -Iinclude/asm-mips/mach-sibyte

cflags-$(CONFIG_SIBYTE_BCM112X)	+= -Iinclude/asm-mips/mach-sibyte \

			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL



core-$(CONFIG_SIBYTE_SB1250)	+= arch/mips/sibyte/sb1250/

cflags-$(CONFIG_SIBYTE_SB1250)	+= -Iinclude/asm-mips/mach-sibyte

cflags-$(CONFIG_SIBYTE_SB1250)	+= -Iinclude/asm-mips/mach-sibyte \

			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL



core-$(CONFIG_SIBYTE_BCM1x55)	+= arch/mips/sibyte/bcm1480/

cflags-$(CONFIG_SIBYTE_BCM1x55)	+= -Iinclude/asm-mips/mach-sibyte \

			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL



core-$(CONFIG_SIBYTE_BCM1x80)	+= arch/mips/sibyte/bcm1480/

cflags-$(CONFIG_SIBYTE_BCM1x80)	+= -Iinclude/asm-mips/mach-sibyte \

			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL



#

# Sibyte BCM91120x (Carmel) board
@@ -593,6 +671,7 @@ cflags-$(CONFIG_SIBYTE_SB1250) += -Iinclude/asm-mips/mach-sibyte 
# Sibyte BCM91125C (CRhone) board

# Sibyte BCM91125E (Rhone) board

# Sibyte SWARM board

# Sibyte BCM91x80 (BigSur) board

#

libs-$(CONFIG_SIBYTE_CARMEL)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_CARMEL)	:= 0xffffffff80100000
@@ -606,6 +685,8 @@ libs-$(CONFIG_SIBYTE_SENTOSA) += arch/mips/sibyte/swarm/ 
load-$(CONFIG_SIBYTE_SENTOSA)	:= 0xffffffff80100000

libs-$(CONFIG_SIBYTE_SWARM)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_SWARM)	:= 0xffffffff80100000

libs-$(CONFIG_SIBYTE_BIGSUR)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_BIGSUR)	:= 0xffffffff80100000



#

# SNI RM200 PCI
@@ -629,6 +710,13 @@ core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/tx4927/toshiba_rbtx4927/ 
core-$(CONFIG_TOSHIBA_RBTX4927)	+= arch/mips/tx4927/common/

load-$(CONFIG_TOSHIBA_RBTX4927)	+= 0xffffffff80020000



#

# Toshiba RBTX4938 board

#

core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/toshiba_rbtx4938/

core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/common/

load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000



cflags-y			+= -Iinclude/asm-mips/mach-generic

drivers-$(CONFIG_PCI)		+= arch/mips/pci/
@@ -701,10 +789,29 @@ ifdef CONFIG_BOOT_ELF64 
all:	$(vmlinux-64)

endif



ifdef CONFIG_MIPS_ATLAS

all:	vmlinux.srec

endif



ifdef CONFIG_MIPS_MALTA

all:	vmlinux.srec

endif



ifdef CONFIG_MIPS_SEAD

all:	vmlinux.srec

endif



ifdef CONFIG_QEMU

all:	vmlinux.bin

endif



ifdef CONFIG_SNI_RM200_PCI

all:	vmlinux.ecoff

endif



vmlinux.bin: $(vmlinux-32)

	+@$(call makeboot,$@)



vmlinux.ecoff vmlinux.rm200: $(vmlinux-32)

	+@$(call makeboot,$@)
@@ -720,7 +827,6 @@ archclean: 
	@$(MAKE) $(clean)=arch/mips/boot

	@$(MAKE) $(clean)=arch/mips/lasat





CLEAN_FILES += vmlinux.32 \

	       vmlinux.64 \

	       vmlinux.ecoff

arch/mips/arc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



lib-y				+= cmdline.o env.o file.o identify.o init.o \

				   misc.o time.o tree.o

				   misc.o salone.o time.o tree.o



lib-$(CONFIG_ARC_MEMORY)	+= memory.o

lib-$(CONFIG_ARC_CONSOLE)	+= arc_con.o