projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ahci: Get rid of host->iomap usage
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
ahci.c
diff --git
a/drivers/ata/ahci.c
b/drivers/ata/ahci.c
index 5326af28a4100fbb4c611c8aa76bcb490938bb97..c720c2c5cefe13e3dbfb6bd90678f2aa81d3e666 100644
(file)
--- a/
drivers/ata/ahci.c
+++ b/
drivers/ata/ahci.c
@@
-295,6
+295,7
@@
struct ahci_em_priv {
};
struct ahci_host_priv {
};
struct ahci_host_priv {
+ void __iomem * mmio; /* bus-independant mem map */
unsigned int flags; /* AHCI_HFLAG_* */
u32 cap; /* cap to use */
u32 cap2; /* cap2 to use */
unsigned int flags; /* AHCI_HFLAG_* */
u32 cap; /* cap to use */
u32 cap2; /* cap2 to use */
@@
-760,7
+761,8
@@
static inline int ahci_nr_ports(u32 cap)
static inline void __iomem *__ahci_port_base(struct ata_host *host,
unsigned int port_no)
{
static inline void __iomem *__ahci_port_base(struct ata_host *host,
unsigned int port_no)
{
- void __iomem *mmio = host->iomap[AHCI_PCI_BAR];
+ struct ahci_host_priv *hpriv = host->private_data;
+ void __iomem *mmio = hpriv->mmio;
return mmio + 0x100 + (port_no * 0x80);
}
return mmio + 0x100 + (port_no * 0x80);
}
@@
-820,7
+822,8
@@
static ssize_t ahci_show_host_version(struct device *dev,
{
struct Scsi_Host *shost = class_to_shost(dev);
struct ata_port *ap = ata_shost_to_port(shost);
{
struct Scsi_Host *shost = class_to_shost(dev);
struct ata_port *ap = ata_shost_to_port(shost);
- void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];
+ struct ahci_host_priv *hpriv = ap->host->private_data;
+ void __iomem *mmio = hpriv->mmio;
return sprintf(buf, "%x\n", readl(mmio + HOST_VERSION));
}
return sprintf(buf, "%x\n", readl(mmio + HOST_VERSION));
}
@@
-853,7
+856,7
@@
static ssize_t ahci_show_port_cmd(struct device *dev,
static void ahci_save_initial_config(struct pci_dev *pdev,
struct ahci_host_priv *hpriv)
{
static void ahci_save_initial_config(struct pci_dev *pdev,
struct ahci_host_priv *hpriv)
{
- void __iomem *mmio =
pcim_iomap_table(pdev)[AHCI_PCI_BAR]
;
+ void __iomem *mmio =
hpriv->mmio
;
u32 cap, cap2, vers, port_map;
int i;
int mv;
u32 cap, cap2, vers, port_map;
int i;
int mv;
@@
-982,7
+985,7
@@
static void ahci_save_initial_config(struct pci_dev *pdev,
static void ahci_restore_initial_config(struct ata_host *host)
{
struct ahci_host_priv *hpriv = host->private_data;
static void ahci_restore_initial_config(struct ata_host *host)
{
struct ahci_host_priv *hpriv = host->private_data;
- void __iomem *mmio = h
ost->iomap[AHCI_PCI_BAR]
;
+ void __iomem *mmio = h
priv->mmio
;
writel(hpriv->saved_cap, mmio + HOST_CAP);
if (hpriv->saved_cap2)
writel(hpriv->saved_cap, mmio + HOST_CAP);
if (hpriv->saved_cap2)
@@
-1341,7
+1344,7
@@
static int ahci_reset_controller(struct ata_host *host)
{
struct pci_dev *pdev = to_pci_dev(host->dev);
struct ahci_host_priv *hpriv = host->private_data;
{
struct pci_dev *pdev = to_pci_dev(host->dev);
struct ahci_host_priv *hpriv = host->private_data;
- void __iomem *mmio = h
ost->iomap[AHCI_PCI_BAR]
;
+ void __iomem *mmio = h
priv->mmio
;
u32 tmp;
/* we must be in AHCI mode, before using anything
u32 tmp;
/* we must be in AHCI mode, before using anything
@@
-1472,7
+1475,8
@@
static void ahci_init_sw_activity(struct ata_link *link)
static int ahci_reset_em(struct ata_host *host)
{
static int ahci_reset_em(struct ata_host *host)
{
- void __iomem *mmio = host->iomap[AHCI_PCI_BAR];
+ struct ahci_host_priv *hpriv = host->private_data;
+ void __iomem *mmio = hpriv->mmio;
u32 em_ctl;
em_ctl = readl(mmio + HOST_EM_CTL);
u32 em_ctl;
em_ctl = readl(mmio + HOST_EM_CTL);
@@
-1488,7
+1492,7
@@
static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state,
{
struct ahci_host_priv *hpriv = ap->host->private_data;
struct ahci_port_priv *pp = ap->private_data;
{
struct ahci_host_priv *hpriv = ap->host->private_data;
struct ahci_port_priv *pp = ap->private_data;
- void __iomem *mmio =
ap->host->iomap[AHCI_PCI_BAR]
;
+ void __iomem *mmio =
hpriv->mmio
;
u32 em_ctl;
u32 message[] = {0, 0};
unsigned long flags;
u32 em_ctl;
u32 message[] = {0, 0};
unsigned long flags;
@@
-1656,7
+1660,7
@@
static void ahci_init_controller(struct ata_host *host)
{
struct ahci_host_priv *hpriv = host->private_data;
struct pci_dev *pdev = to_pci_dev(host->dev);
{
struct ahci_host_priv *hpriv = host->private_data;
struct pci_dev *pdev = to_pci_dev(host->dev);
- void __iomem *mmio = h
ost->iomap[AHCI_PCI_BAR]
;
+ void __iomem *mmio = h
priv->mmio
;
int i;
void __iomem *port_mmio;
u32 tmp;
int i;
void __iomem *port_mmio;
u32 tmp;
@@
-2375,7
+2379,7
@@
static irqreturn_t ahci_interrupt(int irq, void *dev_instance)
VPRINTK("ENTER\n");
hpriv = host->private_data;
VPRINTK("ENTER\n");
hpriv = host->private_data;
- mmio = h
ost->iomap[AHCI_PCI_BAR]
;
+ mmio = h
priv->mmio
;
/* sigh. 0xffffffff is a valid return from h/w */
irq_stat = readl(mmio + HOST_IRQ_STAT);
/* sigh. 0xffffffff is a valid return from h/w */
irq_stat = readl(mmio + HOST_IRQ_STAT);
@@
-2476,7
+2480,8
@@
static void ahci_freeze(struct ata_port *ap)
static void ahci_thaw(struct ata_port *ap)
{
static void ahci_thaw(struct ata_port *ap)
{
- void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];
+ struct ahci_host_priv *hpriv = ap->host->private_data;
+ void __iomem *mmio = hpriv->mmio;
void __iomem *port_mmio = ahci_port_base(ap);
u32 tmp;
struct ahci_port_priv *pp = ap->private_data;
void __iomem *port_mmio = ahci_port_base(ap);
u32 tmp;
struct ahci_port_priv *pp = ap->private_data;
@@
-2641,7
+2646,7
@@
static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
{
struct ata_host *host = dev_get_drvdata(&pdev->dev);
struct ahci_host_priv *hpriv = host->private_data;
{
struct ata_host *host = dev_get_drvdata(&pdev->dev);
struct ahci_host_priv *hpriv = host->private_data;
- void __iomem *mmio = h
ost->iomap[AHCI_PCI_BAR]
;
+ void __iomem *mmio = h
priv->mmio
;
u32 ctl;
if (mesg.event & PM_EVENT_SUSPEND &&
u32 ctl;
if (mesg.event & PM_EVENT_SUSPEND &&
@@
-2810,7
+2815,7
@@
static void ahci_print_info(struct ata_host *host)
{
struct ahci_host_priv *hpriv = host->private_data;
struct pci_dev *pdev = to_pci_dev(host->dev);
{
struct ahci_host_priv *hpriv = host->private_data;
struct pci_dev *pdev = to_pci_dev(host->dev);
- void __iomem *mmio = h
ost->iomap[AHCI_PCI_BAR]
;
+ void __iomem *mmio = h
priv->mmio
;
u32 vers, cap, cap2, impl, speed;
const char *speed_s;
u16 cc;
u32 vers, cap, cap2, impl, speed;
const char *speed_s;
u16 cc;
@@
-3308,6
+3313,8
@@
static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
if ((hpriv->flags & AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev))
pci_intx(pdev, 1);
if ((hpriv->flags & AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev))
pci_intx(pdev, 1);
+ hpriv->mmio = pcim_iomap_table(pdev)[AHCI_PCI_BAR];
+
/* save initial config */
ahci_save_initial_config(pdev, hpriv);
/* save initial config */
ahci_save_initial_config(pdev, hpriv);
@@
-3328,7
+3335,7
@@
static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
if (ahci_em_messages && (hpriv->cap & HOST_CAP_EMS)) {
u8 messages;
if (ahci_em_messages && (hpriv->cap & HOST_CAP_EMS)) {
u8 messages;
- void __iomem *mmio =
pcim_iomap_table(pdev)[AHCI_PCI_BAR]
;
+ void __iomem *mmio =
hpriv->mmio
;
u32 em_loc = readl(mmio + HOST_EM_LOC);
u32 em_ctl = readl(mmio + HOST_EM_CTL);
u32 em_loc = readl(mmio + HOST_EM_LOC);
u32 em_ctl = readl(mmio + HOST_EM_CTL);
@@
-3372,7
+3379,6
@@
static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
host = ata_host_alloc_pinfo(&pdev->dev, ppi, n_ports);
if (!host)
return -ENOMEM;
host = ata_host_alloc_pinfo(&pdev->dev, ppi, n_ports);
if (!host)
return -ENOMEM;
- host->iomap = pcim_iomap_table(pdev);
host->private_data = hpriv;
if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss)
host->private_data = hpriv;
if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss)