Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 89278
b: refs/heads/master
c: 350756f
h: refs/heads/master
v: v3
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Apr 17, 2008
1 parent 60db8f4 commit 42454b5
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 45 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 182d7bbac322d6921ce81f8e6aa23d250816381d
refs/heads/master: 350756f6dab6d37ef9ed3f18dec520e88969ddac
15 changes: 5 additions & 10 deletions trunk/drivers/ata/ahci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,7 @@ static void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag,

static int ahci_kick_engine(struct ata_port *ap, int force_restart)
{
void __iomem *port_mmio = ap->ioaddr.cmd_addr;
void __iomem *port_mmio = ahci_port_base(ap);
struct ahci_host_priv *hpriv = ap->host->private_data;
u8 status = readl(port_mmio + PORT_TFDATA) & 0xFF;
u32 tmp;
Expand Down Expand Up @@ -1255,8 +1255,8 @@ static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,

static int ahci_check_ready(struct ata_link *link)
{
void __iomem *mmio = link->ap->ioaddr.cmd_addr;
u8 status = readl(mmio + PORT_TFDATA) & 0xFF;
void __iomem *port_mmio = ahci_port_base(link->ap);
u8 status = readl(port_mmio + PORT_TFDATA) & 0xFF;

if (!(status & ATA_BUSY))
return 1;
Expand Down Expand Up @@ -1616,7 +1616,7 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat)

static void ahci_port_intr(struct ata_port *ap)
{
void __iomem *port_mmio = ap->ioaddr.cmd_addr;
void __iomem *port_mmio = ahci_port_base(ap);
struct ata_eh_info *ehi = &ap->link.eh_info;
struct ahci_port_priv *pp = ap->private_data;
struct ahci_host_priv *hpriv = ap->host->private_data;
Expand Down Expand Up @@ -2210,7 +2210,6 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

for (i = 0; i < host->n_ports; i++) {
struct ata_port *ap = host->ports[i];
void __iomem *port_mmio = ahci_port_base(ap);

ata_port_pbar_desc(ap, AHCI_PCI_BAR, -1, "abar");
ata_port_pbar_desc(ap, AHCI_PCI_BAR,
Expand All @@ -2219,12 +2218,8 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
/* set initial link pm policy */
ap->pm_policy = NOT_AVAILABLE;

/* standard SATA port setup */
if (hpriv->port_map & (1 << i))
ap->ioaddr.cmd_addr = port_mmio;

/* disabled/not-implemented port */
else
if (!(hpriv->port_map & (1 << i)))
ap->ops = &ata_dummy_port_ops;
}

Expand Down
5 changes: 0 additions & 5 deletions trunk/drivers/ata/sata_fsl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1222,11 +1222,6 @@ static int sata_fsl_probe(struct of_device *ofdev,
/* host->iomap is not used currently */
host->private_data = host_priv;

/* setup port(s) */

host->ports[0]->ioaddr.cmd_addr = host_priv->hcr_base;
host->ports[0]->ioaddr.scr_addr = host_priv->ssr_base;

/* initialize host controller */
sata_fsl_init_controller(host);

Expand Down
60 changes: 31 additions & 29 deletions trunk/drivers/ata/sata_sil24.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,9 +467,19 @@ static int sil24_tag(int tag)
return tag;
}

static unsigned long sil24_port_offset(struct ata_port *ap)
{
return ap->port_no * PORT_REGS_SIZE;
}

static void __iomem *sil24_port_base(struct ata_port *ap)
{
return ap->host->iomap[SIL24_PORT_BAR] + sil24_port_offset(ap);
}

static void sil24_dev_config(struct ata_device *dev)
{
void __iomem *port = dev->link->ap->ioaddr.cmd_addr;
void __iomem *port = sil24_port_base(dev->link->ap);

if (dev->cdb_len == 16)
writel(PORT_CS_CDB16, port + PORT_CTRL_STAT);
Expand All @@ -479,7 +489,7 @@ static void sil24_dev_config(struct ata_device *dev)

static void sil24_read_tf(struct ata_port *ap, int tag, struct ata_taskfile *tf)
{
void __iomem *port = ap->ioaddr.cmd_addr;
void __iomem *port = sil24_port_base(ap);
struct sil24_prb __iomem *prb;
u8 fis[6 * 4];

Expand All @@ -497,7 +507,7 @@ static int sil24_scr_map[] = {

static int sil24_scr_read(struct ata_port *ap, unsigned sc_reg, u32 *val)
{
void __iomem *scr_addr = ap->ioaddr.scr_addr;
void __iomem *scr_addr = sil24_port_base(ap) + PORT_SCONTROL;

if (sc_reg < ARRAY_SIZE(sil24_scr_map)) {
void __iomem *addr;
Expand All @@ -510,7 +520,7 @@ static int sil24_scr_read(struct ata_port *ap, unsigned sc_reg, u32 *val)

static int sil24_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val)
{
void __iomem *scr_addr = ap->ioaddr.scr_addr;
void __iomem *scr_addr = sil24_port_base(ap) + PORT_SCONTROL;

if (sc_reg < ARRAY_SIZE(sil24_scr_map)) {
void __iomem *addr;
Expand All @@ -523,7 +533,7 @@ static int sil24_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val)

static void sil24_config_port(struct ata_port *ap)
{
void __iomem *port = ap->ioaddr.cmd_addr;
void __iomem *port = sil24_port_base(ap);

/* configure IRQ WoC */
if (ap->flags & SIL24_FLAG_PCIX_IRQ_WOC)
Expand All @@ -548,7 +558,7 @@ static void sil24_config_port(struct ata_port *ap)

static void sil24_config_pmp(struct ata_port *ap, int attached)
{
void __iomem *port = ap->ioaddr.cmd_addr;
void __iomem *port = sil24_port_base(ap);

if (attached)
writel(PORT_CS_PMP_EN, port + PORT_CTRL_STAT);
Expand All @@ -558,7 +568,7 @@ static void sil24_config_pmp(struct ata_port *ap, int attached)

static void sil24_clear_pmp(struct ata_port *ap)
{
void __iomem *port = ap->ioaddr.cmd_addr;
void __iomem *port = sil24_port_base(ap);
int i;

writel(PORT_CS_PMP_RESUME, port + PORT_CTRL_CLR);
Expand All @@ -573,7 +583,7 @@ static void sil24_clear_pmp(struct ata_port *ap)

static int sil24_init_port(struct ata_port *ap)
{
void __iomem *port = ap->ioaddr.cmd_addr;
void __iomem *port = sil24_port_base(ap);
struct sil24_port_priv *pp = ap->private_data;
u32 tmp;

Expand Down Expand Up @@ -601,7 +611,7 @@ static int sil24_exec_polled_cmd(struct ata_port *ap, int pmp,
int is_cmd, u32 ctrl,
unsigned long timeout_msec)
{
void __iomem *port = ap->ioaddr.cmd_addr;
void __iomem *port = sil24_port_base(ap);
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;
Expand Down Expand Up @@ -706,7 +716,7 @@ static int sil24_hardreset(struct ata_link *link, unsigned int *class,
unsigned long deadline)
{
struct ata_port *ap = link->ap;
void __iomem *port = ap->ioaddr.cmd_addr;
void __iomem *port = sil24_port_base(ap);
struct sil24_port_priv *pp = ap->private_data;
int did_port_rst = 0;
const char *reason;
Expand Down Expand Up @@ -884,7 +894,7 @@ static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc)
{
struct ata_port *ap = qc->ap;
struct sil24_port_priv *pp = ap->private_data;
void __iomem *port = ap->ioaddr.cmd_addr;
void __iomem *port = sil24_port_base(ap);
unsigned int tag = sil24_tag(qc->tag);
dma_addr_t paddr;
void __iomem *activate;
Expand Down Expand Up @@ -939,7 +949,7 @@ static int sil24_pmp_hardreset(struct ata_link *link, unsigned int *class,

static void sil24_freeze(struct ata_port *ap)
{
void __iomem *port = ap->ioaddr.cmd_addr;
void __iomem *port = sil24_port_base(ap);

/* Port-wide IRQ mask in HOST_CTRL doesn't really work, clear
* PORT_IRQ_ENABLE instead.
Expand All @@ -949,7 +959,7 @@ static void sil24_freeze(struct ata_port *ap)

static void sil24_thaw(struct ata_port *ap)
{
void __iomem *port = ap->ioaddr.cmd_addr;
void __iomem *port = sil24_port_base(ap);
u32 tmp;

/* clear IRQ */
Expand All @@ -962,7 +972,7 @@ static void sil24_thaw(struct ata_port *ap)

static void sil24_error_intr(struct ata_port *ap)
{
void __iomem *port = ap->ioaddr.cmd_addr;
void __iomem *port = sil24_port_base(ap);
struct sil24_port_priv *pp = ap->private_data;
struct ata_queued_cmd *qc = NULL;
struct ata_link *link;
Expand Down Expand Up @@ -1089,7 +1099,7 @@ static void sil24_error_intr(struct ata_port *ap)

static inline void sil24_host_intr(struct ata_port *ap)
{
void __iomem *port = ap->ioaddr.cmd_addr;
void __iomem *port = sil24_port_base(ap);
u32 slot_stat, qc_active;
int rc;

Expand Down Expand Up @@ -1209,6 +1219,9 @@ static int sil24_port_start(struct ata_port *ap)

ap->private_data = pp;

ata_port_pbar_desc(ap, SIL24_HOST_BAR, -1, "host");
ata_port_pbar_desc(ap, SIL24_PORT_BAR, sil24_port_offset(ap), "port");

return 0;
}

Expand All @@ -1227,7 +1240,8 @@ static void sil24_init_controller(struct ata_host *host)
/* init ports */
for (i = 0; i < host->n_ports; i++) {
struct ata_port *ap = host->ports[i];
void __iomem *port = ap->ioaddr.cmd_addr;
void __iomem *port = sil24_port_base(ap);


/* Initial PHY setting */
writel(0x20c, port + PORT_PHY_CFG);
Expand Down Expand Up @@ -1260,7 +1274,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct ata_port_info *ppi[] = { &pi, NULL };
void __iomem * const *iomap;
struct ata_host *host;
int i, rc;
int rc;
u32 tmp;

/* cause link error if sil24_cmd_block is sized wrongly */
Expand Down Expand Up @@ -1300,18 +1314,6 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
return -ENOMEM;
host->iomap = iomap;

for (i = 0; i < host->n_ports; i++) {
struct ata_port *ap = host->ports[i];
size_t offset = ap->port_no * PORT_REGS_SIZE;
void __iomem *port = iomap[SIL24_PORT_BAR] + offset;

host->ports[i]->ioaddr.cmd_addr = port;
host->ports[i]->ioaddr.scr_addr = port + PORT_SCONTROL;

ata_port_pbar_desc(ap, SIL24_HOST_BAR, -1, "host");
ata_port_pbar_desc(ap, SIL24_PORT_BAR, offset, "port");
}

/* configure and activate the device */
if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
Expand Down

0 comments on commit 42454b5

Please sign in to comment.