Commit 26a940e2 authored Sep 15, 2005 by Pete Popov Committed by Ralf Baechle Oct 29, 2005

Cleaned up AMD Au1200 IDE driver:


- converted to platform bus
- removed pci dependencies
- removed virt_to_phys/phys_to_virt calls
    
System now can root off of a disk.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/Documentation/mips/AU1xxx_IDE.README b/Documentation/mips/AU1xxx_IDE.README
new file mode 100644

parent 64abf64d

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>

arch/mips/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -799,7 +799,7 @@ config MIPS_BOSPORUS
		config MIPS_DB1200
		bool "AMD Alchemy DB1200 board"
		select SOC_AU1200
		select DMA_NONCOHERENT
		select DMA_COHERENT
		select MIPS_DISABLE_OBSOLETE_IDE
		select SYS_SUPPORTS_LITTLE_ENDIAN

arch/mips/au1000/common/dbdma.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -197,6 +197,12 @@ find_dbdev_id (u32 id)
		return NULL;
		}

		void * au1xxx_ddma_get_nextptr_virt(au1x_ddma_desc_t *dp)
		{
		return phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
		}
		EXPORT_SYMBOL(au1xxx_ddma_get_nextptr_virt);

		u32
		au1xxx_ddma_add_device(dbdev_tab_t *dev)
		{

arch/mips/au1000/common/platform.c

+30 −2

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@
		#include <linux/init.h>
		#include <linux/resource.h>

		#include <asm/mach-au1x00/au1000.h>
		#include <asm/mach-au1x00/au1xxx.h>

		/* OHCI (USB full speed host controller) */
		static struct resource au1xxx_usb_ohci_resources[] = {
		@@ -154,7 +154,6 @@ static struct platform_device au1xxx_usb_otg_device = {
		.resource = au1xxx_usb_otg_resources,
		};

		/* AU1200 LCD controller */
		static struct resource au1200_lcd_resources[] = {
		[0] = {
		.start = LCD_PHYS_ADDR,
		@@ -168,6 +167,19 @@ static struct resource au1200_lcd_resources[] = {
		}
		};

		static struct resource au1200_ide0_resources[] = {
		[0] = {
		.start = AU1XXX_ATA_PHYS_ADDR,
		.end = AU1XXX_ATA_PHYS_ADDR + AU1XXX_ATA_PHYS_LEN,
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = AU1XXX_ATA_INT,
		.end = AU1XXX_ATA_INT,
		.flags = IORESOURCE_IRQ,
		}
		};

		static u64 au1200_lcd_dmamask = ~(u32)0;

		static struct platform_device au1200_lcd_device = {
		@@ -180,6 +192,21 @@ static struct platform_device au1200_lcd_device = {
		.num_resources = ARRAY_SIZE(au1200_lcd_resources),
		.resource = au1200_lcd_resources,
		};


		static u64 ide0_dmamask = ~(u32)0;

		static struct platform_device au1200_ide0_device = {
		.name = "au1200-ide",
		.id = 0,
		.dev = {
		.dma_mask = &ide0_dmamask,
		.coherent_dma_mask = 0xffffffff,
		},
		.num_resources = ARRAY_SIZE(au1200_ide0_resources),
		.resource = au1200_ide0_resources,
		};

		#endif

		static struct platform_device *au1xxx_platform_devices[] __initdata = {
		@@ -194,6 +221,7 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = {
		&au1xxx_usb_gdt_device,
		&au1xxx_usb_otg_device,
		&au1200_lcd_device,
		&au1200_ide0_device,
		#endif
		};

arch/mips/au1000/pb1200/irqmap.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		* with this program; if not, write to the Free Software Foundation, Inc.,
		* 675 Mass Ave, Cambridge, MA 02139, USA.
		*/
		#include <linux/config.h>
		#include <linux/errno.h>
		#include <linux/init.h>
		#include <linux/irq.h>
		@@ -65,7 +66,7 @@ int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);
		*/
		static volatile int pb1200_cascade_en=0;

		void pb1200_cascade_handler( int irq, void dev_id, struct pt_regs regs)
		irqreturn_t pb1200_cascade_handler( int irq, void dev_id, struct pt_regs regs)
		{
		unsigned short bisr = bcsr->int_status;
		int extirq_nr = 0;
		@@ -78,6 +79,7 @@ void pb1200_cascade_handler( int irq, void dev_id, struct pt_regs regs)
		/* Ack and dispatch IRQ */
		do_IRQ(extirq_nr,regs);
		}
		return IRQ_RETVAL(1);
		}

		inline void pb1200_enable_irq(unsigned int irq_nr)
		@@ -97,7 +99,7 @@ static unsigned int pb1200_startup_irq( unsigned int irq_nr )
		if (++pb1200_cascade_en == 1)
		{
		request_irq(AU1000_GPIO_7, &pb1200_cascade_handler,
		0, "Pb1200 Cascade", &pb1200_cascade_handler );
		0, "Pb1200 Cascade", (void *)&pb1200_cascade_handler );
		#ifdef CONFIG_MIPS_PB1200
		/* We have a problem with CPLD rev3. Enable a workaround */
		if( ((bcsr->whoami & BCSR_WHOAMI_CPLD)>>4) <= 3)