Messages in this thread Patch in this message | | | Date | Fri, 12 May 2006 11:46:54 +0200 | From | "Thomas Kleffel (maintech GmbH)" <> | Subject | Re: [PATCH] ide_cs: Make ide_cs work with the memory space of CF-Cards if IO space is not available (3nd revision) |
| |
From: Thomas Kleffel <tk@maintech.de>
this patch enables ide_cs to access CF-cards via their common memory rather than via their IO space.
Signed-off-by: Thomas Kleffel <tk@maintech.de> ---
This patch is against 2.6.17-rc3
The reason why this patch makes sense is that it is pretty easy to build a CF-Interface out of a simple address/data-bus if you only use common and attribute memory. Adding the capability to access IO space makes things more complicated.
If you just want to use CF-Storage cards, access to common and attribute memory is enough as the IDE registers are available there, as well.
I have submitted a patch to RMK which enables the AT91RM9200's CF interface to work in that mode.
I made some changes based on the feedback from Alan Cox and Iain Barker.
The window size was changed from 16 to 0 (autodetect) on suggestion from Iain Barker. 16 didn't work with one of his cards.
ide_cs was converted from outb to iowrite8 on suggestion from David Vrabel.
Thomas
diff -uprN l1/drivers/ide/legacy/ide-cs.c l2/drivers/ide/legacy/ide-cs.c --- l1/drivers/ide/legacy/ide-cs.c 2006-05-11 00:19:59.000000000 +0200 +++ l2/drivers/ide/legacy/ide-cs.c 2006-05-12 11:29:11.000000000 +0200 @@ -146,7 +146,16 @@ static void ide_detach(struct pcmcia_dev kfree(link->priv); } /* ide_detach */ -static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq, struct pcmcia_device *handle) +static void idecs_mmio_fixup(ide_hwif_t *hwif) +{ + default_hwif_mmiops(hwif); + hwif->mmio = 2; + + ide_undecoded_slave(hwif); +} + +static int idecs_register(unsigned long io, unsigned long ctl, + unsigned long irq, struct pcmcia_device *handle, int is_mmio) { hw_regs_t hw; memset(&hw, 0, sizeof(hw)); @@ -154,7 +163,11 @@ static int idecs_register(unsigned long hw.irq = irq; hw.chipset = ide_pci; hw.dev = &handle->dev; - return ide_register_hw_with_fixup(&hw, NULL, ide_undecoded_slave); + + if(is_mmio) + return ide_register_hw_with_fixup(&hw, NULL, idecs_mmio_fixup); + else + return ide_register_hw_with_fixup(&hw, NULL, ide_undecoded_slave); } /*====================================================================== @@ -180,7 +193,7 @@ static int ide_config(struct pcmcia_devi } *stk = NULL; cistpl_cftable_entry_t *cfg; int i, pass, last_ret = 0, last_fn = 0, hd, is_kme = 0; - unsigned long io_base, ctl_base; + unsigned long io_base, ctl_base, is_mmio; DEBUG(0, "ide_config(0x%p)\n", link); @@ -210,7 +223,7 @@ static int ide_config(struct pcmcia_devi /* Not sure if this is right... look up the current Vcc */ CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &stk->conf)); - pass = io_base = ctl_base = 0; + pass = io_base = ctl_base = is_mmio = 0; tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; tuple.Attributes = 0; CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple)); @@ -263,6 +276,33 @@ static int ide_config(struct pcmcia_devi break; } + if ((cfg->mem.nwin > 0) || (stk->dflt.mem.nwin > 0)) { + win_req_t req; + memreq_t map; + cistpl_mem_t *mem = (cfg->mem.nwin) ? &cfg->mem : &stk->dflt.mem; + + if (mem->win[0].len < 16) + goto next_entry; + + req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM; + req.Attributes |= WIN_ENABLE; + req.Base = mem->win[0].host_addr; + req.Size = 0; /* 0 means autodetect */ + + req.AccessSpeed = 0; + if (pcmcia_request_window(&link, &req, &link->win) != 0) + goto next_entry; + map.Page = 0; map.CardOffset = mem->win[0].card_addr; + if (pcmcia_map_mem_page(link->win, &map) != 0) + goto next_entry; + + io_base = (unsigned long) ioremap(req.Base, req.Size); + ctl_base = io_base + 0x0e; + is_mmio = 1; + + break; + } + next_entry: if (cfg->flags & CISTPL_CFTABLE_DEFAULT) memcpy(&stk->dflt, cfg, sizeof(stk->dflt)); @@ -277,22 +317,22 @@ static int ide_config(struct pcmcia_devi CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
/* disable drive interrupts during IDE probe */ - outb(0x02, ctl_base); + iowrite8(0x02, ctl_base); /* special setup for KXLC005 card */ if (is_kme) - outb(0x81, ctl_base+1); + iowrite8(0x81, ctl_base+1); /* retry registration in case device is still spinning up */ for (hd = -1, i = 0; i < 10; i++) { - hd = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, link); + hd = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, link, is_mmio); if (hd >= 0) break; if (link->io.NumPorts1 == 0x20) { - outb(0x02, ctl_base + 0x10); + iowrite8(0x02, ctl_base + 0x10); hd = idecs_register(io_base + 0x10, ctl_base + 0x10, - link->irq.AssignedIRQ, link); + link->irq.AssignedIRQ, link, is_mmio); if (hd >= 0) { io_base += 0x10; ctl_base += 0x10; | |