From patchwork Tue Oct 15 06:59:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 176369 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp5503817ill; Mon, 14 Oct 2019 23:59:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqyoHVhoqkRnHhqP9twPbJed0Y5St6PxKGtu69r2xMWD6u/1SgBLvN1oaHJskqd13+MZfrR8 X-Received: by 2002:a17:906:4a8d:: with SMTP id x13mr31680225eju.317.1571122782115; Mon, 14 Oct 2019 23:59:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571122782; cv=none; d=google.com; s=arc-20160816; b=c6ElEsbD47OROBsi0fxx1eABe3sBAE4T+Gb40tdksS3ADUHyXXKIMbftaWAUb/nu9i vnnA6T9MQPieDazc9piA3408hPfhJwQ/CitmA93LoSBLiLBY9pYqzVaI/ZH3Geo1ELJW chZTzERIz01OQ2L12YK27mgm3YRCIJt5nlfVr4oes4IhP6+Gh/n71Mu3wk6yWwUwQM+E urSeUdFmtu+HNZZq3zj8J5swZX3Oep3vPNc54X0NQQOLrRdN03fnjy5atsjxxgkxVGDX lRtoYkVHHcxfGFI1kvI+MEPV8kK1Oyumi14H0Ewe4U8SrxmgcN9OuVZogGotrL6U3RS3 N4Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=WEvY8mI7wziVLeSGskg+VNlvZA9UmNy6YweIvzpqB9w=; b=htyja3bRA/DN+uVMHrYaXwYT0lrBWoRA3h+kN72O4QP8jcd5TPcPCD1+a0ODLcsRNM bFXrfudo+fCp2IcltCOQoITc5SXsX0VufOyDXHc5vWp8quUY9+FGOX/2zU1cC53V5xGr mlptM7KuRRs6yh/r3/bQHq6q0Qa1tOhw2ldVxvEkmRIV0wjoi9u9ZFvkZBsYOJ/pSzE/ usvWuTM9daGaEaHFN74azkUWd/j+w214iox8sRyAyGINNWqhz7Fzg67GIOasknLJyIhp vkOvkbLbuslSaB7NRd6mzZnoLtCdM8eZqsAW4ujwb13xq2YaAiaFFsl7pDIDpln9GB+q 1Siw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YOT0SMP8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gl26si12428945ejb.17.2019.10.14.23.59.41; Mon, 14 Oct 2019 23:59:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YOT0SMP8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726163AbfJOG7k (ORCPT + 22 others); Tue, 15 Oct 2019 02:59:40 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:41901 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725710AbfJOG7k (ORCPT ); Tue, 15 Oct 2019 02:59:40 -0400 Received: by mail-pg1-f193.google.com with SMTP id t3so11531862pga.8 for ; Mon, 14 Oct 2019 23:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=WEvY8mI7wziVLeSGskg+VNlvZA9UmNy6YweIvzpqB9w=; b=YOT0SMP8zAfJji7EtL9vvZypd6z4pxouSQAnJufkKRSOMQ4ymp7uwYdjKZcCXY7Zr/ vlHfrHfFTdZDS7kxk9/xC++gQjcLxWTpFf1Emh86cDYBMu9X0nyxBsOvX6zpeyDGFXg8 sHb+qmocNkSYNxf9LblfFZD/XBXqzbvc/zUvVX/hYJjquDKKTQ0o0sY4IgVjCL2LiSi8 qMPvK2TNwjKMR41GCEAWL3IiVLt/FAhHUOeXJouxPtHSvK/9eLS8eODPM1bEWkWRDHmr 1L4HLAOGKmMoAC1as61Tls400S2SuDX1FGS1HRWvfX7H83dewtHM792iH76FBZw+XJya I/DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=WEvY8mI7wziVLeSGskg+VNlvZA9UmNy6YweIvzpqB9w=; b=cO7tY9+tSgDN1KXanm2AfaW+bHjEwqf5dDSCsQIVQbInaxk9CI1SyP0QFjkIPSr04M zscp7YKmAuAkDCLLXeBwIu25EnZOgArpLEsdja88NSMgCPzpOwxbzo4l82kxSajVgkHz FmgIrr/mMQdP2n/XNTtQQxVVfZwgXdvN6jKK5P5XLzYzL4MgbLMPoKmVvxpC7v1fXfzH aJS330MYcnrfITsCWZtYAD5rYZIDqJSXXDXebDTzyNBM2qDQkGBx1r/gkpD+HGAjWREF zW54NlueQOr3R3GvR65b42Ed01c6NgoGYb1B9HFoeHiPOQgKg3GY8NuVWdiCf3cpFaTx M7ww== X-Gm-Message-State: APjAAAUxjNwSbXOGJF7HZmxdolfXf54j5g8KneqUXUup+tt6nazOBNHN 71mgcvqdvhSufPsVzKkpQfm8aJ7s1TU= X-Received: by 2002:aa7:9e88:: with SMTP id p8mr38091616pfq.10.1571122779560; Mon, 14 Oct 2019 23:59:39 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id i16sm17952646pfa.184.2019.10.14.23.59.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2019 23:59:38 -0700 (PDT) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19][PATCH 1/4] ARM: dts: am4372: Set memory bandwidth limit for DISPC Date: Tue, 15 Oct 2019 00:59:34 -0600 Message-Id: <20191015065937.23169-1-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Ujfalusi commit f90ec6cdf674248dcad85bf9af6e064bf472b841 upstream Set memory bandwidth limit to filter out resolutions above 720p@60Hz to avoid underflow errors due to the bandwidth needs of higher resolutions. am43xx can not provide enough bandwidth to DISPC to correctly handle 'high' resolutions. Signed-off-by: Peter Ujfalusi Signed-off-by: Tomi Valkeinen Signed-off-by: Tony Lindgren Cc: stable # 4.19 Signed-off-by: Mathieu Poirier --- arch/arm/boot/dts/am4372.dtsi | 2 ++ 1 file changed, 2 insertions(+) -- 2.17.1 diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi index d4b7c59eec68..cf1e4f747242 100644 --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -1142,6 +1142,8 @@ ti,hwmods = "dss_dispc"; clocks = <&disp_clk>; clock-names = "fck"; + + max-memory-bandwidth = <230000000>; }; rfbi: rfbi@4832a800 { From patchwork Tue Oct 15 06:59:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 176370 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp5503828ill; Mon, 14 Oct 2019 23:59:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqxlS4AAW3jop6+zv8QQ/nHMVm9ZVNWlXc5TDlfNdrB7J86a459EN6TUAV/u0wJBfV7v7IBf X-Received: by 2002:a05:6402:2022:: with SMTP id ay2mr31878945edb.219.1571122782950; Mon, 14 Oct 2019 23:59:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571122782; cv=none; d=google.com; s=arc-20160816; b=EwAeTb8VeLzzXsfIcqpn76+jktyO85CeYOPEdx92F3A4Nw+G7clEfKOmId7x5Srh6m XG7DF2XfS7mB1m79NNMGwpRN5XI29pvhx2uNnUeeaW73VOtJZz4q1Fj5vDEXlbZnpyRC VyCyAlrDxaF8e/EsdXVV+KKnFmkS+tZAumItMSIvnuPeM9Bg0SqTL53QfygYuRy7HSG/ EupErTkqSbbO7bxWFwZv/6pGkK3dfcWvsHsncO6AKgki5XlSYw71/msW2jNM7+9zIq73 LA7CeocID637QP/X9yNoqTptaR/RJA/Q+LquYjM0wqxKvd6Ao5ZgYAM/eWNEVHrCST5O 7JsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=s8ax0pNsjS34NQgcw7z1oLLF7sOclh4TjvoGbZiiLB8=; b=ol+NemJiFIW53W1PYDRGjsa/2Ued4HaHNQAOpFoCv3n0Sq/Iaqt6b9Gfo6q9t5vP5m +hStI+M1IF1xswsWd8nE6jL7YBcY0updCmEHoRaq2PaLIESp261E/SWKBoOSq7MkNu7x zIkjTyPDELDJBr+eSMFM9RSD6wnRTQNsG9RrhQ4D4Br4j7zUZEiHbST4t5a2h+vjiz+t /1ZuTLnMTkgSNfH7cL6xzem3PgNoyzEn5MpELB5B/RBJG6EwicPr9Kl1yjaM+L8Oh0Tk nQRVByc+Gn57p7EULwKEtLN4qIDeD7QrFjcYzCO9mI/Wujqtf/fh7PWbH8UEHyJ8H3Uq ib2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LqiY4+eT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gl26si12428945ejb.17.2019.10.14.23.59.42; Mon, 14 Oct 2019 23:59:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LqiY4+eT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727647AbfJOG7l (ORCPT + 22 others); Tue, 15 Oct 2019 02:59:41 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:41986 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725710AbfJOG7l (ORCPT ); Tue, 15 Oct 2019 02:59:41 -0400 Received: by mail-pf1-f196.google.com with SMTP id q12so11832241pff.9 for ; Mon, 14 Oct 2019 23:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=s8ax0pNsjS34NQgcw7z1oLLF7sOclh4TjvoGbZiiLB8=; b=LqiY4+eTQkVeBC1lMPF7YYxbluIbw9VUU8JZtS9m6oR7ctp0sCqy0oj4hTdQIc/l15 4DKDY8XL6sekA8doxm7hTPg4AYK71o2L3A+NMbrt5Pj3intEUQQqTlIub45xUtEBQHHY uD4GaZUTARVLXiFJ2UuOxQ+Qalc/tgumAzfr1ixW/QDNGrfDlhnouuNdzqQQA78tRker NJhTGUVomZcZO0b1u18SHLHzElT0gFfFT5bFTusN5tdKNIcWQzVZ+SPUAJYdPIe4kOwX TK42n/0c8B70Kd735fQhYiGw/4K/tVRxsZFiYCozdTENJ+8gZ76uk2nf4TNCdtBx/UY7 2uHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=s8ax0pNsjS34NQgcw7z1oLLF7sOclh4TjvoGbZiiLB8=; b=dMkoH5sy25Kc3s4Wn+6ojKETPHT9z5Tbvr+prNbh9TQvHqBmRegyoqBpn/efUJRvb6 gGRLl3Ac/cd8Ko48dgoSzPSjmSW15cKz59Q0cu1Zi4BvvtqhjqMmfo1NutR8DOunm7/2 hKSEy0s1eql7zQaKG4p6dUnRywbneLWzFg3sN0RQn+bKdbjbs9gw8qkhbE00WoUb3wdU o1fl6QV8CBHdiWQR3HbnioQl9qTTXVlQ9VokwghjwZbF1WEwS813+K6IGlsJZcigiOwR cFt2uedmk+bytRJ0QR/qmej6cW0BomV7v0gCo6pPVTBkJMxBFILsnj7F8jHEEjykj1wE ApPQ== X-Gm-Message-State: APjAAAVap6kmrddw8a3oUb+bEQ2LNDqoWsAwADRYGeCtVFSGwOYMQZOH 3Ac39uMkPIxj+scKi+iAO+3A8Q== X-Received: by 2002:a62:6411:: with SMTP id y17mr37212371pfb.24.1571122780487; Mon, 14 Oct 2019 23:59:40 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id i16sm17952646pfa.184.2019.10.14.23.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2019 23:59:39 -0700 (PDT) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19][PATCH 2/4] ASoC: pcm3168a: The codec does not support S32_LE Date: Tue, 15 Oct 2019 00:59:35 -0600 Message-Id: <20191015065937.23169-2-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191015065937.23169-1-mathieu.poirier@linaro.org> References: <20191015065937.23169-1-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Ujfalusi commit 7b2db65b59c30d58c129d3c8b2101feca686155a upstream 24 bits is supported in all modes and 16 bit only when the codec is slave and the DAI is set to RIGHT_J. Remove the unsupported sample format. Signed-off-by: Peter Ujfalusi Link: https://lore.kernel.org/r/20190919071652.31724-1-peter.ujfalusi@ti.com Signed-off-by: Mark Brown Cc: stable # 4.19 Signed-off-by: Mathieu Poirier --- sound/soc/codecs/pcm3168a.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.17.1 diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c index e3de1ff3b6c2..439e40245bb0 100644 --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c @@ -24,8 +24,7 @@ #define PCM3168A_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S24_3LE | \ - SNDRV_PCM_FMTBIT_S24_LE | \ - SNDRV_PCM_FMTBIT_S32_LE) + SNDRV_PCM_FMTBIT_S24_LE) #define PCM3168A_FMT_I2S 0x0 #define PCM3168A_FMT_LEFT_J 0x1 From patchwork Tue Oct 15 06:59:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 176371 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp5503960ill; Mon, 14 Oct 2019 23:59:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqz7QnLoExrfWri9IedvMA8MN//o9xRjy+ScasQ6m6rpgjKVA1wgfY5+vJ7KCwj7kPA+b6js X-Received: by 2002:a17:906:d8c5:: with SMTP id re5mr32817173ejb.254.1571122793210; Mon, 14 Oct 2019 23:59:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571122793; cv=none; d=google.com; s=arc-20160816; b=GUhENSMEp2Udgal18Ap0X22xihncBwwV+YEAeGqWdNpA/DKx3eMhL9ciCiipy4uKLc MFmXpttKX8aedNJ6IMHNyKG/6LH/0Kuws29tHReBB+9vefP16z/Fx2QifNUvnNmDQCbp SQobKdLW2KhqsrKDIV4/yGPv/NODTz07vOMwj/B72ExWhSiViH47OeQ8vb85fAlGX/vP MRRaRMtjbeNiyrCC9o71AG1VRiqocTNB05gbRTjfC/3R5EhlcmGML00T/iFAA/JP09ed RNx8TRZU6KC9XTH9SpDYnoBmCnjIZ5n0niJTvDgapz8mhQvHzpmj3V7PD9MtR7MpP4Qd 7nSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=d6TuX5wbjT0cVL+CWwuFac6eFY+2DAq9db0NWeLvHfw=; b=giBoiBu7Y8PiDhoNhTP4dMI9d2Hm5TbwWSLnWQC6okRvq+C6lr8RNe+HfW2/27cmjv Eb9j4kIMtWxzgdNBAvEyKhmD5jvhO7VpaqbnMTglcji3Wc43mJs0cB3b4S1UY24Co/K4 SJBEvWl5oisMFResTD0F4efXXqYMvI9XmQdXPy1IJm2ihTlFOn13gPhlSZ7+FeLPZtlc PaDGpVsO8EywO5vdwpr+gEIMSwu2VlyxM89nMWDOQshBzas4Xi5CM8UGSIoM0pmI/q8w P3vdrrjlg0L/nRTHjM9XamGZRvieTMsNSwLY3tNPjMPc7dvbyVjFr0f+KFqzrTthIZj8 hCiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Pye2eFOD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k25si12732596ejs.189.2019.10.14.23.59.52; Mon, 14 Oct 2019 23:59:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Pye2eFOD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727727AbfJOG7q (ORCPT + 22 others); Tue, 15 Oct 2019 02:59:46 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:40659 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727652AbfJOG7p (ORCPT ); Tue, 15 Oct 2019 02:59:45 -0400 Received: by mail-pf1-f193.google.com with SMTP id x127so11833589pfb.7 for ; Mon, 14 Oct 2019 23:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=d6TuX5wbjT0cVL+CWwuFac6eFY+2DAq9db0NWeLvHfw=; b=Pye2eFODufy4FTc3Xuhtdnel9539e3atHEkUYgW5W90Gt+TPrWlJaLHjhn8B8ywWxY JoudPnOzfKiGz6r/GXUjxsc4y9rmrC8nFGkyt8fSr7TSs1mm4WMoH8rNZ0mldDmfBtk2 U1SNxtyH+z30OFykMII7vnC5xK8AngQM6Dtw8G5BPgn45gK2tBi9zBLJH1Io0eoWDHZD qy8D4/WWO0Jwnx529wxnERHIqvwFUr21JjxqduVRUwPGrduJGGtSYPoXVgxyF0mmB2Ce fAw+5B5ywpYV68NUjSKvUhv3Gtx0ZCheLTTiffLXcmdB6dzRX5oaNEvD26RWP41nZxAE q2RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=d6TuX5wbjT0cVL+CWwuFac6eFY+2DAq9db0NWeLvHfw=; b=QBicPBtUbumNCmlcwIUmlq9GmY8BMsPBCXhyWTKeDdWf1It8H0DFv2rHQQhTs1aRs2 M1S08GVI6YOw0e5wqW0THiZqUrQVYHh0bUWIpRcM5TGeItL9rpONJXA7oKnwrSkMn9Q/ eJbPyLNtzo4VsOB7P3AdShnsm7aoiCuNOQs2ee2FwOue2c4Ifzv0Ld/dlIl0oGmWKkjr 3mJnul5dJVT8odTXRL8WG3n4ENAuCnuUATfLuGtFl4q1OePvdGDSsCKmUm4V6fREOXbp V22aLqbN18q3DT8L6vxDfVyB2GLdTM8/pbFCsljomDMVmQ+rJnJ/8UKU+W/9FF0VQjMk eH6Q== X-Gm-Message-State: APjAAAXYRjKnKgswNd6tflUnfriOdPzVsUyjimPw2JftxgCKg96n9LZk NxZCtLmohYb0T70INkbT0EpTgg== X-Received: by 2002:a62:6247:: with SMTP id w68mr37823007pfb.11.1571122782444; Mon, 14 Oct 2019 23:59:42 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id i16sm17952646pfa.184.2019.10.14.23.59.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2019 23:59:40 -0700 (PDT) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19][PATCH 3/4] arm64: dts: ti: k3-am65-main: Fix gic-its node unit-address Date: Tue, 15 Oct 2019 00:59:36 -0600 Message-Id: <20191015065937.23169-3-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191015065937.23169-1-mathieu.poirier@linaro.org> References: <20191015065937.23169-1-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suman Anna commit 389ce1a7c5279ebfb682fab220b4021b2bd49c8b upstream The gic-its node unit-address has an additional zero compared to the actual reg value. Fix it. Fixes: ea47eed33a3f ("arm64: dts: ti: Add Support for AM654 SoC") Reported-by: Robert Tivy Signed-off-by: Suman Anna Signed-off-by: Tero Kristo Cc: stable # 4.19 Signed-off-by: Mathieu Poirier --- arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi index 2409344df4fa..e23c5762355d 100644 --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi @@ -21,7 +21,7 @@ */ interrupts = ; - gic_its: gic-its@18200000 { + gic_its: gic-its@1820000 { compatible = "arm,gic-v3-its"; reg = <0x01820000 0x10000>; msi-controller; From patchwork Tue Oct 15 06:59:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 176372 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp5503946ill; Mon, 14 Oct 2019 23:59:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqxlzVO/OOMWBDE/ztHFxKGLJdhp8857Ktrgw9SVFZcQd557MrO63MkD3ZIyd6GjYfDGefMs X-Received: by 2002:a17:906:538a:: with SMTP id g10mr32086666ejo.94.1571122792490; Mon, 14 Oct 2019 23:59:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571122792; cv=none; d=google.com; s=arc-20160816; b=EBl1kFS/NCGbJZiZJzT5lEjheMZU5KJp+RA39h5OynrdZs1JZln112bYga2yFP00Sg 8/x4KEiGUk/nO9poGC98+DqIlUk/LtZDDc7YSaOMTO4khyTIHSUBOWCJCJ7UxoVDcccy TovaqcPjwyWXiY2qbYgIRGCtSfVb5+CIOEjlVjjb+cBl/PPyMKqfktHBQK5P41rgDP3E mKKm7as9qGHLVHPRh3sAF1FU5Zqfj/rHmMxho71VVpbB0FkYoxJyzEmZ9EBK4ii4j4T/ 1Z0q/9EAN0uNi+9X2bivJQ2fqaTY7OCLZYuyc5+moVkP7S8AGaIEkDAfOzldJ9/ATemv spnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=mTg0FMT6vr5u2XqGUSj/m+I5t1w5ozsNKbohqK+I32g=; b=SLtQXlaIZEY7CPNrVwx5zy+kKZEmOoKsfCAVRcwfem4kpVVP1KIaRsmPlUaicnQtRj iaVnnsuAKtHsOmGR0A+h/J7HboeCQK2fp+Y1rHURiScvARpXmWR5Hj/HFVWETYRmrqgN jCIgUaSTruCUTOc60C5wTj9aOcC75fuX/VtTEWiOSgyOYSNh2DU+oSlEAAjdZ7yoLoNJ 271dQPYmZS40mXeLR9X/mW7gfslmexSSDfLD/LTo36xuOWoYGSIvLRY5QO5XpoiapQZ3 vlPg4Xzh9p04HX5L75qczaRNhKf8NElb+EEe0cEkVdBB7UFbLSEdzUtqX6a4eL6jyxIM Q/Lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=td8vDyR3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k25si12732596ejs.189.2019.10.14.23.59.52; Mon, 14 Oct 2019 23:59:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=td8vDyR3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727782AbfJOG7r (ORCPT + 22 others); Tue, 15 Oct 2019 02:59:47 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:46524 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727656AbfJOG7q (ORCPT ); Tue, 15 Oct 2019 02:59:46 -0400 Received: by mail-pg1-f196.google.com with SMTP id e15so3526844pgu.13 for ; Mon, 14 Oct 2019 23:59:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mTg0FMT6vr5u2XqGUSj/m+I5t1w5ozsNKbohqK+I32g=; b=td8vDyR3YArCs7AvGhwya+a/EH7MvQV5uULvkgZc8iUSMyZSzj/kfOFE4o8bKSjlRD Ep0bQKe7+Xm1abyFo9bhsXvg/oxXCfTs2CWuoKoSGl+KoG0bpgN13Dg96xQuzykxcKTA MWQxa32hsBFO17VdLpPpYIJKflEYr9dkiuDWgimgEG9JyNtBr25nN3m9lY93eKlEwRne o3OMq1nBUsTkAwygR7+/B1RVombnoQxYB3+Lh3/GHeAsEsIKH5h+D4oNfm9pAiS8utyS L1p8fe4A6VpA25fbfmQBUbiceQA1L7yWPiW7HCjYsvRT2rcall2pNF2fn7x1hIvBoxrf Un7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mTg0FMT6vr5u2XqGUSj/m+I5t1w5ozsNKbohqK+I32g=; b=Kn4Avy/R4sza392VJNt9hqX4LNaRDp+LjMBtvepkdXkYhsSzp3qw6hrqt4BnKwc92k XSaSf2U3WwjcDMehfvsIr85yIKNbW1YG46lmfc+5FLMyQT7/GEdzAxDmxIo+oGIDGc6c 1ma+2uo0M3xKGwNxnIEbsgudbQw5SH8oOlV2QmroJ4H+5PvAj3GpTEKc3GiwFZ5JsCo7 Rs5No5oytxMdbsZCvlewoBkM1pdet6rwFr6Luc3M6+1d9jf7s/jiv8LEKQTkgodWFqNW +bFuR5KLeKsNp6G6oFBrkvvwpYl/dn3uCznlk6mCdrQBCrpAELB2qjPuxP7wCVeeSj6K bCQA== X-Gm-Message-State: APjAAAXwLDz2nzsDM/pdDeiF+zTjGxBUZBpm/cm5dHHIPX9MFswJbuR9 ZDx0QEjmWWomQVQZAxAK1gOBUSAlGqU= X-Received: by 2002:a62:e70d:: with SMTP id s13mr36572094pfh.240.1571122783277; Mon, 14 Oct 2019 23:59:43 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id i16sm17952646pfa.184.2019.10.14.23.59.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2019 23:59:42 -0700 (PDT) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19][PATCH 4/4] usb: gadget: udc: core: Fix segfault if udc_bind_to_driver() for pending driver fails Date: Tue, 15 Oct 2019 00:59:37 -0600 Message-Id: <20191015065937.23169-4-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191015065937.23169-1-mathieu.poirier@linaro.org> References: <20191015065937.23169-1-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Roger Quadros commit 163be6ff7739b12ff300d77897d340f661821da2 upstream If a gadget driver is in the pending drivers list, a UDC becomes available and udc_bind_to_driver() fails, then it gets deleted from the pending list. i.e. list_del(&driver->pending) in check_pending_gadget_drivers(). Then if that gadget driver is unregistered, usb_gadget_unregister_driver() does a list_del(&driver->pending) again thus causing a page fault as that list entry has been poisoned by the previous list_del(). Fix this by using list_del_init() instead of list_del() in check_pending_gadget_drivers(). Test case: - Make sure no UDC is available - modprobe g_mass_storage file=wrongfile - Load UDC driver so it becomes available lun0: unable to open backing file: wrongfile - modprobe -r g_mass_storage [ 60.900431] Unable to handle kernel paging request at virtual address dead000000000108 [ 60.908346] Mem abort info: [ 60.911145] ESR = 0x96000044 [ 60.914227] Exception class = DABT (current EL), IL = 32 bits [ 60.920162] SET = 0, FnV = 0 [ 60.923217] EA = 0, S1PTW = 0 [ 60.926354] Data abort info: [ 60.929228] ISV = 0, ISS = 0x00000044 [ 60.933058] CM = 0, WnR = 1 [ 60.936011] [dead000000000108] address between user and kernel address ranges [ 60.943136] Internal error: Oops: 96000044 [#1] PREEMPT SMP [ 60.948691] Modules linked in: g_mass_storage(-) usb_f_mass_storage libcomposite xhci_plat_hcd xhci_hcd usbcore ti_am335x_adc kfifo_buf omap_rng cdns3 rng_core udc_core crc32_ce xfrm_user crct10dif_ce snd_so6 [ 60.993995] Process modprobe (pid: 834, stack limit = 0x00000000c2aebc69) [ 61.000765] CPU: 0 PID: 834 Comm: modprobe Not tainted 4.19.59-01963-g065f42a60499 #92 [ 61.008658] Hardware name: Texas Instruments SoC (DT) [ 61.014472] pstate: 60000005 (nZCv daif -PAN -UAO) [ 61.019253] pc : usb_gadget_unregister_driver+0x7c/0x108 [udc_core] [ 61.025503] lr : usb_gadget_unregister_driver+0x30/0x108 [udc_core] [ 61.031750] sp : ffff00001338fda0 [ 61.035049] x29: ffff00001338fda0 x28: ffff800846d40000 [ 61.040346] x27: 0000000000000000 x26: 0000000000000000 [ 61.045642] x25: 0000000056000000 x24: 0000000000000800 [ 61.050938] x23: ffff000008d7b0d0 x22: ffff0000088b07c8 [ 61.056234] x21: ffff000001100000 x20: ffff000002020260 [ 61.061530] x19: ffff0000010ffd28 x18: 0000000000000000 [ 61.066825] x17: 0000000000000000 x16: 0000000000000000 [ 61.072121] x15: 0000000000000000 x14: 0000000000000000 [ 61.077417] x13: ffff000000000000 x12: ffffffffffffffff [ 61.082712] x11: 0000000000000030 x10: 7f7f7f7f7f7f7f7f [ 61.088008] x9 : fefefefefefefeff x8 : 0000000000000000 [ 61.093304] x7 : ffffffffffffffff x6 : 000000000000ffff [ 61.098599] x5 : 8080000000000000 x4 : 0000000000000000 [ 61.103895] x3 : ffff000001100020 x2 : ffff800846d40000 [ 61.109190] x1 : dead000000000100 x0 : dead000000000200 [ 61.114486] Call trace: [ 61.116922] usb_gadget_unregister_driver+0x7c/0x108 [udc_core] [ 61.122828] usb_composite_unregister+0x10/0x18 [libcomposite] [ 61.128643] msg_cleanup+0x18/0xfce0 [g_mass_storage] [ 61.133682] __arm64_sys_delete_module+0x17c/0x1f0 [ 61.138458] el0_svc_common+0x90/0x158 [ 61.142192] el0_svc_handler+0x2c/0x80 [ 61.145926] el0_svc+0x8/0xc [ 61.148794] Code: eb03003f d10be033 54ffff21 a94d0281 (f9000420) [ 61.154869] ---[ end trace afb22e9b637bd9a7 ]--- Segmentation fault Acked-by: Alan Stern Signed-off-by: Roger Quadros Signed-off-by: Felipe Balbi Cc: stable # 4.19 Signed-off-by: Mathieu Poirier --- drivers/usb/gadget/udc/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index af88b48c1cea..b564a3251923 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -1138,7 +1138,7 @@ static int check_pending_gadget_drivers(struct usb_udc *udc) dev_name(&udc->dev)) == 0) { ret = udc_bind_to_driver(udc, driver); if (ret != -EPROBE_DEFER) - list_del(&driver->pending); + list_del_init(&driver->pending); break; }