UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

libahci_platform: add host_flags parameter in ahci_platform_init_host() 

Add a dynamic host_flags argument to make ahci_platform_init_host more flexible,
then remove the AHCI_HFLAGS(...) argument from some driver's ata_port_info,
and pass that in as the new argument.

Cc: Hans de Geode <hdegoede@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Kefeng Wang <kefeng.wang@linaro.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Kefeng Wang 2014-05-14 14:13:41 +08:00 committed by Tejun Heo
parent 888d91a08f
commit f9f3691790
9 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/ata/ahci_da850.c
View File

@ -85,7 +85,8 @@ static int ahci_da850_probe(struct platform_device *pdev)
da850_sata_init(dev, pwrdn_reg, hpriv->mmio); da850_sata_init(dev, pwrdn_reg, hpriv->mmio);
rc = ahci_platform_init_host(pdev, hpriv, &ahci_da850_port_info, 0, 0); rc = ahci_platform_init_host(pdev, hpriv, &ahci_da850_port_info,
0, 0, 0);
if (rc) if (rc)
goto disable_resources; goto disable_resources;

3
drivers/ata/ahci_imx.c
View File

@ -267,7 +267,8 @@ static int imx_ahci_probe(struct platform_device *pdev)
reg_val = clk_get_rate(imxpriv->ahb_clk) / 1000; reg_val = clk_get_rate(imxpriv->ahb_clk) / 1000;
writel(reg_val, hpriv->mmio + HOST_TIMER1MS); writel(reg_val, hpriv->mmio + HOST_TIMER1MS);
ret = ahci_platform_init_host(pdev, hpriv, &ahci_imx_port_info, 0, 0); ret = ahci_platform_init_host(pdev, hpriv, &ahci_imx_port_info,
0, 0, 0);
if (ret) if (ret)
imx_sata_disable(hpriv); imx_sata_disable(hpriv);

3
drivers/ata/ahci_mvebu.c
View File

@ -88,7 +88,8 @@ static int ahci_mvebu_probe(struct platform_device *pdev)
ahci_mvebu_mbus_config(hpriv, dram); ahci_mvebu_mbus_config(hpriv, dram);
ahci_mvebu_regret_option(hpriv); ahci_mvebu_regret_option(hpriv);
rc = ahci_platform_init_host(pdev, hpriv, &ahci_mvebu_port_info, 0, 0); rc = ahci_platform_init_host(pdev, hpriv, &ahci_mvebu_port_info,
0, 0, 0);
if (rc) if (rc)
goto disable_resources; goto disable_resources;

2
drivers/ata/ahci_platform.c
View File

@ -55,7 +55,7 @@ static int ahci_probe(struct platform_device *pdev)
goto disable_resources; goto disable_resources;
} }
rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info, 0, 0); rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info, 0, 0, 0);
if (rc) if (rc)
goto pdata_exit; goto pdata_exit;

2
drivers/ata/ahci_st.c
View File

