From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:60524 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752058AbdDJQSc (ORCPT ); Mon, 10 Apr 2017 12:18:32 -0400 Subject: Patch "firmware: qcom: scm: Fix interrupted SCM calls" has been added to the 4.10-stable tree To: gregkh@linuxfoundation.org, alexander.levin@verizon.com, andy.gross@linaro.org, stable@vger.kernel.org, will.deacon@arm.com Cc: , From: Date: Mon, 10 Apr 2017 18:17:48 +0200 In-Reply-To: <20170404193158.19041-80-alexander.levin@verizon.com> Message-ID: <149184106822118@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled firmware: qcom: scm: Fix interrupted SCM calls to the 4.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: firmware-qcom-scm-fix-interrupted-scm-calls.patch and it can be found in the queue-4.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Mon Apr 10 18:08:16 CEST 2017 From: alexander.levin@verizon.com Date: Tue, 4 Apr 2017 19:32:32 +0000 Subject: firmware: qcom: scm: Fix interrupted SCM calls To: "gregkh@linuxfoundation.org" Cc: "stable@vger.kernel.org" Message-ID: <20170404193158.19041-80-alexander.levin@verizon.com> From: Andy Gross [ Upstream commit 82bcd087029f6056506ea929f11af02622230901 ] This patch adds a Qualcomm specific quirk to the arm_smccc_smc call. On Qualcomm ARM64 platforms, the SMC call can return before it has completed. If this occurs, the call can be restarted, but it requires using the returned session ID value from the interrupted SMC call. The quirk stores off the session ID from the interrupted call in the quirk structure so that it can be used by the caller. This patch folds in a fix given by Sricharan R: https://lkml.org/lkml/2016/9/28/272 Signed-off-by: Andy Gross Reviewed-by: Will Deacon Signed-off-by: Will Deacon Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/smccc-call.S | 9 ++++++++- drivers/firmware/qcom_scm-64.c | 13 ++++++++++--- include/linux/arm-smccc.h | 11 ++++++++--- 3 files changed, 26 insertions(+), 7 deletions(-) --- a/arch/arm64/kernel/smccc-call.S +++ b/arch/arm64/kernel/smccc-call.S @@ -12,6 +12,7 @@ * */ #include +#include #include .macro SMCCC instr @@ -20,7 +21,13 @@ ldr x4, [sp] stp x0, x1, [x4, #ARM_SMCCC_RES_X0_OFFS] stp x2, x3, [x4, #ARM_SMCCC_RES_X2_OFFS] - ret + ldr x4, [sp, #8] + cbz x4, 1f /* no quirk structure */ + ldr x9, [x4, #ARM_SMCCC_QUIRK_ID_OFFS] + cmp x9, #ARM_SMCCC_QUIRK_QCOM_A6 + b.ne 1f + str x6, [x4, ARM_SMCCC_QUIRK_STATE_OFFS] +1: ret .cfi_endproc .endm --- a/drivers/firmware/qcom_scm-64.c +++ b/drivers/firmware/qcom_scm-64.c @@ -91,6 +91,7 @@ static int qcom_scm_call(struct device * dma_addr_t args_phys = 0; void *args_virt = NULL; size_t alloc_len; + struct arm_smccc_quirk quirk = {.id = ARM_SMCCC_QUIRK_QCOM_A6}; if (unlikely(arglen > N_REGISTER_ARGS)) { alloc_len = N_EXT_QCOM_SCM_ARGS * sizeof(u64); @@ -131,10 +132,16 @@ static int qcom_scm_call(struct device * qcom_smccc_convention, ARM_SMCCC_OWNER_SIP, fn_id); + quirk.state.a6 = 0; + do { - arm_smccc_smc(cmd, desc->arginfo, desc->args[0], - desc->args[1], desc->args[2], x5, 0, 0, - res); + arm_smccc_smc_quirk(cmd, desc->arginfo, desc->args[0], + desc->args[1], desc->args[2], x5, + quirk.state.a6, 0, res, &quirk); + + if (res->a0 == QCOM_SCM_INTERRUPTED) + cmd = res->a0; + } while (res->a0 == QCOM_SCM_INTERRUPTED); mutex_unlock(&qcom_scm_lock); --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -14,9 +14,6 @@ #ifndef __LINUX_ARM_SMCCC_H #define __LINUX_ARM_SMCCC_H -#include -#include - /* * This file provides common defines for ARM SMC Calling Convention as * specified in @@ -60,6 +57,13 @@ #define ARM_SMCCC_OWNER_TRUSTED_OS 50 #define ARM_SMCCC_OWNER_TRUSTED_OS_END 63 +#define ARM_SMCCC_QUIRK_NONE 0 +#define ARM_SMCCC_QUIRK_QCOM_A6 1 /* Save/restore register a6 */ + +#ifndef __ASSEMBLY__ + +#include +#include /** * struct arm_smccc_res - Result from SMC/HVC call * @a0-a3 result values from registers 0 to 3 @@ -125,4 +129,5 @@ asmlinkage void __arm_smccc_hvc(unsigned #define arm_smccc_hvc_quirk(...) __arm_smccc_hvc(__VA_ARGS__) +#endif /*__ASSEMBLY__*/ #endif /*__LINUX_ARM_SMCCC_H*/ Patches currently in stable-queue which might be from gregkh@linuxfoundation.org are queue-4.10/staging-android-ashmem-lseek-failed-due-to-no-fmode_lseek.patch queue-4.10/acpi-button-change-default-behavior-to-lid_init_state-open.patch queue-4.10/usb-musb-da8xx-fix-host-mode-suspend.patch queue-4.10/drm-i915-fix-intel_bdw_ids-definition.patch queue-4.10/drm-i915-gvt-fix-gvt-scheduler-interval-time.patch queue-4.10/sysfs-be-careful-of-error-returns-from-ops-show.patch queue-4.10/pci-thunder-pem-add-legacy-firmware-support-for-cavium-thunderx-host-controller.patch queue-4.10/pci-thunder-pem-fix-legacy-firmware-pem-specific-resources.patch queue-4.10/mips-flush-wrong-invalid-ftlb-entry-for-huge-page.patch queue-4.10/mips-end-spinlocks-with-.insn.patch queue-4.10/dax-fix-radix-tree-insertion-race.patch queue-4.10/mmc-sdhci-of-esdhc-remove-default-broken-cd-for-arm.patch queue-4.10/jump-label-fix-passing-kbuild_cflags-when-checking-for-asm-goto-support.patch queue-4.10/kvm-arm-arm64-fix-locking-for-kvm_free_stage2_pgd.patch queue-4.10/iio-st_pressure-initialize-lps22hb-bootime.patch queue-4.10/powerpc-disable-hfscr-if-tm-is-not-supported.patch queue-4.10/metag-usercopy-add-missing-fixups.patch queue-4.10/nios2-reserve-boot-memory-for-device-tree.patch queue-4.10/platform-x86-asus-wmi-detect-quirk_no_rfkill-from-the-dsdt.patch queue-4.10/ring-buffer-fix-return-value-check-in-test_ringbuffer.patch queue-4.10/firmware-qcom-scm-fix-interrupted-scm-calls.patch queue-4.10/pci-add-broadcom-northstar2-paxc-quirk-for-device-class-and-mpss.patch queue-4.10/drm-msm-adreno-fix-build-error-without-debugfs.patch queue-4.10/powerpc-64-fix-flush_-d-i-cache_range-called-from-modules.patch queue-4.10/acpi-gpio-do-not-fall-back-to-parsing-_crs-when-we-get-a-deferral.patch queue-4.10/metag-usercopy-add-early-abort-to-copy_to_user.patch queue-4.10/powerpc-crypto-crc32c-vpmsum-fix-missing-preempt_disable.patch queue-4.10/arm-arm64-kvm-take-mmap_sem-in-kvm_arch_prepare_memory_region.patch queue-4.10/rx51-broken-build.patch queue-4.10/mips-ralink-fix-typos-in-rt3883-pinctrl.patch queue-4.10/cfg80211-check-rdev-resume-callback-only-for-registered-wiphy.patch queue-4.10/metag-usercopy-set-flags-before-addz.patch queue-4.10/metag-usercopy-fix-src-fixup-in-from-user-rapf-loops.patch queue-4.10/xtensa-make-__pa-work-with-uncached-kseg-addresses.patch queue-4.10/asoc-codecs-rt5670-add-quirk-for-lenovo-thinkpad-10.patch queue-4.10/powerpc-mm-add-missing-global-tlb-invalidate-if-cxl-is-active.patch queue-4.10/tools-power-turbostat-dump-atom-p-states-correctly.patch queue-4.10/asoc-intel-cht_bsw_rt5645-add-baytrail-mclk-support.patch queue-4.10/watchdog-s3c2410-fix-infinite-interrupt-in-soft-mode.patch queue-4.10/drm-i915-actually-drive-the-bdw-reserved-ids.patch queue-4.10/serial-8250_omap-add-omap_dma_tx_kick-quirk-for-am437x.patch queue-4.10/brcmfmac-use-local-iftype-avoiding-use-after-free-of-virtual-interface.patch queue-4.10/drm-vmwgfx-remove-getparam-error-message.patch queue-4.10/mac80211-unconditionally-start-new-netdev-queues-with-itxq-support.patch queue-4.10/dm-verity-fec-fix-bufio-leaks.patch queue-4.10/hid-wacom-don-t-apply-generic-settings-to-old-devices.patch queue-4.10/x86-mce-don-t-print-mces-when-mcelog-is-active.patch queue-4.10/arm-kernel-add-smc-structure-parameter.patch queue-4.10/usb-storage-add-ignore-residue-quirk-for-initio-inic-3619.patch queue-4.10/drm-vmwgfx-type-check-lookups-of-fence-objects.patch queue-4.10/dm-verity-fec-limit-error-correction-recursion.patch queue-4.10/drm-edid-constify-edid-quirk-list.patch queue-4.10/s390-uaccess-get_user-should-zero-on-failure-again.patch queue-4.10/dm-raid-fix-null-pointer-dereference-for-raid1-without-bitmap.patch queue-4.10/random-use-chacha20-for-get_random_int-long.patch queue-4.10/ptrace-fix-ptrace_listen-race-corrupting-task-state.patch queue-4.10/drm-vmwgfx-fix-integer-overflow-in-vmw_surface_define_ioctl.patch queue-4.10/pci-sort-the-list-of-devices-with-d3-delay-quirk-by-id.patch queue-4.10/s390-decompressor-fix-initrd-corruption-caused-by-bss-clear.patch queue-4.10/pci-disable-msi-for-hisilicon-hip06-hip07-root-ports.patch queue-4.10/mips-check-tlb-before-handle_ri_rdhwr-for-loongson-3.patch queue-4.10/pci-add-acs-quirk-for-intel-union-point.patch queue-4.10/asoc-intel-baytrail-add-quirk-for-lenovo-thinkpad-10.patch queue-4.10/can-flexcan-add-quirk-flexcan_quirk_enable_eacen_rrs.patch queue-4.10/metag-usercopy-drop-unused-macros.patch queue-4.10/drm-i915-more-.is_mobile-cleanups-for-bdw.patch queue-4.10/hid-multitouch-enable-the-surface-4-type-cover-pro-jp-to-report-multitouch-data.patch queue-4.10/iio-bmg160-reset-chip-when-probing.patch queue-4.10/orangefs-move-features-validation-to-fix-filesystem-hang.patch queue-4.10/arm64-mm-unaligned-access-by-user-land-should-be-received-as-sigbus.patch queue-4.10/powerpc-don-t-try-to-fix-up-misaligned-load-with-reservation-instructions.patch queue-4.10/usb-chipidea-msm-rely-on-core-to-override-ahbburst.patch queue-4.10/asoc-intel-bytcr_rt5640-quirks-for-insyde-devices.patch queue-4.10/mips-lantiq-fix-missing-xbar-kernel-panic.patch queue-4.10/metag-usercopy-zero-rest-of-buffer-from-copy_from_user.patch queue-4.10/xfs-honor-falloc_fl_keep_size-when-punching-ends-of-files.patch queue-4.10/metag-usercopy-fix-alignment-error-checking.patch queue-4.10/x86-reboot-quirks-add-asus-eeebook-x205ta-reboot-quirk.patch queue-4.10/iio-core-fix-iio_val_fractional_log2-for-negative-values.patch queue-4.10/pci-xgene-fix-double-free-on-init-error.patch queue-4.10/acpi-save-nvs-memory-for-lenovo-g50-45.patch queue-4.10/asoc-intel-cht_bsw_rt5645-harden-acpi-device-detection.patch queue-4.10/sata-ahci-da850-implement-a-workaround-for-the-softreset-quirk.patch queue-4.10/reset-treeid-to-zero-on-smb2-tree_connect.patch queue-4.10/pci-add-acs-quirk-for-qualcomm-qdf2400-and-qdf2432.patch queue-4.10/tools-power-turbostat-decode-baytrail-cc6-and-mc6-demotion-configuration.patch queue-4.10/documentation-stable-kernel-rules-fix-stable-tag-format.patch queue-4.10/drm-mga-remove-device_is_agp-callback.patch queue-4.10/usb-host-xhci-plat-enable-broken_ped-quirk-if-platform-requested.patch queue-4.10/mm-mempolicy.c-fix-error-handling-in-set_mempolicy-and-mbind.patch queue-4.10/arm-arm64-kvm-take-mmap_sem-in-stage2_unmap_vm.patch queue-4.10/mm-page_alloc.c-fix-print-order-in-show_free_areas.patch queue-4.10/usb-dwc3-host-pass-quirk-broken-port-ped-property-for-known-broken-revisions.patch queue-4.10/kvm-fix-page-struct-leak-in-handle_vmon.patch queue-4.10/arm-smccc-update-hvc-comment-to-describe-new-quirk-parameter.patch queue-4.10/mips-c-r4k-fix-loongson-3-s-vcache-scache-waysize-calculation.patch queue-4.10/drm-vmwgfx-avoid-calling-vzalloc-with-a-0-size-in-vmw_get_cap_3d_ioctl.patch queue-4.10/usb-xhci-add-quirk-flag-for-broken-ped-bits.patch queue-4.10/mips-force-o32-fp64-support-on-32bit-mips64r6-kernels.patch queue-4.10/arm-davinci-add-skeleton-for-pdata-quirks.patch queue-4.10/usb-dwc3-gadget-delay-unmap-of-bounced-requests.patch queue-4.10/x86-reboot-quirks-fix-typo-in-asus-eeebook-x205ta-reboot-quirk.patch queue-4.10/mips-add-mips_cpu_ftlb-for-loongson-3a-r2.patch queue-4.10/kbuild-use-cc-disable-warning-consistently-for-maybe-uninitialized.patch queue-4.10/arm-omap2-fix-init-for-multiple-quirks-for-the-same-soc.patch queue-4.10/x86-reboot-quirks-add-asus-eeebook-x205ta-w-reboot-quirk.patch queue-4.10/drm-i915-kvmgt-fix-suspicious-rcu-dereference-usage.patch queue-4.10/acpi-scan-prefer-devices-without-_hid-for-_adr-matching.patch queue-4.10/drm-ttm-drm-vmwgfx-relax-permission-checking-when-opening-surfaces.patch queue-4.10/drm-vmwgfx-null-pointer-dereference-in-vmw_surface_define_ioctl.patch queue-4.10/asoc-sun4i-i2s-add-quirks-to-handle-a31-compatible.patch