From patchwork Thu Oct 15 21:05:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7409861 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4C2199F1D5 for ; Thu, 15 Oct 2015 21:05:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3DC442078B for ; Thu, 15 Oct 2015 21:05:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 156EE205F9 for ; Thu, 15 Oct 2015 21:05:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751850AbbJOVFj (ORCPT ); Thu, 15 Oct 2015 17:05:39 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:62171 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751244AbbJOVFi (ORCPT ); Thu, 15 Oct 2015 17:05:38 -0400 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue101) with ESMTPSA (Nemesis) id 0LlFaA-1aNoh110pq-00b6ik; Thu, 15 Oct 2015 23:05:33 +0200 From: Arnd Bergmann To: Andy Gross Cc: arm@kernel.org, Olof Johansson , linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [GIT PULL] qcom SoC changes for 4.4 *RESEND* Date: Thu, 15 Oct 2015 23:05:27 +0200 Message-ID: <5294153.vxTnuIq2gr@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1444860627-8258-1-git-send-email-agross@codeaurora.org> References: <1444860627-8258-1-git-send-email-agross@codeaurora.org> MIME-Version: 1.0 X-Provags-ID: V03:K0:WeYxqtjApiI+s92Nxv0lzxvSqwCUKmy7vJ9nP+tQanSqPqO6snT 9BrHqN+2RBNN1EksXcXIIc18o5E13Iz5OSQ6FxA2LyUOjaOA03IQBjq8kDASEP4wmUk9ehP pCY659Wl57lPy+AEqCLPSmcw3xC1XB/GkJdCMwUzP5VOrWYwvTgAwD8V0/57qbtNt/nhSIw 4WSRSz2ahM95S7x68YiKg== X-UI-Out-Filterresults: notjunk:1; V01:K0:RuIrzgydylQ=:Hdo3asCesm7q7RRbk6107c SFroEMvEESdPmEdRnW2Qd23pXEWl7tczc1NKBjNq2zqOXxyPOfs6s3lSYYYQ1fr1uzBRUgVzI P0cE6+OftXZH6JBjyPylt4Slt9Nizw7ImBhGNL4SGHsF3Tzicbk+mz3a6s28xwCb0gRWHZlm0 hOfOdlW8RbDjlwJPf+LZuojigfJevLCsE7n3KJiGv4+pZveA0JlIVTbHOmya2jUbk7uDDldIi OBYv7xVBIJ0j8DMWCQCN5xtDN3ichR+C6uE8397Z5eiR4SxY7RWaRDGFzDuvyfQ0n/mNf0Z8W GbAEKEml8npcffP/4XaZUy2ZS1N4zPig0598cumUHCrFjtl+fZrYjCmKWugojxPe6QdmgSdW6 cc5ONFb3Mhn7D10GNbaB+3MaJ9bhFCDXcalwLV/I1+kO7DgQx/KffuuEzxtC6yOamVMc8gDBV 5X5cNw8i2PP9dFpCFl/QvWW2bOl3btHrzljzboQM7wXVihz90Zr/nY2rmuKgQgR41i/Q+5V1Z 3E9iVevUtnaa73tJNQO00MfE418mPEUvv6GVj7Ekb3rHvAMAuCmo9FUzSx3HCXn0X8DHItBU2 XH5GVfz7NVsy/rz5G9SOVKLHgZCeWkB+O8zRyPgWbuzOahf8Qfx/4N+08CYnEj/1TAdRsQUfG ulN618DJK5DjfchyssUprDNkRyV8vUnXcMf9CG3GLzd4Srizj+Ebn5GMbPmZUCfVYK4Px35YP bCFzDHuwMofnPnf5 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wednesday 14 October 2015 17:10:27 Andy Gross wrote: > Qualcomm ARM Based SoC Updates for 4.4 > > * Implement id_table driver matching in SMD > * Avoid NULL pointer exception on remove of SMEM > * Reorder SMEM/SMD configs > * Make qcom_smem_get() return a pointer > * Handle big endian CPUs correctly in SMEM > * Represent SMD channel layout in structures > * Use __iowrite32_copy() in SMD > * Remove use of VLAIs in SMD > * Handle big endian CPUs correctly in SMD/RPM > * Handle big endian CPUs corretly in SMD > * Reject sending SMD packets that are too large > * Fix endianness issue in SCM __qcom_scm_is_call_available > * Add missing prototype for qcom_scm_is_available() > * Correct SMEM items for upper channels > * Use architecture level to build SCM correctly > * Delete unneeded of_node_put in SMD > * Correct active/slep state flagging in SMD/RPM > * Move RPM message ram out of SMEM DT node > Pulled into next/drivers, but please try to make the changelogs more readable in the future. No point listing each small patch here, instead say what you've done overall and what the major things are. Right now, the merge commit just duplicates the information like this: commit 90bb7e0e4f1ad8714f39db232ef14c588297346d Merge: 5462b10af11d d0bfd7c9b162 Author: Arnd Bergmann Date: Thu Oct 15 22:56:52 2015 +0200 Merge tag 'qcom-soc-for-4.4' of git://codeaurora.org/quic/kernel/agross-msm into next/drivers Pull "Qualcomm ARM Based SoC Updates for 4.4" from Andy Gross: * Implement id_table driver matching in SMD * Avoid NULL pointer exception on remove of SMEM * Reorder SMEM/SMD configs * Make qcom_smem_get() return a pointer * Handle big endian CPUs correctly in SMEM * Represent SMD channel layout in structures * Use __iowrite32_copy() in SMD * Remove use of VLAIs in SMD * Handle big endian CPUs correctly in SMD/RPM * Handle big endian CPUs corretly in SMD * Reject sending SMD packets that are too large * Fix endianness issue in SCM __qcom_scm_is_call_available * Add missing prototype for qcom_scm_is_available() * Correct SMEM items for upper channels * Use architecture level to build SCM correctly * Delete unneeded of_node_put in SMD * Correct active/slep state flagging in SMD/RPM * Move RPM message ram out of SMEM DT node * tag 'qcom-soc-for-4.4' of git://codeaurora.org/quic/kernel/agross-msm: soc: qcom: smem: Move RPM message ram out of smem DT node soc: qcom: smd-rpm: Correct the active vs sleep state flagging soc: qcom: smd: delete unneeded of_node_put firmware: qcom-scm: build for correct architecture level soc: qcom: smd: Correct SMEM items for upper channels qcom-scm: add missing prototype for qcom_scm_is_available() qcom-scm: fix endianess issue in __qcom_scm_is_call_available soc: qcom: smd: Reject send of too big packets soc: qcom: smd: Handle big endian CPUs soc: qcom: smd_rpm: Handle big endian CPUs soc: qcom: smd: Remove use of VLAIS soc: qcom: smd: Use __iowrite32_copy() instead of open-coding it soc: qcom: smd: Represent channel layout in structures soc: qcom: smem: Handle big endian CPUs soc: qcom: Make qcom_smem_get() return a pointer soc: qcom: Reorder SMEM/SMD configs soc: qcom: smem: Avoid NULL pointer exception on remove soc: qcom: smd: Implement id_table driver matching which looks a bit silly. This also seemed like the right place to add a bugfix that I had in my queue: commit 73ebb85444b0472d90bb70a1a9e6b5df3f92c14c Author: Arnd Bergmann Date: Tue Oct 13 17:05:39 2015 +0200 soc: qcom/smem: add HWSPINLOCK dependency This fixes a build error when smem is enabled without hwspinlock: drivers/built-in.o: In function `qcom_smem_alloc': rockchip-efuse.c:(.text+0x7a3e4): undefined reference to `__hwspin_lock_timeout' rockchip-efuse.c:(.text+0x7a568): undefined reference to `__hwspin_unlock' drivers/built-in.o: In function `qcom_smem_remove': rockchip-efuse.c:(.text+0x7a5cc): undefined reference to `hwspin_lock_free' drivers/built-in.o: In function `qcom_smem_probe': rockchip-efuse.c:(.text+0x7a960): undefined reference to `hwspin_lock_request_specific' rockchip-efuse.c:(.text+0x7a988): undefined reference to `of_hwspin_lock_get_id' drivers/built-in.o: In function `qcom_smem_get': rockchip-efuse.c:(.text+0x7aa24): undefined reference to `__hwspin_lock_timeout' rockchip-efuse.c:(.text+0x7aafc): undefined reference to `__hwspin_unlock' Signed-off-by: Arnd Bergmann and I applied that on top. Arnd --- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" 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/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 3e4d2133c3d2..eec76141d9b9 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -22,6 +22,7 @@ config QCOM_PM config QCOM_SMEM tristate "Qualcomm Shared Memory Manager (SMEM)" depends on ARCH_QCOM + depends on HWSPINLOCK help Say y here to enable support for the Qualcomm Shared Memory Manager. The driver provides an interface to items in a heap shared among all