From patchwork Tue Jul 14 18:42:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 235543 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3990236ilg; Tue, 14 Jul 2020 11:54:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwl6MfZFIx+08SiPwbD/fCDx1ZYcwJ6ZdJmGxbnb/r/5BhyUETl7sC9SNOIYWBXvepKG0hR X-Received: by 2002:aa7:df16:: with SMTP id c22mr5762177edy.388.1594752866500; Tue, 14 Jul 2020 11:54:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594752866; cv=none; d=google.com; s=arc-20160816; b=pfZNMB4d2V81kjVppuu+T3C6asFOGDRuIy6GrDzdkz1UfSjrIC+8kQedOVzgqsPT19 9KY+eEXF86hW1vmZECCx5BYSAE91uR8uF7qUiRyJ7gAO3PLSWfiLybZqRvRXOWqE++kf uniTtwrXmOQ6v2i8l4z2lAtQqb+aa/6lUaFvOqgQ+n1TO0xSzgnKvVI9LUca9zhHn5AN XojY0KFmrUehg7SJl/MiyTTkobehuPrezaNbFsOZ0nQ6LdTUVmCQYjRmMNYVU9HlkAdc c/3zTYrjK1KXiN8gufH/Ka7na+yO1y5He46O9/V4liK81CRGAVMucBsovKUg8iNzDeRq pQYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GdfNC89gUy9vVdxaRCD+y4uUzEbg7kPEWMqbeEcEI6E=; b=uHrgv7HImgGclVjJQ7GY+x+1XmIjZ/y4u3SB5t6TlFjuXjh7iWnzJT6tt3PNydXNfh X71IOof/yez/Ptzn2gSVSicqjebNC/ZngbcFCxaIGoOqes2Wk1jK1yAULzYIm3fxmtu3 nJe0QVAuKpn/Tstf1EOQrwuX9Wv0fw+tvun17MOMgCaHS+81ECh2CoVGamsL/NoifnuU mY+ZdXSFnjaPN4NQrCQUT33jKSDHlC8xKsKF/IkA1txu8+ihMzoOl8gHfIpOWUXoIt/J cmKIB7heykNKX+il99ss7VzoDhQ4lEgHc7exhjKa//1/qGiXQD/RV4+CF4TIySWossIk Iq6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TGlqMsA0; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id va7si11392538ejb.55.2020.07.14.11.54.26; Tue, 14 Jul 2020 11:54:26 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TGlqMsA0; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730342AbgGNSyX (ORCPT + 15 others); Tue, 14 Jul 2020 14:54:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:51796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730340AbgGNSyW (ORCPT ); Tue, 14 Jul 2020 14:54:22 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8E55522BEB; Tue, 14 Jul 2020 18:54:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752862; bh=RE38XazNYCwzs9eu9smfOGnUknFmGMxPfCedVsBQs2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TGlqMsA0Sot+P2y1LZfgO2M8At5LmYO6aGmDC25CIpsc1k6LRbLX2QTGWF3fQh12o 2/ILn98C+OWfOCgj4T+AipUTDvAxiGQaNCLRv+iRJZhq+8Jpgqcf7/2/aLPykyUs5g vbVjdepSwPO7/Myl2Z7qhi/YBHITqDLdvmupp7Ys= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Sam Ravnborg , Sasha Levin Subject: [PATCH 5.7 014/166] drm: mcde: Fix display initialization problem Date: Tue, 14 Jul 2020 20:42:59 +0200 Message-Id: <20200714184116.579691657@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit b984b6d8b52372b98cce0a6ff6c2787f50665b87 ] The following bug appeared in the MCDE driver/display initialization during the recent merge window. First the place we call drm_fbdev_generic_setup() in the wrong place: this needs to be called AFTER calling drm_dev_register() else we get this splat: ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at ../drivers/gpu/drm/drm_fb_helper.c:2198 drm_fbdev_generic_setup+0x164/0x1a8 mcde a0350000.mcde: Device has not been registered. Modules linked in: Hardware name: ST-Ericsson Ux5x0 platform (Device Tree Support) [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [] (show_stack) from [] (dump_stack+0x9c/0xb0) [] (dump_stack) from [] (__warn+0xb8/0xd0) [] (__warn) from [] (warn_slowpath_fmt+0x74/0xb8) [] (warn_slowpath_fmt) from [] (drm_fbdev_generic_setup+0x164/0x1a8) [] (drm_fbdev_generic_setup) from [] (mcde_drm_bind+0xc4/0x160) [] (mcde_drm_bind) from [] (try_to_bring_up_master+0x15c/0x1a4) (...) Signed-off-by: Linus Walleij Reviewed-by: Sam Ravnborg Link: https://patchwork.freedesktop.org/patch/msgid/20200613223027.4189309-1-linus.walleij@linaro.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/mcde/mcde_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c index f28cb7a576ba4..1e7c5aa4d5e62 100644 --- a/drivers/gpu/drm/mcde/mcde_drv.c +++ b/drivers/gpu/drm/mcde/mcde_drv.c @@ -208,7 +208,6 @@ static int mcde_modeset_init(struct drm_device *drm) drm_mode_config_reset(drm); drm_kms_helper_poll_init(drm); - drm_fbdev_generic_setup(drm, 32); return 0; @@ -275,6 +274,8 @@ static int mcde_drm_bind(struct device *dev) if (ret < 0) goto unbind; + drm_fbdev_generic_setup(drm, 32); + return 0; unbind: From patchwork Tue Jul 14 18:43:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 235544 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3990803ilg; Tue, 14 Jul 2020 11:55:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQZPb9auOZr0iqJpz66/YWkPwBG5ha5TmBsJu+b9mTfVrOGIKV8oZKQBgpmQ+3M+KSS8Gj X-Received: by 2002:a50:9b5d:: with SMTP id a29mr5953674edj.68.1594752930014; Tue, 14 Jul 2020 11:55:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594752930; cv=none; d=google.com; s=arc-20160816; b=RjcswTuhFXsherPf6ylPWqFTFAyo5HCICx/RT8xUwYaWwjXsKQ9CUqVdxFE5MJitt4 OLS9wvBZL7wl0o/HQWtpAg3Ieuh56V5l3+vtQ9cuwEfXk0uC8gCAw+FbC4UompTov4Qd kCNExD99zAMMcBlVsOlLdLaxUDZ5Mh9PQzfg6ryJMEcTd3+0tiaXr8W9tRnx9eo2Ybdz 1pYj36Hme+0bsA3lkrPF0X/U8PR76Wd0hSFtQ1WpPNYvIbczwQdue/bDC00Yy+fh8ME+ TPlGG7jfex+KhBBm6RGfpxJM2aH3pTK3ZNgbDaOT6xPY3SZAZiIRMe80kkE5jinkl93q M1PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KK2wWvtM09s7BymlwQ0zdF1/WZSE6B2AHq1SfLX5ep8=; b=o8ctsb2a3t4NSySq4KgC9kNUv/GZRU9iI1hES/JwKNvz46CP0DiNL9KCLtRvqb6OKK KcC0nZSOm/jguj5IWTz6iJNWi8UGEp9XXu2NreZOJjWjw5M0QUzVuHaOpMbCMDf5Htk4 lfaI2JljOcRzQiowj7Vn31reKAjFa9Tsz4f3MSRRJLF/lmsgSLtPanxC67f0kgTNAMHy nQznT7S7TTLxtGEUzBPmbM9g5LTeO5LFM5NmMmFxWD4TTfGs80FWQA90vc87ls8n3TTc /HoA0fuSy/rO8LtgWUb3bZxnlAyVl72bPKVqI3VEZ+77/cLur0HdP7Fd1bxM39CJ5aiU Hing== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="0/NEpk9V"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x15si11294833ejc.115.2020.07.14.11.55.29; Tue, 14 Jul 2020 11:55:30 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="0/NEpk9V"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730854AbgGNSz1 (ORCPT + 15 others); Tue, 14 Jul 2020 14:55:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:53054 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730859AbgGNSzV (ORCPT ); Tue, 14 Jul 2020 14:55:21 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D4BB221D79; Tue, 14 Jul 2020 18:55:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752921; bh=YPWW6g2bZlQUgqHk1g+1fzvKYQHRfjq3261t+6B+jPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0/NEpk9VF+ixEBFshFAjSk3Z76aATTXWZ7+b3fm3XKkS589gr3H5FlW6WH6S1RpSg xeUwzbQ+OaPSNLMLnYnTVi9M+BsrPG+TZb9DpDyemKY2VjSa7lezUAFOTjqHDz5vKq 988ihwdifPQCrC3vxuuf37JeTZFtoLpOQsVaYtQA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shengjiu Wang , Nicolin Chen , Mark Brown , Sasha Levin Subject: [PATCH 5.7 051/166] ASoC: fsl_mqs: Dont check clock is NULL before calling clk API Date: Tue, 14 Jul 2020 20:43:36 +0200 Message-Id: <20200714184118.321222867@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shengjiu Wang [ Upstream commit adf46113a608d9515801997fc96cbfe8ffa89ed3 ] Because clk_prepare_enable and clk_disable_unprepare should check input clock parameter is NULL or not internally, then we don't need to check them before calling the function. Fixes: 9e28f6532c61 ("ASoC: fsl_mqs: Add MQS component driver") Signed-off-by: Shengjiu Wang Acked-by: Nicolin Chen Link: https://lore.kernel.org/r/743be216bd504c26e8d45d5ce4a84561b67a122b.1592888591.git.shengjiu.wang@nxp.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/fsl/fsl_mqs.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) -- 2.25.1 diff --git a/sound/soc/fsl/fsl_mqs.c b/sound/soc/fsl/fsl_mqs.c index 0c813a45bba7c..b44b134390a39 100644 --- a/sound/soc/fsl/fsl_mqs.c +++ b/sound/soc/fsl/fsl_mqs.c @@ -266,11 +266,9 @@ static int fsl_mqs_runtime_resume(struct device *dev) { struct fsl_mqs *mqs_priv = dev_get_drvdata(dev); - if (mqs_priv->ipg) - clk_prepare_enable(mqs_priv->ipg); + clk_prepare_enable(mqs_priv->ipg); - if (mqs_priv->mclk) - clk_prepare_enable(mqs_priv->mclk); + clk_prepare_enable(mqs_priv->mclk); if (mqs_priv->use_gpr) regmap_write(mqs_priv->regmap, IOMUXC_GPR2, @@ -292,11 +290,8 @@ static int fsl_mqs_runtime_suspend(struct device *dev) regmap_read(mqs_priv->regmap, REG_MQS_CTRL, &mqs_priv->reg_mqs_ctrl); - if (mqs_priv->mclk) - clk_disable_unprepare(mqs_priv->mclk); - - if (mqs_priv->ipg) - clk_disable_unprepare(mqs_priv->ipg); + clk_disable_unprepare(mqs_priv->mclk); + clk_disable_unprepare(mqs_priv->ipg); return 0; } From patchwork Tue Jul 14 18:43:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 235548 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3998271ilg; Tue, 14 Jul 2020 12:05:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxHU1QwFGoL9YRMc4FqA+Ujl41bUekrl1Ctl1NA6BzWNeOHbRIV5EcF4RCZq/MwQxrgn4C X-Received: by 2002:a17:906:e2ca:: with SMTP id gr10mr5730101ejb.81.1594753504871; Tue, 14 Jul 2020 12:05:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753504; cv=none; d=google.com; s=arc-20160816; b=fmUa5xWg37b9sItRrHlCQD+Xu87l8SgRB6TI/HM4kMF7JA12aykMlFUxR6b3CdUHbZ GuT50zktjBKXkM7FVLhYgY10ubh3/psf0ZhQBAt8Md7M2h1ktTQrpVLgln1aGu9zpJHV /gozy0kfEFNyqY982VJWDKwo8ebAX5Ol3TWfPrZBF6++AXh3pGQeT+levmvIFfJ7NKQi jcE8JYwBkUdzWf5jsIKgaDSuSx+lYFdUriDAhRAScZKYg2n6tXmEOuY2FQIhcod23urx gq2pn71sFjxUyZ8LwxXIs83DD99NzHaVQPe9ywEbbQfvHuflOQZCM27/D2uS3x0BFFrd AKmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gjjvJAXTNrOlxZSSp4/oK7kqKlIe33DeMfkpTE+oVTM=; b=I4YYwHLZXR1WU5NB4SIBpLh1LE7I1ymaZx0/+Bju76cd+IxjVkOMAiWlr8nTHyJ4GX OhROEmZTzrO/OWqdjHT1cnYVsW8zHMYnb8kKPbdGBUZAKoGOCx7tKDAdPhyqCzevWFvT FTVbvZ2PZambndf5MMXAM4t7btlC4O8uJ9uKkQotxwgNE3dPiGcKKP8TpX5ak6sOmGw8 ZaifjyHXzsPCkM4Pl2TWEvt7ge0HGguWWHhlMybT92CK84+77ekrdWjEDDqEcWqzr/jW DESNDA+AsX82ItRIOkAzI8Bq8fdTNl4pw+qMxD/mv6r7p0n6bO9/s0prXA7BaTJc9RLW ykQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="V/nIzGaW"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dn22si12981381edb.477.2020.07.14.12.05.04; Tue, 14 Jul 2020 12:05:04 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="V/nIzGaW"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730052AbgGNSz1 (ORCPT + 15 others); Tue, 14 Jul 2020 14:55:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:53098 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730223AbgGNSzY (ORCPT ); Tue, 14 Jul 2020 14:55:24 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C346B222B9; Tue, 14 Jul 2020 18:55:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752924; bh=kFlVpf3xsjPd5uBp1qmNbTQ/O1AJA5LuZSfT32sZWqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V/nIzGaW1hnAueh9v7Fp/dvKiW0wkldy9pM6iJaf8rQL+KVMRgdLEXo5YDFMSLcoJ AkGIMu7JhewlsU6cnzJmCdm1JedsEmifgGswLz2Hz2YWlNbHt8nmcg+RMA0amqPknL veHTq+QGdUJ8kHGbnpdQTvvpnx3nVew0VsKGDqRE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shengjiu Wang , Nicolin Chen , Mark Brown , Sasha Levin Subject: [PATCH 5.7 052/166] ASoC: fsl_mqs: Fix unchecked return value for clk_prepare_enable Date: Tue, 14 Jul 2020 20:43:37 +0200 Message-Id: <20200714184118.368907272@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shengjiu Wang [ Upstream commit 15217d170a4461c1d4c1ea7c497e1fc1122e42a9 ] Fix unchecked return value for clk_prepare_enable, add error handler in fsl_mqs_runtime_resume. Fixes: 9e28f6532c61 ("ASoC: fsl_mqs: Add MQS component driver") Signed-off-by: Shengjiu Wang Acked-by: Nicolin Chen Link: https://lore.kernel.org/r/5edd68d03def367d96268f1a9a00bd528ea5aaf2.1592888591.git.shengjiu.wang@nxp.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/fsl/fsl_mqs.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/sound/soc/fsl/fsl_mqs.c b/sound/soc/fsl/fsl_mqs.c index b44b134390a39..69aeb0e71844d 100644 --- a/sound/soc/fsl/fsl_mqs.c +++ b/sound/soc/fsl/fsl_mqs.c @@ -265,10 +265,20 @@ static int fsl_mqs_remove(struct platform_device *pdev) static int fsl_mqs_runtime_resume(struct device *dev) { struct fsl_mqs *mqs_priv = dev_get_drvdata(dev); + int ret; - clk_prepare_enable(mqs_priv->ipg); + ret = clk_prepare_enable(mqs_priv->ipg); + if (ret) { + dev_err(dev, "failed to enable ipg clock\n"); + return ret; + } - clk_prepare_enable(mqs_priv->mclk); + ret = clk_prepare_enable(mqs_priv->mclk); + if (ret) { + dev_err(dev, "failed to enable mclk clock\n"); + clk_disable_unprepare(mqs_priv->ipg); + return ret; + } if (mqs_priv->use_gpr) regmap_write(mqs_priv->regmap, IOMUXC_GPR2, From patchwork Tue Jul 14 18:43:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 235546 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3997073ilg; Tue, 14 Jul 2020 12:03:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjKsqWeyg2Lua7nWQtvmvKfn4+KlW8H3ie3UNhKAC+QQXq2/uib0Enj9yYnwSPf5xI26j/ X-Received: by 2002:a17:906:ef2:: with SMTP id x18mr5618027eji.547.1594753424662; Tue, 14 Jul 2020 12:03:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753424; cv=none; d=google.com; s=arc-20160816; b=xnpiMP/f1AKgRlICNNcUETM+7hzxnHT1qOy06fxRWaoteRpGYpUn/smtU+ba7veB3f eJ7lVtjU8RoEXieUEyWvqDQlplm6QlmxjGHRgbUEmHplVehDnnXB61L/dtOwIZzvBm1z ci7M5KNvLRJCqKiIzb1P1jWsHEyjcMLYobb+vLVixlTqmcY66WqA88MjrLj6zhLU1+Yv ayRjUukvflDBcHkTT5YAnS6a45OBX9lCl2YF+NmXRRLx9ZtxVeYNZiidjFQtS56E5vUO Mts+dd8TT8yGnyexwDgIA9XLbhT5X9gn/RN+K0BYyjwcK4W2nwg/cqrx7AXKfvQWb2i+ /tIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9srZoSYJBknR+Z8Dmt++BJk3zXkDqPAhIsSmoeU9seE=; b=KiECELpkVKOlAPLmKgVBhO/Fn5zxZMz31+hJgb643tAT/3B3WFKog6EZ/QFhUZqXFH sTPszSzZN+TguLhQQHfQCdrRcDZkYeVvqGWWaQH+mIIx9/wqU+1KRRBwT4ssJsqijQSG TidT6/SpMLmZrm1CYcNuUDRNNTdpEZT1R7mSMwBTq+xsT0RTp54ZyOY5Ja3iESHUKaeb mlSNbxEg/2glcgWP+mzJgIOtBsiBHtmF0s2fr1DbKb1TIg1T9CfsISMGOfFCkU+2jXVc tSrVJE/XKx3xULmGVo+leQxRzKImch7m33fwAd8nIRfH1ZjvKEOA/moZfPyo2iAxonj8 lrnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MtvJYiYF; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v6si11223262ejr.238.2020.07.14.12.03.44; Tue, 14 Jul 2020 12:03:44 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MtvJYiYF; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731065AbgGNTDj (ORCPT + 15 others); Tue, 14 Jul 2020 15:03:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:55392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730678AbgGNS5L (ORCPT ); Tue, 14 Jul 2020 14:57:11 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0C368229CA; Tue, 14 Jul 2020 18:57:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753031; bh=kcbW/+42tbYkeYEzHPoKqQt2cffnqTQdX15gHcEcuBg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MtvJYiYFkXpugTUpLBFuhyx3mJGyEm3c7btP2Fsg1SjvA9BR9oL2TWe1lFPS4OIem yn/cywKtzW8k6FcMnTL3Fe8ZJOcdXbDtmL/x8I0rltxQvYL57yOBf8Ojw9DX5dwt8p fLoJmUmPFqjq4m9FCUALD+iz7obnQJKkavjv5P8g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Elder , "David S. Miller" , Sasha Levin Subject: [PATCH 5.7 063/166] net: ipa: no checksum offload for SDM845 LAN RX Date: Tue, 14 Jul 2020 20:43:48 +0200 Message-Id: <20200714184118.882833458@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alex Elder [ Upstream commit 41af5436e857ec64f302fcc9b6e4a8c526b6b402 ] The AP LAN RX endpoint should not have download checksum offload enabled. The receive handler does properly accommodate the trailer that's added by the hardware, but we ignore it. Fixes: 1ed7d0c0fdba ("soc: qcom: ipa: configuration data") Signed-off-by: Alex Elder Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ipa/ipa_data-sdm845.c | 1 - 1 file changed, 1 deletion(-) -- 2.25.1 diff --git a/drivers/net/ipa/ipa_data-sdm845.c b/drivers/net/ipa/ipa_data-sdm845.c index 0d9c36e1e806c..0917c5b028f67 100644 --- a/drivers/net/ipa/ipa_data-sdm845.c +++ b/drivers/net/ipa/ipa_data-sdm845.c @@ -44,7 +44,6 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = { .endpoint = { .seq_type = IPA_SEQ_INVALID, .config = { - .checksum = true, .aggregation = true, .status_enable = true, .rx = { From patchwork Tue Jul 14 18:44:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 235545 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3991704ilg; Tue, 14 Jul 2020 11:56:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRGWQqcJmoOPgZgoNPPkLDQCB6z4nQzwZFwLboC1oNDwaikTebJiIFdXyUTvBS2ZD3AM49 X-Received: by 2002:a17:906:6d0e:: with SMTP id m14mr5752035ejr.251.1594753007525; Tue, 14 Jul 2020 11:56:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753007; cv=none; d=google.com; s=arc-20160816; b=kS2XgBx2AFz9XXxNfvnfvIkm5i1CxYFUAiRW/Kn/7X0csSBOTcOzHjx/3zxsJL4+ks YQOgUqh4IVo8Aw2QmnM31XBcL8iCNExD/Iau+bBMLgOybzRq+d4Xmzm0zHjYYdtxFcW4 sZbUqDIohIdm1jquSixPjUSilUuuwReyesqKyHk6Bp45mjNL4CIjE3rIJR1Ysx1DFKHs yvy/U8P4x8mL4mZ1bODx4fUa04VyuPQSLEwHVW0Wkt9qPwBlgIP2SNocsMAD6bEGFbJD UCD+T8bOdHzKf2ujbS+KdmCVcapa2XC1bYdi/v6IfbQXgujbpn5yWOFie6DXhFL/jSRs BHtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AaIDgUShqShL1I6y+96rzReftKH3tY54/z5KcXGmKT4=; b=ySeLir1CVwhp0v48J+SHw7ExqMqlgZjXGRZ7PflVMtmxZJJPBYlq7rKjVBWiBmAeVy SBBxsTv0qx8fLQugkI7xBQFpcxjQBdYvzItt/5rMqIuSW9bCqbJ9p+xDHPlZ3fvHF2Eg yXv0UQYuZs1X6/qqNo/y+coIta6lFRlz1DELvDg5he/1hatZJv4nRVEudKuIkjsSWYc6 zcPGjlc5AFK16/E6IBNsNqTUWXF3XSDCi0GVKQ1Rw1BBHnNRTg/O9DNSBh94jdBVAWxx pY9xBdtp70RaVdn2BVZOI9AKvaMmEoDzZh/HR2mHR7tTWyTgH+4yVI1DdU3rn2L5FgGp fQcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JlPkGaq5; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d9si11491648edv.44.2020.07.14.11.56.47; Tue, 14 Jul 2020 11:56:47 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JlPkGaq5; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730999AbgGNS4o (ORCPT + 15 others); Tue, 14 Jul 2020 14:56:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:54778 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731016AbgGNS4l (ORCPT ); Tue, 14 Jul 2020 14:56:41 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7997822B2B; Tue, 14 Jul 2020 18:56:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753000; bh=O55MKtwfA5IXcUbKUaOpt+8HOJH5TjW70tZuZMRkTVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JlPkGaq5Oa6KE72ItYbZpWMIWsH6yvAn5yG39/JPeeo+L3umgFYL/TPi5y22zEcv4 Si2ZtPMexWiAVAoGaKz7airLBQOcaXlB/95TdzBPB6Mi49lQsXAIhIuW+hyE5zOByM JQkoUqKQh/NK1gYxY/JwSgcy+PleGc1E//MUvMug= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla , Charles Keepax , Vinod Koul , Takashi Iwai , Sasha Levin Subject: [PATCH 5.7 081/166] ALSA: compress: fix partial_drain completion state Date: Tue, 14 Jul 2020 20:44:06 +0200 Message-Id: <20200714184119.729230376@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vinod Koul [ Upstream commit f79a732a8325dfbd570d87f1435019d7e5501c6d ] On partial_drain completion we should be in SNDRV_PCM_STATE_RUNNING state, so set that for partially draining streams in snd_compr_drain_notify() and use a flag for partially draining streams While at it, add locks for stream state change in snd_compr_drain_notify() as well. Fixes: f44f2a5417b2 ("ALSA: compress: fix drain calls blocking other compress functions (v6)") Reviewed-by: Srinivas Kandagatla Tested-by: Srinivas Kandagatla Reviewed-by: Charles Keepax Tested-by: Charles Keepax Signed-off-by: Vinod Koul Link: https://lore.kernel.org/r/20200629134737.105993-4-vkoul@kernel.org Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- include/sound/compress_driver.h | 10 +++++++++- sound/core/compress_offload.c | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h index 6ce8effa0b128..70cbc5095e725 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -66,6 +66,7 @@ struct snd_compr_runtime { * @direction: stream direction, playback/recording * @metadata_set: metadata set flag, true when set * @next_track: has userspace signal next track transition, true when set + * @partial_drain: undergoing partial_drain for stream, true when set * @private_data: pointer to DSP private data * @dma_buffer: allocated buffer if any */ @@ -78,6 +79,7 @@ struct snd_compr_stream { enum snd_compr_direction direction; bool metadata_set; bool next_track; + bool partial_drain; void *private_data; struct snd_dma_buffer dma_buffer; }; @@ -182,7 +184,13 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) if (snd_BUG_ON(!stream)) return; - stream->runtime->state = SNDRV_PCM_STATE_SETUP; + /* for partial_drain case we are back to running state on success */ + if (stream->partial_drain) { + stream->runtime->state = SNDRV_PCM_STATE_RUNNING; + stream->partial_drain = false; /* clear this flag as well */ + } else { + stream->runtime->state = SNDRV_PCM_STATE_SETUP; + } wake_up(&stream->runtime->sleep); } diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 509290f2efa8e..0e53f6f319167 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -764,6 +764,9 @@ static int snd_compr_stop(struct snd_compr_stream *stream) retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_STOP); if (!retval) { + /* clear flags and stop any drain wait */ + stream->partial_drain = false; + stream->metadata_set = false; snd_compr_drain_notify(stream); stream->runtime->total_bytes_available = 0; stream->runtime->total_bytes_transferred = 0; @@ -921,6 +924,7 @@ static int snd_compr_partial_drain(struct snd_compr_stream *stream) if (stream->next_track == false) return -EPERM; + stream->partial_drain = true; retval = stream->ops->trigger(stream, SND_COMPR_TRIGGER_PARTIAL_DRAIN); if (retval) { pr_debug("Partial drain returned failure\n"); From patchwork Tue Jul 14 18:44:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 235547 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3997322ilg; Tue, 14 Jul 2020 12:04:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwV7JofJcl0erE2PBDdqLcqrfAbScI74yjNoYq+HvqmRHcfuLLd0BQL8uUPKCvfCssqwpYp X-Received: by 2002:a50:cd1e:: with SMTP id z30mr5785899edi.364.1594753443632; Tue, 14 Jul 2020 12:04:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753443; cv=none; d=google.com; s=arc-20160816; b=OE88EL77S8kg0gtOvuA+lOGkMVSXr6D/GFHSgtgnuDoziUC33yP5vGLGR9O64B/pC8 a7hSX+yJtBjp7tOg5KZ912yGFrNdyokNI1KK4esffLN1XBM3m3wJlaaMNqPL2G8l9Kw3 O4e6ipfBGCiQsfuC9cFJ/3dsI6O/WikK9udhfeBViPpc0pFwGoN8tgMqTTC0r7KbWie6 uBbnU6947insKQsafb9GzsMucjEqY25LEomWJy8Pg/TCpQsEm5pzzzzbUCXkKUxugbU6 GkUDIn44h7iEPT6w49tcUXgVXrx+LZN0bGdKMXd+ny+rqgc+HojLMqumOr3eGhX+syKy yohw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=o5YoUmF+2HTSFbFIMzWG5/tecrbx+zzCPNHiktjd92Y=; b=D4YVzdx3ebYfKjI9LznfkMT3cmgIZ7dTZIcMcYcpGf7EcfpLG5XKT1F8Ju6L/dFlQu +wTABaHATdX+dPAP0UhvLKIUsgddkuFImUyrPwUUWfOrfC2xIzMUsM0YHiOZtF07fzbb G1umL2tPZoqVNsqRI7QPmWBvCG8O40FNucuI568TaJwzDUelRbfjZ7VlCIf6qf04XIGF jXYu9Chl5Nef47nT8JysLpMjTKRECUWvF0StTN1UpGb2YQSV7NP1hIcpqPiZ+hFPk3NU aAsrrpWCxs6GXCkRfLJFYpHzWKkmC/dh0Lq7/68nTnozCdZEOhZ96T84oVv54W+T0TS5 qUJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jPhT6Jto; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id qq26si11160360ejb.675.2020.07.14.12.04.03; Tue, 14 Jul 2020 12:04:03 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jPhT6Jto; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729627AbgGNTD6 (ORCPT + 15 others); Tue, 14 Jul 2020 15:03:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:54856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731023AbgGNS4n (ORCPT ); Tue, 14 Jul 2020 14:56:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DC317229CA; Tue, 14 Jul 2020 18:56:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753003; bh=qlLNvsE77hLkylIVZ+jK60slbvjQdGxm1kMv+RPlm5o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jPhT6JtopkOus+Ac6NAcjmC1RX1nmNAlG4ArKduCC9jfWsPrQGPkpTP22ZWp5mTCz SYDnxOQnIS/NbG+4w5JRJSfqwn22DIiL10towI7804ZN6LIgfugP4ska06TK4vTikP CgHNaJwIeDHJQYispopeGDUF/P8I5iuY8rcozLIQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Elder , "David S. Miller" , Sasha Levin Subject: [PATCH 5.7 082/166] net: ipa: fix QMI structure definition bugs Date: Tue, 14 Jul 2020 20:44:07 +0200 Message-Id: <20200714184119.779061934@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alex Elder [ Upstream commit 74478ea4ded519db35cb1f059948b1e713bb4abf ] Building with "W=1" did exactly what it was supposed to do, namely point out some suspicious-looking code to be verified not to contain bugs. Some QMI message structures defined in "ipa_qmi_msg.c" contained some bad field names (duplicating the "elem_size" field instead of defining the "offset" field), almost certainly due to copy/paste errors that weren't obvious in a scan of the code. Fix these bugs. Fixes: 530f9216a953 ("soc: qcom: ipa: AP/modem communications") Signed-off-by: Alex Elder Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ipa/ipa_qmi_msg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/drivers/net/ipa/ipa_qmi_msg.c b/drivers/net/ipa/ipa_qmi_msg.c index 03a1d0e559644..73413371e3d3e 100644 --- a/drivers/net/ipa/ipa_qmi_msg.c +++ b/drivers/net/ipa/ipa_qmi_msg.c @@ -119,7 +119,7 @@ struct qmi_elem_info ipa_driver_init_complete_rsp_ei[] = { sizeof_field(struct ipa_driver_init_complete_rsp, rsp), .tlv_type = 0x02, - .elem_size = offsetof(struct ipa_driver_init_complete_rsp, + .offset = offsetof(struct ipa_driver_init_complete_rsp, rsp), .ei_array = qmi_response_type_v01_ei, }, @@ -137,7 +137,7 @@ struct qmi_elem_info ipa_init_complete_ind_ei[] = { sizeof_field(struct ipa_init_complete_ind, status), .tlv_type = 0x02, - .elem_size = offsetof(struct ipa_init_complete_ind, + .offset = offsetof(struct ipa_init_complete_ind, status), .ei_array = qmi_response_type_v01_ei, }, @@ -218,7 +218,7 @@ struct qmi_elem_info ipa_init_modem_driver_req_ei[] = { sizeof_field(struct ipa_init_modem_driver_req, platform_type_valid), .tlv_type = 0x10, - .elem_size = offsetof(struct ipa_init_modem_driver_req, + .offset = offsetof(struct ipa_init_modem_driver_req, platform_type_valid), }, {