libata iomap usage
PATCH 1/1 libata iomap usage
In case anybody is interested, here is the work-in-progress patch that enables usage of the ioread/iowrite functions from lib/iomap. This kills a -ton- of duplicate code from libata, illustrating why I requested this interface so long ago.
It is a WIP because this patch covers the EASY part: coverting the libata routines to use ioread/iowrite, and killing all those nasty warnings in every build (top libata complaint).
The HARD part is building the infrastructure that maps the various PCI BARs and ioports required for each low-level driver. grep for 'ioport_map_regions' and 'pci_map_bars' the beginning of this work. We have to do iomap and request region for the following combinations:
1) 1 mmio region in a PCI BAR (easy; done in current upstream)
2) 5-6 ioports in PCI BARs
3) 4 legacy ioports, 1 PCI BAR
4) a mixture of #2 and #3, depending on runtime config
5) #4, with the added complication of PCI quirks reserving regions for us, requiring the ugly ____request_resource() hack
At various points in time, Linus, Al Viro and myself have all done the easy part, and motivation disappeared before attempting the hard part. :)
This time I've gotten a little farther, let's see how long I last...
drivers/scsi/ahci.c | 15 - drivers/scsi/libata-bmdma.c | 293 +++------------------------ drivers/scsi/libata-core.c | 467 +++++++++++++++----------------------------- drivers/scsi/pdc_adma.c | 4 drivers/scsi/sata_mv.c | 13 - drivers/scsi/sata_nv.c | 67 +----- drivers/scsi/sata_promise.c | 40 +-- drivers/scsi/sata_qstor.c | 9 drivers/scsi/sata_sil.c | 19 - drivers/scsi/sata_sil24.c | 25 +- drivers/scsi/sata_sis.c | 8 drivers/scsi/sata_svw.c | 6 drivers/scsi/sata_sx4.c | 16 - drivers/scsi/sata_via.c | 8 drivers/scsi/sata_vsc.c | 17 - include/linux/libata.h | 56 ++--- 16 files changed, 318 insertions(+), 745 deletions(-)
drivers/scsi/ahci.c +5 -10
@@ -305,16 +305,12 @@ static struct pci_driver ahci_pci_driver }; -static inline unsigned long ahci_port_base_ul (unsigned long base,unsigned int port) +static inline void __iomem *ahci_port_base (void __iomem *base, +unsigned int port) {return base +0x100 + (port *0x80 ); } -static inline void __iomem *ahci_port_base (void __iomem *base,unsigned int port) -{ -return (void __iomem *)ahci_port_base_ul ((unsigned long )base, port); -} -static int ahci_port_start (struct ata_port *ap) {struct device *dev = ap->host_set->dev;
@@ -823,11 +819,11 @@ static unsigned int ahci_qc_issue(structreturn 0 ; } -static void ahci_setup_port (struct ata_ioports *port,unsigned long base, +static void ahci_setup_port (struct ata_ioports *port,void __iomem *base,unsigned int port_idx) {VPRINTK ("ENTER, base==0x%lx, port_idx %u\n" , base, port_idx); - base =ahci_port_base_ul (base, port_idx); + base =ahci_port_base (base, port_idx);VPRINTK ("base now==0x%lx\n" , base); port->cmd_addr = base;
@@ -926,8 +922,7 @@ static int ahci_host_init(struct ata_pro port_mmio =ahci_port_base (mmio, i);VPRINTK ("mmio %p port_mmio %p\n" , mmio, port_mmio); -ahci_setup_port (&probe_ent->port[i], - (unsigned long ) mmio, i); +ahci_setup_port (&probe_ent->port[i], mmio, i);/* make sure port is not active */ tmp =readl (port_mmio +PORT_CMD );
drivers/scsi/libata-bmdma.c +33 -260
382 lines not on this page · raw message
drivers/scsi/libata-core.c +163 -304
640 lines not on this page · raw message
drivers/scsi/pdc_adma.c +2 -2
@@ -524,7 +524,7 @@ static irqreturn_t adma_intr(int irq, voreturn IRQ_RETVAL (handled); } -static void adma_ata_setup_port (struct ata_ioports *port,unsigned long base) +static void adma_ata_setup_port (struct ata_ioports *port,void __iomem *base) { port->cmd_addr = port->data_addr = base +0x000 ;
@@ -696,7 +696,7 @@ static int adma_ata_init_one(struct pci_for (port_no =0 ; port_no < probe_ent->n_ports; ++port_no) {adma_ata_setup_port (&probe_ent->port[port_no], -ADMA_ATA_REGS ((unsigned long )mmio_base, port_no)); +ADMA_ATA_REGS (mmio_base, port_no)); }pci_set_master (pdev);
drivers/scsi/sata_mv.c +6 -7
@@ -1383,8 +1383,7 @@ static void mv_host_intr(struct ata_host }else if ((DEV_IRQ << hard_port) & hc_irq_cause) {/* received ATA IRQ; read the status reg to clear INTRQ */ - ata_status =readb ((void __iomem *) - ap->ioaddr.status_addr); + ata_status =readb (ap->ioaddr.status_addr); handled++; }
@@ -1977,10 +1976,10 @@ comreset_retry:break ; } - tf.lbah =readb ((void __iomem *) ap->ioaddr.lbah_addr); - tf.lbam =readb ((void __iomem *) ap->ioaddr.lbam_addr); - tf.lbal =readb ((void __iomem *) ap->ioaddr.lbal_addr); - tf.nsect =readb ((void __iomem *) ap->ioaddr.nsect_addr); + tf.lbah =readb (ap->ioaddr.lbah_addr); + tf.lbam =readb (ap->ioaddr.lbam_addr); + tf.lbal =readb (ap->ioaddr.lbal_addr); + tf.nsect =readb (ap->ioaddr.nsect_addr); dev->class =ata_dev_classify (&tf);if (!ata_dev_present (dev)) {
@@ -2045,7 +2044,7 @@ static void mv_eng_timeout(struct ata_po*/ static void mv_port_init (struct ata_ioports *port,void __iomem *port_mmio) { -unsigned long shd_base = (unsigned long ) port_mmio +SHD_BLK_OFS ; +void __iomem *shd_base = port_mmio +SHD_BLK_OFS ;unsigned serr_ofs;/* PIO related setup
drivers/scsi/sata_nv.c +19 -48
136 lines not on this page · raw message
drivers/scsi/sata_promise.c +19 -21
@@ -339,7 +339,7 @@ static void pdc_host_stop(struct ata_hosstatic void pdc_reset_port (struct ata_port *ap) { -void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr +PDC_CTLSTAT ; +void __iomem *mmio = ap->ioaddr.cmd_addr +PDC_CTLSTAT ;unsigned int i;u32 tmp;
@@ -380,7 +380,7 @@ static u32 pdc_sata_scr_read (struct ata {if (sc_reg >SCR_CONTROL )return 0xffffffffU ; -return readl ((void __iomem *) ap->ioaddr.scr_addr + (sc_reg *4 )); +return readl (ap->ioaddr.scr_addr + (sc_reg *4 )); }
@@ -389,7 +389,7 @@ static void pdc_sata_scr_write (struct a {if (sc_reg >SCR_CONTROL )return ; -writel (val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg *4 )); +writel (val, ap->ioaddr.scr_addr + (sc_reg *4 )); }static void pdc_qc_prep (struct ata_queued_cmd *qc)
@@ -462,7 +462,7 @@ static inline unsigned int pdc_host_intr {unsigned int handled =0 ;u32 tmp; -void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr +PDC_GLOBAL_CTL ; +void __iomem *mmio = ap->ioaddr.cmd_addr +PDC_GLOBAL_CTL ; tmp =readl (mmio);if (tmp &PDC_ERR_MASK ) {
@@ -565,8 +565,8 @@ static inline void pdc_packet_start(stru pp->pkt[2 ] = seq;wmb ();/* flush PRD, pkt writes */ -writel (pp->pkt_dma, (void __iomem *) ap->ioaddr.cmd_addr +PDC_PKT_SUBMIT ); -readl ((void __iomem *) ap->ioaddr.cmd_addr +PDC_PKT_SUBMIT );/* flush */ +writel (pp->pkt_dma, ap->ioaddr.cmd_addr +PDC_PKT_SUBMIT ); +readl (ap->ioaddr.cmd_addr +PDC_PKT_SUBMIT );/* flush */ }static unsigned int pdc_qc_issue_prot (struct ata_queued_cmd *qc)
@@ -604,7 +604,7 @@ static void pdc_exec_command_mmio(struct } -static void pdc_ata_setup_port (struct ata_ioports *port,unsigned long base) +static void pdc_ata_setup_port (struct ata_ioports *port,void __iomem *base) { port->cmd_addr = base; port->data_addr = base;
@@ -669,7 +669,6 @@ static int pdc_ata_init_one (struct pci_static int printed_version;struct ata_probe_ent *probe_ent =NULL ;struct pdc_host_priv *hp; -unsigned long base;void __iomem *mmio_base;unsigned int board_idx = (unsigned int ) ent->driver_data;int pci_dev_busy =0 ;
@@ -713,7 +712,6 @@ static int pdc_ata_init_one (struct pci_ rc = -ENOMEM ; goto err_out_free_ent; } - base = (unsigned long ) mmio_base; hp =kzalloc (sizeof (*hp),GFP_KERNEL );if (hp ==NULL ) {
@@ -736,11 +734,11 @@ static int pdc_ata_init_one (struct pci_ probe_ent->irq_flags =SA_SHIRQ ; probe_ent->mmio_base = mmio_base; -pdc_ata_setup_port (&probe_ent->port[0 ], base +0x200 ); -pdc_ata_setup_port (&probe_ent->port[1 ], base +0x280 ); +pdc_ata_setup_port (&probe_ent->port[0 ], mmio_base +0x200 ); +pdc_ata_setup_port (&probe_ent->port[1 ], mmio_base +0x280 ); - probe_ent->port[0 ].scr_addr = base +0x400 ; - probe_ent->port[1 ].scr_addr = base +0x500 ; + probe_ent->port[0 ].scr_addr = mmio_base +0x400 ; + probe_ent->port[1 ].scr_addr = mmio_base +0x500 ;/* notice 4-port boards */ switch (board_idx) {
@@ -751,11 +749,11 @@ static int pdc_ata_init_one (struct pci_case board_20319: probe_ent->n_ports =4 ; -pdc_ata_setup_port (&probe_ent->port[2 ], base +0x300 ); -pdc_ata_setup_port (&probe_ent->port[3 ], base +0x380 ); +pdc_ata_setup_port (&probe_ent->port[2 ], mmio_base +0x300 ); +pdc_ata_setup_port (&probe_ent->port[3 ], mmio_base +0x380 ); - probe_ent->port[2 ].scr_addr = base +0x600 ; - probe_ent->port[3 ].scr_addr = base +0x700 ; + probe_ent->port[2 ].scr_addr = mmio_base +0x600 ; + probe_ent->port[3 ].scr_addr = mmio_base +0x700 ;break ;case board_2057x:/* Override hotplug offset for SATAII150 */
@@ -770,11 +768,11 @@ static int pdc_ata_init_one (struct pci_case board_20619: probe_ent->n_ports =4 ; -pdc_ata_setup_port (&probe_ent->port[2 ], base +0x300 ); -pdc_ata_setup_port (&probe_ent->port[3 ], base +0x380 ); +pdc_ata_setup_port (&probe_ent->port[2 ], mmio_base +0x300 ); +pdc_ata_setup_port (&probe_ent->port[3 ], mmio_base +0x380 ); - probe_ent->port[2 ].scr_addr = base +0x600 ; - probe_ent->port[3 ].scr_addr = base +0x700 ; + probe_ent->port[2 ].scr_addr = mmio_base +0x600 ; + probe_ent->port[3 ].scr_addr = mmio_base +0x700 ;break ;default :BUG ();
drivers/scsi/sata_qstor.c +4 -5
@@ -258,14 +258,14 @@ static u32 qs_scr_read (struct ata_port {if (sc_reg >SCR_CONTROL )return ~0U ; -return readl ((void __iomem *)(ap->ioaddr.scr_addr + (sc_reg *8 ))); +return readl (ap->ioaddr.scr_addr + (sc_reg *8 )); }static void qs_scr_write (struct ata_port *ap,unsigned int sc_reg,u32 val) {if (sc_reg >SCR_CONTROL )return ; -writel (val, (void __iomem *)(ap->ioaddr.scr_addr + (sc_reg *8 ))); +writel (val, ap->ioaddr.scr_addr + (sc_reg *8 )); }static unsigned int qs_fill_sg (struct ata_queued_cmd *qc)
@@ -472,7 +472,7 @@ static irqreturn_t qs_intr(int irq, voidreturn IRQ_RETVAL (handled); } -static void qs_ata_setup_port (struct ata_ioports *port,unsigned long base) +static void qs_ata_setup_port (struct ata_ioports *port,void __iomem *base) { port->cmd_addr = port->data_addr = base +0x400 ;
@@ -686,8 +686,7 @@ static int qs_ata_init_one(struct pci_de probe_ent->n_ports =QS_PORTS ;for (port_no =0 ; port_no < probe_ent->n_ports; ++port_no) { -unsigned long chan = (unsigned long )mmio_base + - (port_no *0x4000 ); +void __iomem *chan = mmio_base + (port_no *0x4000 );qs_ata_setup_port (&probe_ent->port[port_no], chan); }
drivers/scsi/sata_sil.c +8 -11
@@ -287,9 +287,9 @@ static void sil_post_set_mode (struct atreadl (addr);/* flush */ } -static inline unsigned long sil_scr_addr (struct ata_port *ap,unsigned int sc_reg) +static inline void __iomem *sil_scr_addr (struct ata_port *ap,unsigned int sc_reg) { -unsigned long offset = ap->ioaddr.scr_addr; +void __iomem *offset = ap->ioaddr.scr_addr;switch (sc_reg) {case SCR_STATUS :
@@ -308,7 +308,7 @@ static inline unsigned long sil_scr_addrstatic u32 sil_scr_read (struct ata_port *ap,unsigned int sc_reg) { -void __iomem *mmio = (void __iomem *)sil_scr_addr (ap, sc_reg); +void __iomem *mmio =sil_scr_addr (ap, sc_reg);if (mmio)return readl (mmio);return 0xffffffffU ;
@@ -316,7 +316,7 @@ static u32 sil_scr_read (struct ata_portstatic void sil_scr_write (struct ata_port *ap,unsigned int sc_reg,u32 val) { -void *mmio = (void __iomem *)sil_scr_addr (ap, sc_reg); +void __iomem *mmio =sil_scr_addr (ap, sc_reg);if (mmio)writel (val, mmio); }
@@ -386,7 +386,6 @@ static int sil_init_one (struct pci_dev {static int printed_version;struct ata_probe_ent *probe_ent =NULL ; -unsigned long base;void __iomem *mmio_base;int rc;unsigned int i;
@@ -445,14 +444,12 @@ static int sil_init_one (struct pci_dev probe_ent->mmio_base = mmio_base; - base = (unsigned long ) mmio_base; -for (i =0 ; i < probe_ent->n_ports; i++) { - probe_ent->port[i].cmd_addr = base + sil_port[i].tf; + probe_ent->port[i].cmd_addr = mmio_base + sil_port[i].tf; probe_ent->port[i].altstatus_addr = - probe_ent->port[i].ctl_addr = base + sil_port[i].ctl; - probe_ent->port[i].bmdma_addr = base + sil_port[i].bmdma; - probe_ent->port[i].scr_addr = base + sil_port[i].scr; + probe_ent->port[i].ctl_addr = mmio_base + sil_port[i].ctl; + probe_ent->port[i].bmdma_addr = mmio_base + sil_port[i].bmdma; + probe_ent->port[i].scr_addr = mmio_base + sil_port[i].scr;ata_std_ports (&probe_ent->port[i]); }
drivers/scsi/sata_sil24.c +12 -13
@@ -369,7 +369,7 @@ static struct ata_port_info sil24_port_istatic void sil24_dev_config (struct ata_port *ap,struct ata_device *dev) { -void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr; +void __iomem *port = ap->ioaddr.cmd_addr;if (dev->cdb_len ==16 )writel (PORT_CS_CDB16 , port +PORT_CTRL_STAT );
@@ -380,7 +380,7 @@ static void sil24_dev_config(struct ata_static inline void sil24_update_tf (struct ata_port *ap) {struct sil24_port_priv *pp = ap->private_data; -void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr; +void __iomem *port = ap->ioaddr.cmd_addr;struct sil24_prb __iomem *prb = port;u8 fis[6 *4 ];
@@ -403,7 +403,7 @@ static int sil24_scr_map[] = {static u32 sil24_scr_read (struct ata_port *ap,unsigned sc_reg) { -void __iomem *scr_addr = (void __iomem *)ap->ioaddr.scr_addr; +void __iomem *scr_addr = ap->ioaddr.scr_addr;if (sc_reg <ARRAY_SIZE (sil24_scr_map)) {void __iomem *addr; addr = scr_addr + sil24_scr_map[sc_reg] *4 ;
@@ -414,7 +414,7 @@ static u32 sil24_scr_read(struct ata_porstatic void sil24_scr_write (struct ata_port *ap,unsigned sc_reg,u32 val) { -void __iomem *scr_addr = (void __iomem *)ap->ioaddr.scr_addr; +void __iomem *scr_addr = ap->ioaddr.scr_addr;if (sc_reg <ARRAY_SIZE (sil24_scr_map)) {void __iomem *addr; addr = scr_addr + sil24_scr_map[sc_reg] *4 ;
@@ -431,7 +431,7 @@ static void sil24_tf_read(struct ata_porstatic int sil24_softreset (struct ata_port *ap,int verbose,unsigned int *class) { -void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr; +void __iomem *port = ap->ioaddr.cmd_addr;struct sil24_port_priv *pp = ap->private_data;struct sil24_prb *prb = &pp->cmd_block[0 ].ata.prb;dma_addr_t paddr = pp->cmd_block_dma;
@@ -570,7 +570,7 @@ static void sil24_qc_prep(struct ata_questatic unsigned int sil24_qc_issue (struct ata_queued_cmd *qc) {struct ata_port *ap = qc->ap; -void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr; +void __iomem *port = ap->ioaddr.cmd_addr;struct sil24_port_priv *pp = ap->private_data;dma_addr_t paddr = pp->cmd_block_dma + qc->tag *sizeof (*pp->cmd_block);
@@ -603,7 +603,7 @@ static int __sil24_restart_controller(vostatic void sil24_restart_controller (struct ata_port *ap) { -if (__sil24_restart_controller ((void __iomem *)ap->ioaddr.cmd_addr)) +if (__sil24_restart_controller (ap->ioaddr.cmd_addr)) printk(KERN_ERR DRV_NAME" ata%u: failed to restart controller\n" , ap->id); }
@@ -638,7 +638,7 @@ static void sil24_reset_controller(struc { printk(KERN_NOTICE DRV_NAME " ata%u: resetting controller...\n", ap->id); -if (__sil24_reset_controller ((void __iomem *)ap->ioaddr.cmd_addr)) +if (__sil24_reset_controller (ap->ioaddr.cmd_addr)) printk(KERN_ERR DRV_NAME" ata%u: failed to reset controller\n" , ap->id); }
@@ -660,7 +660,7 @@ static void sil24_error_intr(struct ata_ {struct ata_queued_cmd *qc =ata_qc_from_tag (ap, ap->active_tag);struct sil24_port_priv *pp = ap->private_data; -void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr; +void __iomem *port = ap->ioaddr.cmd_addr;u32 irq_stat, cmd_err, sstatus, serror;unsigned int err_mask;
@@ -717,7 +717,7 @@ static void sil24_error_intr(struct ata_static inline void sil24_host_intr (struct ata_port *ap) {struct ata_queued_cmd *qc =ata_qc_from_tag (ap, ap->active_tag); -void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr; +void __iomem *port = ap->ioaddr.cmd_addr;u32 slot_stat; slot_stat =readl (port +PORT_SLOT_STAT );
@@ -934,12 +934,11 @@ static int sil24_init_one(struct pci_devfor (i =0 ; i < probe_ent->n_ports; i++) {void __iomem *port = port_base + i *PORT_REGS_SIZE ; -unsigned long portu = (unsigned long )port;u32 tmp;int cnt; - probe_ent->port[i].cmd_addr = portu +PORT_PRB ; - probe_ent->port[i].scr_addr = portu +PORT_SCONTROL ; + probe_ent->port[i].cmd_addr = port +PORT_PRB ; + probe_ent->port[i].scr_addr = port +PORT_SCONTROL ;ata_std_ports (&probe_ent->port[i]);
drivers/scsi/sata_sis.c +4 -4
@@ -207,10 +207,10 @@ static u32 sis_scr_read (struct ata_portpci_read_config_byte (pdev,SIS_PMR , &pmr); - val =inl (ap->ioaddr.scr_addr + (sc_reg *4 )); + val =ioread32 (ap->ioaddr.scr_addr + (sc_reg *4 ));if ((pdev->device ==0x182 ) || (pmr &SIS_PMR_COMBINED )) - val2 =inl (ap->ioaddr.scr_addr + (sc_reg *4 ) +0x10 ); + val2 =ioread32 (ap->ioaddr.scr_addr + (sc_reg *4 ) +0x10 );return val | val2; }
@@ -228,9 +228,9 @@ static void sis_scr_write (struct ata_poif (ap->flags &SIS_FLAG_CFGSCR )sis_scr_cfg_write (ap, sc_reg, val);else { -outl (val, ap->ioaddr.scr_addr + (sc_reg *4 )); +iowrite32 (val, ap->ioaddr.scr_addr + (sc_reg *4 ));if ((pdev->device ==0x182 ) || (pmr &SIS_PMR_COMBINED )) -outl (val, ap->ioaddr.scr_addr + (sc_reg *4 )+0x10 ); +iowrite32 (val, ap->ioaddr.scr_addr + (sc_reg *4 )+0x10 ); } }
drivers/scsi/sata_svw.c +2 -4
@@ -330,7 +330,7 @@ static const struct ata_port_operations .host_stop = ata_pci_host_stop, }; -static void k2_sata_setup_port (struct ata_ioports *port,unsigned long base) +static void k2_sata_setup_port (struct ata_ioports *port,void __iomem *base) { port->cmd_addr = base +K2_SATA_TF_CMD_OFFSET ; port->data_addr = base +K2_SATA_TF_DATA_OFFSET ;
@@ -354,7 +354,6 @@ static int k2_sata_init_one (struct pci_ {static int printed_version;struct ata_probe_ent *probe_ent =NULL ; -unsigned long base;void __iomem *mmio_base;int pci_dev_busy =0 ;int rc;
@@ -406,7 +405,6 @@ static int k2_sata_init_one (struct pci_ rc = -ENOMEM ; goto err_out_free_ent; } - base = (unsigned long ) mmio_base;/* Clear a magic bit in SCR1 according to Darwin, those help * some funky seagate drives (though so far, those were already
@@ -439,7 +437,7 @@ static int k2_sata_init_one (struct pci_/* All ports are on the same function. Multi-function device is no * longer available. This should not be seen in any system. */ for (i =0 ; i < ent->driver_data; i++) -k2_sata_setup_port (&probe_ent->port[i], base + i *K2_SATA_PORT_OFFSET ); +k2_sata_setup_port (&probe_ent->port[i], mmio_base + i *K2_SATA_PORT_OFFSET );pci_set_master (pdev);
drivers/scsi/sata_sx4.c +7 -9
@@ -669,8 +669,8 @@ static void pdc20621_packet_start(structreadl (mmio +PDC_20621_SEQCTL + (seq *4 ));/* flush */ writel (port_ofs +PDC_DIMM_ATA_PKT , - (void __iomem *) ap->ioaddr.cmd_addr +PDC_PKT_SUBMIT ); -readl ((void __iomem *) ap->ioaddr.cmd_addr +PDC_PKT_SUBMIT ); + ap->ioaddr.cmd_addr +PDC_PKT_SUBMIT ); +readl (ap->ioaddr.cmd_addr +PDC_PKT_SUBMIT ); VPRINTK("submitted ofs 0x%x (%u), seq %u\n", port_ofs + PDC_DIMM_ATA_PKT, port_ofs + PDC_DIMM_ATA_PKT,
@@ -748,8 +748,8 @@ static inline unsigned int pdc20621_hostwritel (0x00000001 , mmio +PDC_20621_SEQCTL + (seq *4 ));readl (mmio +PDC_20621_SEQCTL + (seq *4 ));writel (port_ofs +PDC_DIMM_ATA_PKT , - (void __iomem *) ap->ioaddr.cmd_addr +PDC_PKT_SUBMIT ); -readl ((void __iomem *) ap->ioaddr.cmd_addr +PDC_PKT_SUBMIT ); + ap->ioaddr.cmd_addr +PDC_PKT_SUBMIT ); +readl (ap->ioaddr.cmd_addr +PDC_PKT_SUBMIT ); }/* step two - execute ATA command */
@@ -905,7 +905,7 @@ static void pdc_exec_command_mmio(struct } -static void pdc_sata_setup_port (struct ata_ioports *port,unsigned long base) +static void pdc_sata_setup_port (struct ata_ioports *port,void __iomem *base) { port->cmd_addr = base; port->data_addr = base;
@@ -1366,8 +1366,7 @@ static int pdc_sata_init_one (struct pci {static int printed_version;struct ata_probe_ent *probe_ent =NULL ; -unsigned long base; -void __iomem *mmio_base; +void __iomem *mmio_base, *base;void __iomem *dimm_mmio =NULL ;struct pdc_host_priv *hpriv =NULL ;unsigned int board_idx = (unsigned int ) ent->driver_data;
@@ -1408,12 +1407,11 @@ static int pdc_sata_init_one (struct pci probe_ent->dev =pci_dev_to_dev (pdev);INIT_LIST_HEAD (&probe_ent->node); - mmio_base =pci_iomap (pdev,3 ,0 ); + base = mmio_base =pci_iomap (pdev,3 ,0 );if (mmio_base ==NULL ) { rc = -ENOMEM ; goto err_out_free_ent; } - base = (unsigned long ) mmio_base; hpriv =kmalloc (sizeof (*hpriv),GFP_KERNEL );if (!hpriv) {
drivers/scsi/sata_via.c +4 -4
@@ -159,14 +159,14 @@ static u32 svia_scr_read (struct ata_por {if (sc_reg >SCR_CONTROL )return 0xffffffffU ; -return inl (ap->ioaddr.scr_addr + (4 * sc_reg)); +return ioread32 (ap->ioaddr.scr_addr + (4 * sc_reg)); }static void svia_scr_write (struct ata_port *ap,unsigned int sc_reg,u32 val) {if (sc_reg >SCR_CONTROL )return ; -outl (val, ap->ioaddr.scr_addr + (4 * sc_reg)); +iowrite32 (val, ap->ioaddr.scr_addr + (4 * sc_reg)); }static const unsigned int svia_bar_sizes[] = {
@@ -177,12 +177,12 @@ static const unsigned int vt6421_bar_siz 16, 16, 16, 16, 32, 128 }; -static unsigned long svia_scr_addr (unsigned long addr,unsigned int port) +static void __iomem *svia_scr_addr (void __iomem *addr,unsigned int port) {return addr + (port *128 ); } -static unsigned long vt6421_scr_addr (unsigned long addr,unsigned int port) +static void __iomem *vt6421_scr_addr (void __iomem *addr,unsigned int port) {return addr + (port *64 ); }
drivers/scsi/sata_vsc.c +8 -9
@@ -99,7 +99,7 @@ static u32 vsc_sata_scr_read (struct ata {if (sc_reg >SCR_CONTROL )return 0xffffffffU ; -return readl ((void __iomem *) ap->ioaddr.scr_addr + (sc_reg *4 )); +return readl (ap->ioaddr.scr_addr + (sc_reg *4 )); }
@@ -108,7 +108,7 @@ static void vsc_sata_scr_write (struct a {if (sc_reg >SCR_CONTROL )return ; -writel (val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg *4 )); +writel (val, ap->ioaddr.scr_addr + (sc_reg *4 )); }
@@ -290,7 +290,8 @@ static const struct ata_port_operations .host_stop = ata_pci_host_stop, }; -static void __devinit vsc_sata_setup_port (struct ata_ioports *port,unsigned long base) +static void __devinit vsc_sata_setup_port (struct ata_ioports *port, +void __iomem *base) { port->cmd_addr = base +VSC_SATA_TF_CMD_OFFSET ; port->data_addr = base +VSC_SATA_TF_DATA_OFFSET ;
@@ -316,7 +317,6 @@ static int __devinit vsc_sata_init_one ( {static int printed_version;struct ata_probe_ent *probe_ent =NULL ; -unsigned long base;int pci_dev_busy =0 ;void __iomem *mmio_base;int rc;
@@ -366,7 +366,6 @@ static int __devinit vsc_sata_init_one ( rc = -ENOMEM ; goto err_out_free_ent; } - base = (unsigned long ) mmio_base;/* * Due to a bug in the chip, the default cache line size can't be used
@@ -390,10 +389,10 @@ static int __devinit vsc_sata_init_one ( probe_ent->udma_mask =0x7f ;/* We have 4 ports per PCI function */ -vsc_sata_setup_port (&probe_ent->port[0 ], base +1 *VSC_SATA_PORT_OFFSET ); -vsc_sata_setup_port (&probe_ent->port[1 ], base +2 *VSC_SATA_PORT_OFFSET ); -vsc_sata_setup_port (&probe_ent->port[2 ], base +3 *VSC_SATA_PORT_OFFSET ); -vsc_sata_setup_port (&probe_ent->port[3 ], base +4 *VSC_SATA_PORT_OFFSET ); +vsc_sata_setup_port (&probe_ent->port[0 ], mmio_base +1 *VSC_SATA_PORT_OFFSET ); +vsc_sata_setup_port (&probe_ent->port[1 ], mmio_base +2 *VSC_SATA_PORT_OFFSET ); +vsc_sata_setup_port (&probe_ent->port[2 ], mmio_base +3 *VSC_SATA_PORT_OFFSET ); +vsc_sata_setup_port (&probe_ent->port[3 ], mmio_base +4 *VSC_SATA_PORT_OFFSET );pci_set_master (pdev);
include/linux/libata.h +22 -34
82 lines not on this page · raw message