@ -166,7 +166,7 @@ static int st_ahci_probe(struct platform_device *pdev)
if (err) if (err)
return err; return err;
err = ahci_platform_init_host(pdev, hpriv, &st_ahci_port_info, 0, 0); err = ahci_platform_init_host(pdev, hpriv, &st_ahci_port_info, 0, 0, 0);
if (err) { if (err) {
ahci_platform_disable_resources(hpriv); ahci_platform_disable_resources(hpriv);
return err; return err;

9
drivers/ata/ahci_sunxi.c
View File

@ -157,8 +157,6 @@ static void ahci_sunxi_start_engine(struct ata_port *ap)
} }
static const struct ata_port_info ahci_sunxi_port_info = { static const struct ata_port_info ahci_sunxi_port_info = {
AHCI_HFLAGS(AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI |
AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ),
.flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ, .flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ,
.pio_mask = ATA_PIO4, .pio_mask = ATA_PIO4,
.udma_mask = ATA_UDMA6, .udma_mask = ATA_UDMA6,
@ -169,6 +167,7 @@ static int ahci_sunxi_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct ahci_host_priv *hpriv; struct ahci_host_priv *hpriv;
unsigned long hflags;
int rc; int rc;
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev);
@ -185,7 +184,11 @@ static int ahci_sunxi_probe(struct platform_device *pdev)
if (rc) if (rc)
goto disable_resources; goto disable_resources;
rc = ahci_platform_init_host(pdev, hpriv, &ahci_sunxi_port_info, 0, 0); hflags = AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI |
AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ;
rc = ahci_platform_init_host(pdev, hpriv, &ahci_sunxi_port_info,
hflags, 0, 0);
if (rc) if (rc)
goto disable_resources; goto disable_resources;

7
drivers/ata/ahci_xgene.c
View File

@ -303,7 +303,6 @@ static struct ata_port_operations xgene_ahci_ops = {
}; };
static const struct ata_port_info xgene_ahci_port_info = { static const struct ata_port_info xgene_ahci_port_info = {
AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ),
.flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ, .flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ,
.pio_mask = ATA_PIO4, .pio_mask = ATA_PIO4,
.udma_mask = ATA_UDMA6, .udma_mask = ATA_UDMA6,
@ -382,6 +381,7 @@ static int xgene_ahci_probe(struct platform_device *pdev)
struct ahci_host_priv *hpriv; struct ahci_host_priv *hpriv;
struct xgene_ahci_context *ctx; struct xgene_ahci_context *ctx;
struct resource *res; struct resource *res;
unsigned long hflags;
int rc; int rc;
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev);
@ -450,7 +450,10 @@ static int xgene_ahci_probe(struct platform_device *pdev)
goto disable_resources; goto disable_resources;
} }
rc = ahci_platform_init_host(pdev, hpriv, &xgene_ahci_port_info, 0, 0); hflags = AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ;
rc = ahci_platform_init_host(pdev, hpriv, &xgene_ahci_port_info,
hflags, 0, 0);
if (rc) if (rc)
goto disable_resources; goto disable_resources;

5
drivers/ata/libahci_platform.c
View File

@ -283,6 +283,7 @@ EXPORT_SYMBOL_GPL(ahci_platform_get_resources);
* @pdev: platform device pointer for the host * @pdev: platform device pointer for the host
* @hpriv: ahci-host private data for the host * @hpriv: ahci-host private data for the host
* @pi_template: template for the ata_port_info to use * @pi_template: template for the ata_port_info to use
* @host_flags: ahci host flags used in ahci_host_priv
* @force_port_map: param passed to ahci_save_initial_config * @force_port_map: param passed to ahci_save_initial_config
* @mask_port_map: param passed to ahci_save_initial_config * @mask_port_map: param passed to ahci_save_initial_config
* *
@ -296,6 +297,7 @@ EXPORT_SYMBOL_GPL(ahci_platform_get_resources);
int ahci_platform_init_host(struct platform_device *pdev, int ahci_platform_init_host(struct platform_device *pdev,
struct ahci_host_priv *hpriv, struct ahci_host_priv *hpriv,
const struct ata_port_info *pi_template, const struct ata_port_info *pi_template,
unsigned long host_flags,
unsigned int force_port_map, unsigned int force_port_map,
unsigned int mask_port_map) unsigned int mask_port_map)
{ {
@ -312,7 +314,8 @@ int ahci_platform_init_host(struct platform_device *pdev,
} }
/* prepare host */ /* prepare host */
hpriv->flags |= (unsigned long)pi.private_data; pi.private_data = (void *)host_flags;
hpriv->flags |= host_flags;
ahci_save_initial_config(dev, hpriv, force_port_map, mask_port_map); ahci_save_initial_config(dev, hpriv, force_port_map, mask_port_map);

1
include/linux/ahci_platform.h
View File

@ -44,6 +44,7 @@ struct ahci_host_priv *ahci_platform_get_resources(
int ahci_platform_init_host(struct platform_device *pdev, int ahci_platform_init_host(struct platform_device *pdev,
struct ahci_host_priv *hpriv, struct ahci_host_priv *hpriv,
const struct ata_port_info *pi_template, const struct ata_port_info *pi_template,
unsigned long host_flags,
unsigned int force_port_map, unsigned int force_port_map,
unsigned int mask_port_map); unsigned int mask_port_map);