[COMMON] scsi: ufs: Build config fix for bring up

Change-Id: Idba50229cb7f03b4f83e122742213c8fb2897d1c
Signed-off-by: JaeHun Jung <jh0801.jung@samsung.com>

diff --git a/drivers/scsi/scsi_srpmb.c b/drivers/scsi/scsi_srpmb.c
index 64053449e3f2f1841b2e15523d6d1e84c5040f5c..554beb4e9f702cf635d29e587401c533ab7f7881 100644 (file)
--- a/drivers/scsi/scsi_srpmb.c
+++ b/drivers/scsi/scsi_srpmb.c
@@ -345,11 +345,13 @@ int init_wsm(struct device *dev)
                        goto out_srpmb_init_fail;
                }
 
+#ifdef CONFIG_EXYNOS_SMC_LOGGING
                ret = exynos_smc(SMC_SRPMB_WSM, rpmb_ctx->phy_addr, hwirq, 0);
                if (ret) {
                        dev_err(&sr_pdev->dev, "wsm smc init failed: %x\n", ret);
                        goto out_srpmb_unregister_pm;
                }
+#endif
 
                wakeup_source_init(&rpmb_ctx->wakesrc, "srpmb");
                spin_lock_init(&rpmb_ctx->lock);

diff --git a/drivers/scsi/ufs/ufs-exynos-dbg.c b/drivers/scsi/ufs/ufs-exynos-dbg.c
index 3c1dfebb77a522895dff603fcf56a91f5e651b14..3423377a0666db8a03fc3afc9516ad5a65c4ef99 100644 (file)
--- a/drivers/scsi/ufs/ufs-exynos-dbg.c
+++ b/drivers/scsi/ufs/ufs-exynos-dbg.c
@@ -971,8 +971,10 @@ static void exynos_ufs_get_sfr(struct ufs_hba *hba,
                                cfg->val = ufshcd_readl(hba, cfg->offset);
                        else if (sel_api == LOG_VS_HCI_SFR)
                                cfg->val = hci_readl(ufs, cfg->offset);
+#ifdef CONFIG_EXYNOS_SMC_LOGGING
                        else if (sel_api == LOG_FMP_SFR)
                                cfg->val = exynos_smc(SMC_CMD_FMP_SMU_DUMP, 0, 0, cfg->offset);
+#endif
                        else if (sel_api == LOG_UNIPRO_SFR)
                                cfg->val = unipro_readl(ufs, cfg->offset);
                        else if (sel_api == LOG_PMA_SFR)
@@ -1117,7 +1119,9 @@ void exynos_ufs_dump_uic_info(struct ufs_hba *hba)
        struct exynos_ufs *ufs = to_exynos_ufs(hba);
 
        /* secure log */
+#ifdef CONFIG_EXYNOS_SMC_LOGGING
        exynos_smc(SMC_CMD_UFS_LOG, 1, 0, hba->secure_log.paddr);
+#endif
 
        exynos_ufs_get_sfr(hba, ufs->debug.sfr);
        exynos_ufs_get_attr(hba, ufs->debug.attr);
@@ -1162,9 +1166,10 @@ int exynos_ufs_init_dbg(struct ufs_hba *hba)
                exynos_clki->freq = 0;
                list_add_tail(&exynos_clki->list, &ufs->debug.misc.clk_list_head);
        }
-
+#ifdef CONFIG_EXYNOS_SNAPSHOT
        hba->secure_log.paddr = exynos_ss_get_spare_paddr(0);
        hba->secure_log.vaddr = (u32 *)exynos_ss_get_spare_vaddr(0);
+#endif
 
        return 0;
 }

diff --git a/drivers/scsi/ufs/ufs-exynos.c b/drivers/scsi/ufs/ufs-exynos.c
index 60514e5af671a3c963beaf47ff23463112d87f30..5e80b78298d3eea7486783f2532a671ea0353c31 100644 (file)
--- a/drivers/scsi/ufs/ufs-exynos.c
+++ b/drivers/scsi/ufs/ufs-exynos.c
@@ -14,8 +14,6 @@
 #include <linux/of_address.h>
 #include <linux/clk.h>
 #include <linux/smc.h>
-#include <soc/samsung/exynos-pm.h>
-#include <soc/samsung/exynos-powermode.h>
 #include "ufshcd.h"
 #include "unipro.h"
 #include "mphy.h"
@@ -652,7 +650,9 @@ success:
        exynos_ufs_dev_hw_reset(hba);
 
        /* secure log */
+#ifdef CONFIG_EXYNOS_SMC_LOGGING
        exynos_smc(SMC_CMD_UFS_LOG, 0, 0, 0);
+#endif
 out:
        return;
 }
@@ -955,7 +955,9 @@ static int __exynos_ufs_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
        exynos_ufs_smu_resume(ufs);
 
        /* secure log */
+#ifdef CONFIG_EXYNOS_SMC_LOGGING
        exynos_smc(SMC_CMD_UFS_LOG, 0, 0, 0);
+#endif
 
        if (ufshcd_is_clkgating_allowed(hba))
                clk_disable_unprepare(ufs->clk_hci);

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index ad1e51a176fc3b266836937f879388ce95e9b689..3be7dc65ecdd9c3ad5537321e7cbabd587b0656c 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -252,10 +252,12 @@ static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba);
 static int ufshcd_link_hibern8_ctrl(struct ufs_hba *hba, bool en);
 static inline void ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba);
 static int ufshcd_host_reset_and_restore(struct ufs_hba *hba);
