| Message ID | 1408819047-17224-3-git-send-email-stripathi@apm.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 08/23/2014 10:37 PM, Suman Tripathi wrote: > This patch implements the feature to skip the PHY and clock > initialization if it is already configured by the firmware. > Signed-off-by: Loc Ho <lho@apm.com> > Signed-off-by: Suman Tripathi <stripathi@apm.com> > --- > drivers/ata/ahci_xgene.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c > index f416495..fd9c137 100644 > --- a/drivers/ata/ahci_xgene.c > +++ b/drivers/ata/ahci_xgene.c > @@ -145,6 +145,15 @@ static unsigned int xgene_ahci_qc_issue(struct ata_queued_cmd *qc) > return rc; > } > > +static bool xgene_ahci_is_memram_inited(struct xgene_ahci_context *ctx) > +{ > + void __iomem *diagcsr = ctx->csr_diag; > + > + return (readl(diagcsr + CFG_MEM_RAM_SHUTDOWN) == 0 && > + readl(diagcsr + BLOCK_MEM_RDY) == 0xFFFFFFFF) ? > + true : false; Just return the result of &&, that should be enough. WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c index f416495..fd9c137 100644 --- a/drivers/ata/ahci_xgene.c +++ b/drivers/ata/ahci_xgene.c @@ -145,6 +145,15 @@ static unsigned int xgene_ahci_qc_issue(struct ata_queued_cmd *qc) return rc; } +static bool xgene_ahci_is_memram_inited(struct xgene_ahci_context *ctx) +{ + void __iomem *diagcsr = ctx->csr_diag; + + return (readl(diagcsr + CFG_MEM_RAM_SHUTDOWN) == 0 && + readl(diagcsr + BLOCK_MEM_RDY) == 0xFFFFFFFF) ? + true : false; +} + /** * xgene_ahci_read_id - Read ID data from the specified device * @dev: device @@ -468,6 +477,11 @@ static int xgene_ahci_probe(struct platform_device *pdev) return -ENODEV; } + if (xgene_ahci_is_memram_inited(ctx)) { + dev_info(dev, "skip clock and PHY initialization\n"); + goto skip_clk_phy; + } + /* Due to errata, HW requires full toggle transition */ rc = ahci_platform_enable_clks(hpriv); if (rc) @@ -481,6 +495,8 @@ static int xgene_ahci_probe(struct platform_device *pdev) /* Configure the host controller */ xgene_ahci_hw_init(hpriv); +skip_clk_phy: + hflags = AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_NCQ; rc = ahci_platform_init_host(pdev, hpriv, &xgene_ahci_port_info,