[PATCH] sil24: replace pp->port w/ ap->ioaddr.cmd_addr
06_sil24_remove-pp-port.patch As ap->ioaddr.cmd_addr isn't used for PORT_TF anymore, replace pp->port w/ it as AHCI does. Signed-off-by: Tejun Heo <htejun@gmail.com> sata_sil24.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
parent
33d015b9f2
commit
4f50c3cbb4
|
@ -214,7 +214,6 @@ struct sil24_cmd_block {
|
||||||
* here from the previous interrupt.
|
* here from the previous interrupt.
|
||||||
*/
|
*/
|
||||||
struct sil24_port_priv {
|
struct sil24_port_priv {
|
||||||
void *port;
|
|
||||||
struct sil24_cmd_block *cmd_block; /* 32 cmd blocks */
|
struct sil24_cmd_block *cmd_block; /* 32 cmd blocks */
|
||||||
dma_addr_t cmd_block_dma; /* DMA base addr for them */
|
dma_addr_t cmd_block_dma; /* DMA base addr for them */
|
||||||
};
|
};
|
||||||
|
@ -414,10 +413,11 @@ static void sil24_qc_prep(struct ata_queued_cmd *qc)
|
||||||
static int sil24_qc_issue(struct ata_queued_cmd *qc)
|
static int sil24_qc_issue(struct ata_queued_cmd *qc)
|
||||||
{
|
{
|
||||||
struct ata_port *ap = qc->ap;
|
struct ata_port *ap = qc->ap;
|
||||||
|
void *port = (void *)ap->ioaddr.cmd_addr;
|
||||||
struct sil24_port_priv *pp = ap->private_data;
|
struct sil24_port_priv *pp = ap->private_data;
|
||||||
dma_addr_t paddr = pp->cmd_block_dma + qc->tag * sizeof(*pp->cmd_block);
|
dma_addr_t paddr = pp->cmd_block_dma + qc->tag * sizeof(*pp->cmd_block);
|
||||||
|
|
||||||
writel((u32)paddr, pp->port + PORT_CMD_ACTIVATE);
|
writel((u32)paddr, port + PORT_CMD_ACTIVATE);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -428,8 +428,7 @@ static void sil24_irq_clear(struct ata_port *ap)
|
||||||
|
|
||||||
static void sil24_reset_controller(struct ata_port *ap)
|
static void sil24_reset_controller(struct ata_port *ap)
|
||||||
{
|
{
|
||||||
struct sil24_port_priv *pp = ap->private_data;
|
void *port = (void *)ap->ioaddr.cmd_addr;
|
||||||
void *port = pp->port;
|
|
||||||
int cnt;
|
int cnt;
|
||||||
u32 tmp;
|
u32 tmp;
|
||||||
|
|
||||||
|
@ -480,8 +479,7 @@ static void sil24_eng_timeout(struct ata_port *ap)
|
||||||
static void sil24_error_intr(struct ata_port *ap, u32 slot_stat)
|
static void sil24_error_intr(struct ata_port *ap, u32 slot_stat)
|
||||||
{
|
{
|
||||||
struct ata_queued_cmd *qc = ata_qc_from_tag(ap, ap->active_tag);
|
struct ata_queued_cmd *qc = ata_qc_from_tag(ap, ap->active_tag);
|
||||||
struct sil24_port_priv *pp = ap->private_data;
|
void *port = (void *)ap->ioaddr.cmd_addr;
|
||||||
void *port = pp->port;
|
|
||||||
u32 irq_stat, cmd_err, sstatus, serror;
|
u32 irq_stat, cmd_err, sstatus, serror;
|
||||||
|
|
||||||
irq_stat = readl(port + PORT_IRQ_STAT);
|
irq_stat = readl(port + PORT_IRQ_STAT);
|
||||||
|
@ -509,8 +507,7 @@ static void sil24_error_intr(struct ata_port *ap, u32 slot_stat)
|
||||||
static inline void sil24_host_intr(struct ata_port *ap)
|
static inline void sil24_host_intr(struct ata_port *ap)
|
||||||
{
|
{
|
||||||
struct ata_queued_cmd *qc = ata_qc_from_tag(ap, ap->active_tag);
|
struct ata_queued_cmd *qc = ata_qc_from_tag(ap, ap->active_tag);
|
||||||
struct sil24_port_priv *pp = ap->private_data;
|
void *port = (void *)ap->ioaddr.cmd_addr;
|
||||||
void *port = pp->port;
|
|
||||||
u32 slot_stat;
|
u32 slot_stat;
|
||||||
|
|
||||||
slot_stat = readl(port + PORT_SLOT_STAT);
|
slot_stat = readl(port + PORT_SLOT_STAT);
|
||||||
|
@ -561,7 +558,6 @@ static irqreturn_t sil24_interrupt(int irq, void *dev_instance, struct pt_regs *
|
||||||
static int sil24_port_start(struct ata_port *ap)
|
static int sil24_port_start(struct ata_port *ap)
|
||||||
{
|
{
|
||||||
struct device *dev = ap->host_set->dev;
|
struct device *dev = ap->host_set->dev;
|
||||||
struct sil24_host_priv *hpriv = ap->host_set->private_data;
|
|
||||||
struct sil24_port_priv *pp;
|
struct sil24_port_priv *pp;
|
||||||
struct sil24_cmd_block *cb;
|
struct sil24_cmd_block *cb;
|
||||||
size_t cb_size = sizeof(*cb);
|
size_t cb_size = sizeof(*cb);
|
||||||
|
@ -579,7 +575,6 @@ static int sil24_port_start(struct ata_port *ap)
|
||||||
}
|
}
|
||||||
memset(cb, 0, cb_size);
|
memset(cb, 0, cb_size);
|
||||||
|
|
||||||
pp->port = hpriv->port_base + ap->port_no * PORT_REGS_SIZE;
|
|
||||||
pp->cmd_block = cb;
|
pp->cmd_block = cb;
|
||||||
pp->cmd_block_dma = cb_dma;
|
pp->cmd_block_dma = cb_dma;
|
||||||
|
|
||||||
|
@ -700,7 +695,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||||
u32 tmp;
|
u32 tmp;
|
||||||
int cnt;
|
int cnt;
|
||||||
|
|
||||||
probe_ent->port[i].cmd_addr = portu;
|
probe_ent->port[i].cmd_addr = portu + PORT_PRB;
|
||||||
probe_ent->port[i].scr_addr = portu + PORT_SCONTROL;
|
probe_ent->port[i].scr_addr = portu + PORT_SCONTROL;
|
||||||
|
|
||||||
ata_std_ports(&probe_ent->port[i]);
|
ata_std_ports(&probe_ent->port[i]);
|
||||||
|
|
Loading…
Reference in a new issue