+#if defined(CONFIG_PM_DEVFREQ)
 static void ufshcd_resume_clkscaling(struct ufs_hba *hba);
 static void ufshcd_suspend_clkscaling(struct ufs_hba *hba);
 static void __ufshcd_suspend_clkscaling(struct ufs_hba *hba);
 static int ufshcd_scale_clks(struct ufs_hba *hba, bool scale_up);
+#endif
 static irqreturn_t ufshcd_intr(int irq, void *__hba);
 static int ufshcd_change_power_mode(struct ufs_hba *hba,
                             struct ufs_pa_layer_attr *pwr_mode);
@@ -5915,7 +5917,9 @@ static int ufshcd_eh_device_reset_handler(struct scsi_cmnd *cmd)
        tag = cmd->request->tag;
 
        /* secure log */
+#ifdef CONFIG_EXYNOS_SMC_LOGGING
        exynos_smc(SMC_CMD_UFS_LOG, 1, 0, hba->secure_log.paddr);
+#endif
 
        /* Dump debugging information to system memory */
        ufshcd_vops_dbg_register_dump(hba);
@@ -6010,7 +6014,9 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)
                return ufshcd_eh_host_reset_handler(cmd);
 
        /* secure log */
+#ifdef CONFIG_EXYNOS_SMC_LOGGING
        exynos_smc(SMC_CMD_UFS_LOG, 1, 0, hba->secure_log.paddr);
+#endif
 
        if (cmd->cmnd[0] == READ_10 || cmd->cmnd[0] == WRITE_10) {
                unsigned long lba = (unsigned long) ((cmd->cmnd[2] << 24) |
@@ -6188,8 +6194,10 @@ static int ufshcd_host_reset_and_restore(struct ufs_hba *hba)
        ufshcd_hba_stop(hba, false);
        spin_unlock_irqrestore(hba->host->host_lock, flags);
 
+#if defined(CONFIG_PM_DEVFREQ)
        /* scale up clocks to max frequency before full reinitialization */
        ufshcd_scale_clks(hba, true);
+#endif
 
        /* Establish the link again and restore the device */
 #ifdef CONFIG_SCSI_UFS_ASYNC_RELINK
@@ -6835,10 +6843,12 @@ retry:
                                sizeof(struct ufs_pa_layer_attr));
                        hba->clk_scaling.saved_pwr_info.is_valid = true;
                        if (!hba->devfreq) {
+#if defined(CONFIG_PM_DEVFREQ)
                                hba->devfreq = devm_devfreq_add_device(hba->dev,
                                                        &ufs_devfreq_profile,
                                                        "simple_ondemand",
                                                        NULL);
+#endif
                                if (IS_ERR(hba->devfreq)) {
                                        ret = PTR_ERR(hba->devfreq);
                                        dev_err(hba->dev, "Unable to register with devfreq %d\n",
@@ -7654,10 +7664,14 @@ static void ufshcd_hba_exit(struct ufs_hba *hba)
        if (hba->is_powered) {
                ufshcd_variant_hba_exit(hba);
                ufshcd_setup_vreg(hba, false);
+#if defined(CONFIG_PM_DEVFREQ)
                ufshcd_suspend_clkscaling(hba);
+#endif
                if (ufshcd_is_clkscaling_supported(hba)) {
+#if defined(CONFIG_PM_DEVFREQ)
                        if (hba->devfreq)
                                ufshcd_suspend_clkscaling(hba);
+#endif
                        destroy_workqueue(hba->clk_scaling.workq);
                }
                ufshcd_setup_clocks(hba, false);
@@ -7954,7 +7968,9 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
        if (hba->clk_scaling.is_allowed) {
                cancel_work_sync(&hba->clk_scaling.suspend_work);
                cancel_work_sync(&hba->clk_scaling.resume_work);
+#if defined(CONFIG_PM_DEVFREQ)
                ufshcd_suspend_clkscaling(hba);
+#endif
        }
 
        if (req_dev_pwr_mode == UFS_ACTIVE_PWR_MODE &&
@@ -8048,8 +8064,10 @@ disable_clks:
        goto out;
 
 set_link_active:
+#if defined(CONFIG_PM_DEVFREQ)
        if (hba->clk_scaling.is_allowed)
                ufshcd_resume_clkscaling(hba);
+#endif
 
        if (ufshcd_is_shutdown_pm(pm_op))
                goto out;
@@ -8073,9 +8091,11 @@ set_dev_active:
        if (!ufshcd_set_dev_pwr_mode(hba, UFS_ACTIVE_PWR_MODE))
                ufshcd_disable_auto_bkops(hba);
 enable_gating:
+#if defined(CONFIG_PM_DEVFREQ)
        if (hba->clk_scaling.is_allowed)
                ufshcd_resume_clkscaling(hba);
        hba->clk_gating.is_suspended = false;
+#endif
        ufshcd_release(hba);
 out:
        hba->pm_op_in_progress = 0;
@@ -8200,8 +8220,10 @@ vendor_suspend:
        ufshcd_vops_suspend(hba, pm_op);
 disable_irq_and_vops_clks:
        ufshcd_disable_irq(hba);
+#if defined(CONFIG_PM_DEVFREQ)
        if (hba->clk_scaling.is_allowed)
                ufshcd_suspend_clkscaling(hba);
+#endif
 
        if (gating_allowed)
                ufshcd_setup_clocks(hba, false);