[GIT PULL] qcom fixes for 4.3-rc1
The following changes since commit bc0195aad0daa2ad5b0d76cce22b167bc3435590: Linux 4.2-rc2 (2015-07-12 15:10:30 -0700) are available in the git repository at: g...@git.codeaurora.org:quic/kernel/agross-msm.git tags/qcom-fixes-for-4.3-rc1 for you to fetch changes up to 100dea902f73d8658655f59b4021cbc3c6c3c957: firmware: qcom: scm: Add function stubs for ARM64 (2015-09-11 11:59:31 -0500) Qualcomm fixes for v4.3-rc1 * Add SCM function call stubs on ARM64 Andy Gross (1): firmware: qcom: scm: Add function stubs for ARM64 drivers/firmware/Makefile |4 +++ drivers/firmware/qcom_scm-64.c | 63 2 files changed, 67 insertions(+) create mode 100644 drivers/firmware/qcom_scm-64.c -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] firmware: qcom: scm: Add function stubs for ARM64
This patch adds stubs for the SCM functions exposed in the QCOM SCM API. Signed-off-by: Andy Gross--- drivers/firmware/Makefile |4 +++ drivers/firmware/qcom_scm-64.c | 63 2 files changed, 67 insertions(+) create mode 100644 drivers/firmware/qcom_scm-64.c diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index 4a4b897..2f810c2 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -12,8 +12,12 @@ obj-$(CONFIG_ISCSI_IBFT_FIND)+= iscsi_ibft_find.o obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o obj-$(CONFIG_QCOM_SCM) += qcom_scm.o +ifdef CONFIG_ARM64 +obj-$(CONFIG_QCOM_SCM) += qcom_scm-64.o +else obj-$(CONFIG_QCOM_SCM) += qcom_scm-32.o CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) +endif obj-y += broadcom/ obj-$(CONFIG_GOOGLE_FIRMWARE) += google/ diff --git a/drivers/firmware/qcom_scm-64.c b/drivers/firmware/qcom_scm-64.c new file mode 100644 index 000..bb6555f --- /dev/null +++ b/drivers/firmware/qcom_scm-64.c @@ -0,0 +1,63 @@ +/* Copyright (c) 2015, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include + +/** + * qcom_scm_set_cold_boot_addr() - Set the cold boot address for cpus + * @entry: Entry point function for the cpus + * @cpus: The cpumask of cpus that will use the entry point + * + * Set the cold boot address of the cpus. Any cpu outside the supported + * range would be removed from the cpu present mask. + */ +int __qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus) +{ + return -ENOTSUPP; +} + +/** + * qcom_scm_set_warm_boot_addr() - Set the warm boot address for cpus + * @entry: Entry point function for the cpus + * @cpus: The cpumask of cpus that will use the entry point + * + * Set the Linux entry point for the SCM to transfer control to when coming + * out of a power down. CPU power down may be executed on cpuidle or hotplug. + */ +int __qcom_scm_set_warm_boot_addr(void *entry, const cpumask_t *cpus) +{ + return -ENOTSUPP; +} + +/** + * qcom_scm_cpu_power_down() - Power down the cpu + * @flags - Flags to flush cache + * + * This is an end point to power down cpu. If there was a pending interrupt, + * the control would return from this function, otherwise, the cpu jumps to the + * warm boot entry point set for this cpu upon reset. + */ +void __qcom_scm_cpu_power_down(u32 flags) +{ +} + +int __qcom_scm_is_call_available(u32 svc_id, u32 cmd_id) +{ + return -ENOTSUPP; +} + +int __qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, u32 *resp) +{ + return -ENOTSUPP; +} -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[Patch v2] firmware: qcom: scm: Add function stubs for ARM64
This patch adds stubs for the SCM functions exposed in the QCOM SCM API. Signed-off-by: Andy Gross--- drivers/firmware/Kconfig |8 + drivers/firmware/Makefile |3 +- drivers/firmware/qcom_scm-64.c | 63 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 drivers/firmware/qcom_scm-64.c diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 99c69a3..72720eb 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -136,6 +136,14 @@ config QCOM_SCM bool depends on ARM || ARM64 +config QCOM_SCM_32 + def_bool y + depends on QCOM_SCM && ARM + +config QCOM_SCM_64 + def_bool y + depends on QCOM_SCM && ARM64 + source "drivers/firmware/broadcom/Kconfig" source "drivers/firmware/google/Kconfig" source "drivers/firmware/efi/Kconfig" diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index 4a4b897..73f841c 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -12,7 +12,8 @@ obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o obj-$(CONFIG_QCOM_SCM) += qcom_scm.o -obj-$(CONFIG_QCOM_SCM) += qcom_scm-32.o +obj-$(CONFIG_QCOM_SCM_64) += qcom_scm-64.o +obj-$(CONFIG_QCOM_SCM_32) += qcom_scm-32.o CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) obj-y += broadcom/ diff --git a/drivers/firmware/qcom_scm-64.c b/drivers/firmware/qcom_scm-64.c new file mode 100644 index 000..bb6555f --- /dev/null +++ b/drivers/firmware/qcom_scm-64.c @@ -0,0 +1,63 @@ +/* Copyright (c) 2015, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include + +/** + * qcom_scm_set_cold_boot_addr() - Set the cold boot address for cpus + * @entry: Entry point function for the cpus + * @cpus: The cpumask of cpus that will use the entry point + * + * Set the cold boot address of the cpus. Any cpu outside the supported + * range would be removed from the cpu present mask. + */ +int __qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus) +{ + return -ENOTSUPP; +} + +/** + * qcom_scm_set_warm_boot_addr() - Set the warm boot address for cpus + * @entry: Entry point function for the cpus + * @cpus: The cpumask of cpus that will use the entry point + * + * Set the Linux entry point for the SCM to transfer control to when coming + * out of a power down. CPU power down may be executed on cpuidle or hotplug. + */ +int __qcom_scm_set_warm_boot_addr(void *entry, const cpumask_t *cpus) +{ + return -ENOTSUPP; +} + +/** + * qcom_scm_cpu_power_down() - Power down the cpu + * @flags - Flags to flush cache + * + * This is an end point to power down cpu. If there was a pending interrupt, + * the control would return from this function, otherwise, the cpu jumps to the + * warm boot entry point set for this cpu upon reset. + */ +void __qcom_scm_cpu_power_down(u32 flags) +{ +} + +int __qcom_scm_is_call_available(u32 svc_id, u32 cmd_id) +{ + return -ENOTSUPP; +} + +int __qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, u32 *resp) +{ + return -ENOTSUPP; +} -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] drm/msm/dsi: Updata LNn_CFG4 register settings for 28nm PHY
The current settings for 28nm PHY data lane CFG4 registers do not work with certain panels. This change is to modify them to hw recommended values. Signed-off-by: Hai Li--- drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c index f1a7c7b..edf7411 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c @@ -99,16 +99,14 @@ static int dsi_28nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, dsi_phy_write(base + REG_DSI_28nm_PHY_LN_CFG_1(i), 0); dsi_phy_write(base + REG_DSI_28nm_PHY_LN_CFG_2(i), 0); dsi_phy_write(base + REG_DSI_28nm_PHY_LN_CFG_3(i), 0); + dsi_phy_write(base + REG_DSI_28nm_PHY_LN_CFG_4(i), 0); dsi_phy_write(base + REG_DSI_28nm_PHY_LN_TEST_DATAPATH(i), 0); dsi_phy_write(base + REG_DSI_28nm_PHY_LN_DEBUG_SEL(i), 0); dsi_phy_write(base + REG_DSI_28nm_PHY_LN_TEST_STR_0(i), 0x1); dsi_phy_write(base + REG_DSI_28nm_PHY_LN_TEST_STR_1(i), 0x97); } - dsi_phy_write(base + REG_DSI_28nm_PHY_LN_CFG_4(0), 0); - dsi_phy_write(base + REG_DSI_28nm_PHY_LN_CFG_4(1), 0x5); - dsi_phy_write(base + REG_DSI_28nm_PHY_LN_CFG_4(2), 0xa); - dsi_phy_write(base + REG_DSI_28nm_PHY_LN_CFG_4(3), 0xf); + dsi_phy_write(base + REG_DSI_28nm_PHY_LNCK_CFG_4, 0); dsi_phy_write(base + REG_DSI_28nm_PHY_LNCK_CFG_1, 0xc0); dsi_phy_write(base + REG_DSI_28nm_PHY_LNCK_TEST_STR0, 0x1); dsi_phy_write(base + REG_DSI_28nm_PHY_LNCK_TEST_STR1, 0xbb); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] firmware: qcom: scm: Add function stubs for ARM64
On Fri, Sep 11, 2015 at 06:56:49PM +0100, Russell King - ARM Linux wrote: > On Fri, Sep 11, 2015 at 12:50:56PM -0500, Andy Gross wrote: > > This patch adds stubs for the SCM functions exposed in the QCOM SCM API. > > > > Signed-off-by: Andy Gross> > --- > > drivers/firmware/Makefile |4 +++ > > drivers/firmware/qcom_scm-64.c | 63 > > > > 2 files changed, 67 insertions(+) > > create mode 100644 drivers/firmware/qcom_scm-64.c > > > > diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile > > index 4a4b897..2f810c2 100644 > > --- a/drivers/firmware/Makefile > > +++ b/drivers/firmware/Makefile > > @@ -12,8 +12,12 @@ obj-$(CONFIG_ISCSI_IBFT_FIND)+= iscsi_ibft_find.o > > obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o > > obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o > > obj-$(CONFIG_QCOM_SCM) += qcom_scm.o > > +ifdef CONFIG_ARM64 > > +obj-$(CONFIG_QCOM_SCM) += qcom_scm-64.o > > +else > > obj-$(CONFIG_QCOM_SCM) += qcom_scm-32.o > > CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch_extension > > sec,-DREQUIRES_SEC=1) > > +endif > > Can we not start doing stuff like this. Use the Kconfig to control what > you build, not the Makefile system. > > config QCOM_SCM_32 > def_bool y > depends on QCOM_SCM && ARM > > config QCOM_SCM_64 > def_bool y > depends on QCOM_SCM && ARM64 > > and then use those in the makefile. That's a fair implementation. There is going to be a bit of work going into getting the 64 bit SCM un-stubbed. So I can respin to incorporate your comments or we can wait for the unstubbing. -- Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Patch v2] firmware: qcom: scm: Add function stubs for ARM64
On Fri, Sep 11, 2015 at 04:01:16PM -0500, Andy Gross wrote: > This patch adds stubs for the SCM functions exposed in the QCOM SCM API. > > Signed-off-by: Andy GrossLooks much better, thanks. Acked-by: Russell King -- FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Patch v2] firmware: qcom: scm: Add function stubs for ARM64
On Fri 11 Sep 14:01 PDT 2015, Andy Gross wrote: > This patch adds stubs for the SCM functions exposed in the QCOM SCM API. > > Signed-off-by: Andy Gross> --- > drivers/firmware/Kconfig |8 + > drivers/firmware/Makefile |3 +- > drivers/firmware/qcom_scm-64.c | 63 > > 3 files changed, 73 insertions(+), 1 deletion(-) > create mode 100644 drivers/firmware/qcom_scm-64.c > > diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig > index 99c69a3..72720eb 100644 > --- a/drivers/firmware/Kconfig > +++ b/drivers/firmware/Kconfig > @@ -136,6 +136,14 @@ config QCOM_SCM > bool > depends on ARM || ARM64 > > +config QCOM_SCM_32 > + def_bool y > + depends on QCOM_SCM && ARM > + > +config QCOM_SCM_64 > + def_bool y > + depends on QCOM_SCM && ARM64 > + So if QCOM_SCM is selected by a consumer then the dependencies here will be met and the correct implementation will be chosen, as these aren't possible to deselect? I guess that's an okay approach, so: Acked-by: Bjorn Andersson Regards, Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] firmware: qcom: scm: Add function stubs for ARM64
On Fri, Sep 11, 2015 at 12:50:56PM -0500, Andy Gross wrote: > This patch adds stubs for the SCM functions exposed in the QCOM SCM API. > > Signed-off-by: Andy Gross> --- > drivers/firmware/Makefile |4 +++ > drivers/firmware/qcom_scm-64.c | 63 > > 2 files changed, 67 insertions(+) > create mode 100644 drivers/firmware/qcom_scm-64.c > > diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile > index 4a4b897..2f810c2 100644 > --- a/drivers/firmware/Makefile > +++ b/drivers/firmware/Makefile > @@ -12,8 +12,12 @@ obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o > obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o > obj-$(CONFIG_FIRMWARE_MEMMAP)+= memmap.o > obj-$(CONFIG_QCOM_SCM) += qcom_scm.o > +ifdef CONFIG_ARM64 > +obj-$(CONFIG_QCOM_SCM) += qcom_scm-64.o > +else > obj-$(CONFIG_QCOM_SCM) += qcom_scm-32.o > CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) > +endif Can we not start doing stuff like this. Use the Kconfig to control what you build, not the Makefile system. config QCOM_SCM_32 def_bool y depends on QCOM_SCM && ARM config QCOM_SCM_64 def_bool y depends on QCOM_SCM && ARM64 and then use those in the makefile. -- FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL] qcom fixes for 4.3-rc1
Arnd, Kevin, Olof, Please hold off on this until the comments I made on the patch in this pull request, which was only posted 15 minutes prior to this pull request, have been discussed. Thanks. On Fri, Sep 11, 2015 at 01:07:33PM -0500, Andy Gross wrote: > The following changes since commit bc0195aad0daa2ad5b0d76cce22b167bc3435590: > > Linux 4.2-rc2 (2015-07-12 15:10:30 -0700) > > are available in the git repository at: > > g...@git.codeaurora.org:quic/kernel/agross-msm.git > tags/qcom-fixes-for-4.3-rc1 > > for you to fetch changes up to 100dea902f73d8658655f59b4021cbc3c6c3c957: > > firmware: qcom: scm: Add function stubs for ARM64 (2015-09-11 11:59:31 > -0500) > > > Qualcomm fixes for v4.3-rc1 > > * Add SCM function call stubs on ARM64 > > > Andy Gross (1): > firmware: qcom: scm: Add function stubs for ARM64 > > drivers/firmware/Makefile |4 +++ > drivers/firmware/qcom_scm-64.c | 63 > > 2 files changed, 67 insertions(+) > create mode 100644 drivers/firmware/qcom_scm-64.c -- FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html