From patchwork Mon Dec 2 10:02:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180562 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982297ile; Mon, 2 Dec 2019 02:03:53 -0800 (PST) X-Google-Smtp-Source: APXvYqwT9/fJVHEsC3DQ41vl8XmN+uhZpilUyxMHxdjnSjDUmPxsKAeuXC/8CnApcY5566yTAbTL X-Received: by 2002:a50:d0d0:: with SMTP id g16mr55536375edf.75.1575281032642; Mon, 02 Dec 2019 02:03:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281032; cv=none; d=google.com; s=arc-20160816; b=T8HEOul65sKoKNHi1/KdFTo4pL4Mxfwq4nz0whn0CmBD/LoT25sBAUheK/QFMotJs9 xkc1PPVFTx0JwNaJy1wzNz1yK5nkxyLkqPQ9mYO904umc8PU0Uo7sLJjoAmCMiNOIN9A A3pR+xUDNcy4f98PEsQbU7IHGmxYhV2o1KWf+6pEqjWNu4IsgAU2swJ3yvI5KMos3axV bAYMnTc8mPduChHA0MNs3On0Zb+izPL1TB/jGR9QiXjBybfRsHCzyYYL4bVnavq5lYQy TOWBvVTLIlDYeuWwQ0WfRnaBZn3IHFNydPSOc9GRAnLkM13NR/glQKrp7I1pOHBT+vGz pdCg== 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 :message-id:date:subject:to:from:dkim-signature; bh=hCYfmL1/wCJrAvT+ACq87WMwGG7+rMaHvrzSdRlqSHM=; b=QVChbC+CnR8BAlc+882MuC0q3SqJKpbhlDyWBH+duBE8105cboLOWfg13adRcYpO5w +k9gzBwZH4KlQcuH2LXD5TMDcXMbunM57Am1jwWMfXApOX65nG9qTzuw0ERfnh4Yq20y vAdJJq1UENrX/evcrsN6qNI84r8OeOrVrcHP8MLgBNV9aePpqZIRj56JGlMmW/0NiOBv RySxTNRf2Qems8IaFOFHGNnNnWGZHSbYpsLTMYt/r8opL//4ltNt5+M4x7+pjTjvinUw QkrqcY5ydg/7C3PoSANCQeYEAp1REajuJ5YBUnzC3dyr9wt1lPzV3m9QclxsNrP92xA9 TAfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tLiZimft; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 p21si21018960ejz.196.2019.12.02.02.03.51; Mon, 02 Dec 2019 02:03:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=tLiZimft; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1726592AbfLBKDu (ORCPT + 15 others); Mon, 2 Dec 2019 05:03:50 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:39490 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726115AbfLBKDu (ORCPT ); Mon, 2 Dec 2019 05:03:50 -0500 Received: by mail-wm1-f68.google.com with SMTP id s14so15699624wmh.4 for ; Mon, 02 Dec 2019 02:03:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=hCYfmL1/wCJrAvT+ACq87WMwGG7+rMaHvrzSdRlqSHM=; b=tLiZimft9l1MaLwsRUbedscWEoRPpMHWKF8eaQxx24yeF8yVCEwZYKxMN8GNv3lflT 9S2TsnON9P+KXIrtcmLL5W8cTXGvt/ukhM2jV6NeUCUaa7QgO0YqHv3TooNpwQsnDLB2 DTTtmHVwoW6z9y65eHCeNQHusdVB+vmOtTtlRelAM+EdS8UyYyBfpbNIFSK4+lsEyYPS GIiVmqIFWy/uLCtp/G0d61m6zZsVeqQ7Cj+oqcAjuux73eKFokIY8NfmHbt4A7Ef29Vy PJRX+nPEXBL7cqKN78WTjawq41ollEGretpKHcfntZ8tuEaMpFjorIFhe+jBIDXR20/Y kUTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=hCYfmL1/wCJrAvT+ACq87WMwGG7+rMaHvrzSdRlqSHM=; b=IEvIMtiRinKzfmxDl8AEGv3Xb7w1dp2/BcPLiIT+HCi1yQgTfCX7z332QTTIfWoKQP rigGulx83Omejq9iMN3eLCQSSFcJpcJ10CUWVEX1VYQlhX2wiwHz2Q6iRmiMm38Nua+i acdIJ7+2ki7KEOBPPx6eb5/jJvNkYQpOuN1vFYhTDY9OQSrIf6BO1fW82+RNaiROvH+h Ek5ZMiXtspenMtvzjeb6tPebfraBaXtRaSyhxG43y3MtWSdHTE+QBNuCfw2rsHlIoli+ Kr1R8M2SKRBmcfXYwGsOcl5K0w1320EQA8Gi4uZFLmE5ke3MMKgNoP0nUyFI9W1xiG3w AJcg== X-Gm-Message-State: APjAAAUEapX8xxobYO1/e3mdU6rz/DojFxdxNToOInzLnAdZOCWivciv m+7SG/+ybnMqFSI8rkRrOxROFY5zvIM= X-Received: by 2002:a05:600c:1007:: with SMTP id c7mr4010610wmc.158.1575281028196; Mon, 02 Dec 2019 02:03:48 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.03.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:03:47 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 01/14] clk: at91: fix update bit maps on CFG_MOR write Date: Mon, 2 Dec 2019 10:02:59 +0000 Message-Id: <20191202100312.1397-1-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eugen Hristev [ Upstream commit 263eaf8f172d9f44e15d6aca85fe40ec18d2c477 ] The regmap update bits call was not selecting the proper mask, considering the bits which was updating. Update the mask from call to also include OSCBYPASS. Removed MOSCEN which was not updated. Fixes: 1bdf02326b71 ("clk: at91: make use of syscon/regmap internally") Signed-off-by: Eugen Hristev Link: https://lkml.kernel.org/r/1568042692-11784-1-git-send-email-eugen.hristev@microchip.com Acked-by: Alexandre Belloni Reviewed-by: Claudiu Beznea Signed-off-by: Stephen Boyd Signed-off-by: Lee Jones --- drivers/clk/at91/clk-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.24.0 diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c index 2f97a843d6d6..b29bc7ec2ef9 100644 --- a/drivers/clk/at91/clk-main.c +++ b/drivers/clk/at91/clk-main.c @@ -162,7 +162,7 @@ at91_clk_register_main_osc(struct regmap *regmap, if (bypass) regmap_update_bits(regmap, AT91_CKGR_MOR, MOR_KEY_MASK | - AT91_PMC_MOSCEN, + AT91_PMC_OSCBYPASS, AT91_PMC_OSCBYPASS | AT91_PMC_KEY); hw = &osc->hw; From patchwork Mon Dec 2 10:03:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180563 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982300ile; Mon, 2 Dec 2019 02:03:54 -0800 (PST) X-Google-Smtp-Source: APXvYqxoTOr4W+ZPEgmcRfiDXVILn1e/YhywTpIi+9E9S6g1W/zSYG9jOn2rlBnL/Z2xU3/gdqb8 X-Received: by 2002:aa7:d84b:: with SMTP id f11mr2531472eds.96.1575281033898; Mon, 02 Dec 2019 02:03:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281033; cv=none; d=google.com; s=arc-20160816; b=GGr95CX0EDty78W14KhWVoHYT26CEzOeH+w+iYjWwxE8Rv3pALBsgIS/hu328Umb66 zw4sKjuKVZWPna5i9XTHWZWq/LfU88NowG1u8qUhktNxVP4/uCqeru/iX+2/PlC7dwDp xpC1wbf9q1eR26+P11MoMEDTvzWQ9b8IUI2Wzl4pqiC0fTd53paJmaWGPnGxnV3EedIv 6Mlr+8K4wmfoSpNlU0D0nAFuGTo+Lcb+9MpoWqMfNyk7Lcdi1l4kNsR/98j2uHhUQENU BVrDY0/HAN++uMujanzPzx/lWel8M3XRyahOkM2uAvwikC5v3mzvzfLjnbXi93/wxQ3l eRGg== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=AJBi3Wx4dc8N0SQvfeVCMhWPD/cyEKNjvF5LH/jG1lQ=; b=CeWolc34cc1mfJ1fz2KlhL8ATWYJyLmnjRdUcu/2QunkA6sk/E48HOlitaa4ikidzV jtstT5gGJ/4ZIngPlA4/SC4/OI4Jsk6fYGmTceMvgHKU0sJimZRg4+RtmqSgIBv3Xu+p ZTd2ynA0NdCUpDsG7jN8RGHsZ2jRp+tHYJdpIa8yMIq+VnWhby90KGTwHdRMqsipzly5 /WrZsUmWbvnDYZGL8IAIcdgIbNjipGRuOY6lbr9+cAj2xGwGRjBgxHmxejcxJhrs0I/y ibNsb3xmwadlvyTfZYSsYtkrhaUkDrWUbf+ErtEc82jEZYymOFl3RanIpNwrPszoRWdR CyzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hzi3syw7; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 p21si21018960ejz.196.2019.12.02.02.03.52; Mon, 02 Dec 2019 02:03:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=Hzi3syw7; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1726115AbfLBKDv (ORCPT + 15 others); Mon, 2 Dec 2019 05:03:51 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:34984 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726516AbfLBKDv (ORCPT ); Mon, 2 Dec 2019 05:03:51 -0500 Received: by mail-wr1-f66.google.com with SMTP id g17so11355564wro.2 for ; Mon, 02 Dec 2019 02:03:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=AJBi3Wx4dc8N0SQvfeVCMhWPD/cyEKNjvF5LH/jG1lQ=; b=Hzi3syw7fGa86cv/mmyMTIeCiZ6euZMw5IG/N9olmez/KI+7/ApDBxxVl9ns3KZTc/ xPBnZ9Uw4/0IFlgabTj1SqFDnW1kZSo658qHkrtlSjTpCjtnfRS/nSHmE0P91uqjvPEp 27DntP2zFBUziHe7kQiNYoKKL84N50QiMKwfVPZ6df5BAi7C/WawAh5zebSeR93FfD92 Tw68WwZifgBPxq/xcg8VxWP+pN68YjpikZ4LYUzUF0MMU6UQmAlNQ4y3tQYMCyIBRir+ PfPy1Av/8E9u37cqnL9gNQFYXKTxYjKr/c7CcRGAt9MVDlOZguPQmQs29KT4m5Xk0gmE taDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AJBi3Wx4dc8N0SQvfeVCMhWPD/cyEKNjvF5LH/jG1lQ=; b=JBK0IVa1yEdQCVv+vojyBKLIBxzX1BX9Pg0NHI+1EOnX44mwmVfW8OErgCVDV8eM0o SzcWeKPYx2PMJF5Me/Sx16z2ksUsZeCda7Cceh0RXhaTLBfc4lPFXRRQGgZEoI2nVHSa y9mJ5Pxq4bNbvkXM5M02IePdfmSfiG8bsl8sxCrC4e1X41hxndwzn6u8m9/bcyRHgkvV /1HC3yPJFFTyjpJIMeP2O03rjeG1snZPtx4nZQT2L7VZWCid0+6d7KO7ee6L7Xb6fLeb CEhO9j7XAvNbVgQLlKN38SxhUgtZhn0g9LkvwsazmRePYGWWiNA64RwMSc5EtGWiw/HB uMiA== X-Gm-Message-State: APjAAAVVRihmI1KTK2pdRUILm1EVgc7DS1nb8v0TwGPF3mo4FaxJJh0v nDC9HRTiIcL4WZOeIlLQntqLXb2Erv8= X-Received: by 2002:adf:e303:: with SMTP id b3mr52723850wrj.335.1575281028827; Mon, 02 Dec 2019 02:03:48 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.03.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:03:48 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 02/14] arm: add missing include platform-data/atmel.h Date: Mon, 2 Dec 2019 10:03:00 +0000 Message-Id: <20191202100312.1397-2-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Philippe Mazenauer [ Upstream commit 95701b1c3c8fe36368361394e3950094eece4723 ] Include corresponding headerfile for function at91_suspend_entering_slow_clock(). ../arch/arm/mach-at91/pm.c:279:5: warning: no previous prototype for ‘at91_suspend_entering_slow_clock’ [-Wmissing-prototypes] int at91_suspend_entering_slow_clock(void) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Philippe Mazenauer Signed-off-by: Alexandre Belloni Signed-off-by: Lee Jones --- arch/arm/mach-at91/pm.c | 1 + 1 file changed, 1 insertion(+) -- 2.24.0 diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 849014c01cf4..796182e33361 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -19,6 +19,7 @@ #include #include +#include #include #include From patchwork Mon Dec 2 10:03:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180564 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982467ile; Mon, 2 Dec 2019 02:04:02 -0800 (PST) X-Google-Smtp-Source: APXvYqxqkzKtI3uVWWDuyAjP84KsYhnslfXhO0YEmJf8mcCvgQQiohTzAe1Yct1jKl61ZNKAkdhz X-Received: by 2002:a17:906:4749:: with SMTP id j9mr11008010ejs.132.1575281042425; Mon, 02 Dec 2019 02:04:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281042; cv=none; d=google.com; s=arc-20160816; b=hNGD0+lDl/X/+bTIWwbjSXgv12alBGCJhSQvbDga5MlhMGJmd7SMBHK0HLr5QX2UIH XZ4NOC9sqUm0re7KiibUZbjJlNAjZs+ppb8uWZSaYascshJNIgytHIjiuvKYxHCiWFuJ UaPTZo/DxZvLLNtglof5AtZfxiHPh/aGIvBRESHHvys456V74qxTWdANL603zH/2ZQIt bQzQ3LYb1N99sPpwU9qdFH8FRQjsqj+yi9bXaICEDHPHlAHiKG77x5kUOORnSSj/Wner ATKWSyHQA53iB4/WLnWgM1hJhQMpDeMSK/DZsTI4hADwppTw5j4lQXARzzus29IexFVg mk6Q== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=sVbw3UdezQ0sD9BTneNk/tIPQpwqVy7LB+WYRpuD1iU=; b=pD4qID4YUY3p3B5Unqb8ejVqGrM5Xf9thV8lSlYJ2KS90Ci87Saz9wf/8FKQdL+iqr 7m3fGbWL8Vg4znXIZ+dUw1qVllnDZp2hVJWqVCPDAQE1I9ORHOAJ7wnuRLrne4T5YdCb ZmWpUeXl1SCd6QvTeClaZAANUU/e15GsO85gdRsjpHJh9Hp1/4lUGg9RPBJpGg70MxvI 1XLFl83qJ16Kms79d+4Dk2l0KZb2AacvaYcUBpILD4U/3tM3iD2k4jKa3nlxNEVXyGPf NXRJQcLDkokcaaqIRfpomLtiEMhG2go41Ay2KX5SqQ32krlU777CpsE/vPvQCdhCLjDn 3T6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qk5HwfTf; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 p21si21018960ejz.196.2019.12.02.02.03.54; Mon, 02 Dec 2019 02:04:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=Qk5HwfTf; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1726516AbfLBKDw (ORCPT + 15 others); Mon, 2 Dec 2019 05:03:52 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:56206 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726533AbfLBKDv (ORCPT ); Mon, 2 Dec 2019 05:03:51 -0500 Received: by mail-wm1-f68.google.com with SMTP id a131so16735808wme.5 for ; Mon, 02 Dec 2019 02:03:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=sVbw3UdezQ0sD9BTneNk/tIPQpwqVy7LB+WYRpuD1iU=; b=Qk5HwfTf32NYPQMIGTFwZEY52SK16t9YODfdA3aRJFKTBbQZI7gOpiJE26OI6gmIXT PMiOo958L01JPifVa9ORmz46iqKzao1LfUlHUBuxc/VFbbr1r/ti6ccwtV8BcRtAKKDL 38z5hGBRu+G4G3mmhucw1UTfvD8Cl3pktUvXRQzkGUWGeSoo+QR6wjvFP4kG6huyNJW9 XIMX2pKYa2r/59Vu/X03YD519VvRFZuzFyy5a5b2P+p5Smt+pA/wHXJf4Bil14qdWOHP yrc+neFKi2O8Oey3js/Omv8/gFOgsc0hr3vKmCBdCzoDR2g0kDp/rEn9oNPTGI2qSVHt sqWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sVbw3UdezQ0sD9BTneNk/tIPQpwqVy7LB+WYRpuD1iU=; b=P8hiWDvSEwWo4mDrwEBo1oq8WeS4pf3K7v6Z5ox9iA1JvhP1I5K4bWwqiBFh0cMnom ZpQlDyF1segSe+FxNlzt+PRJ1jE+NFj3D5ImlSXS27FOlH75zs4NSBPO0Kb41k1wybkq Ac2zyIUS6iZ5n9g+eeNJmtwfHjqFtV/d15zwpnWnm2VG8ZJ6vK4NglushuIQDXivzsma AxeaZ+41ZF6lFDOQnDiLyJ6fyyZpmK1GaFUro2/+GnRsT/FT9QqN3kcTv2tClm2TXpyu P9iwI66qgPJJcn+auUCpEE5cJQJPq8xlPMW7m7ibH5J4n+jQh03Bw8i4mos9vXhDUlUC bldQ== X-Gm-Message-State: APjAAAW6jwP/4sdyp6MW7HmPtesdMUveq7hwvrP+/xFN8gNJF1wwz0J5 zDWuGvkiCZt/e6te6zyx/K5sJ5BBt3Y= X-Received: by 2002:a05:600c:1108:: with SMTP id b8mr11371586wma.17.1575281029709; Mon, 02 Dec 2019 02:03:49 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.03.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:03:49 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 03/14] watchdog: sama5d4: fix WDD value to be always set to max Date: Mon, 2 Dec 2019 10:03:01 +0000 Message-Id: <20191202100312.1397-3-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eugen Hristev [ Upstream commit 8632944841d41a36d77dd1fa88d4201b5291100f ] WDD value must be always set to max (0xFFF) otherwise the hardware block will reset the board on the first ping of the watchdog. Signed-off-by: Eugen Hristev Reviewed-by: Guenter Roeck Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Lee Jones --- drivers/watchdog/sama5d4_wdt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.24.0 diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c index 0ae947c3d7bc..d8cf2039c6a4 100644 --- a/drivers/watchdog/sama5d4_wdt.c +++ b/drivers/watchdog/sama5d4_wdt.c @@ -111,9 +111,7 @@ static int sama5d4_wdt_set_timeout(struct watchdog_device *wdd, u32 value = WDT_SEC2TICKS(timeout); wdt->mr &= ~AT91_WDT_WDV; - wdt->mr &= ~AT91_WDT_WDD; wdt->mr |= AT91_WDT_SET_WDV(value); - wdt->mr |= AT91_WDT_SET_WDD(value); /* * WDDIS has to be 0 when updating WDD/WDV. The datasheet states: When @@ -255,7 +253,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) timeout = WDT_SEC2TICKS(wdd->timeout); - wdt->mr |= AT91_WDT_SET_WDD(timeout); + wdt->mr |= AT91_WDT_SET_WDD(WDT_SEC2TICKS(MAX_WDT_TIMEOUT)); wdt->mr |= AT91_WDT_SET_WDV(timeout); ret = sama5d4_wdt_init(wdt); From patchwork Mon Dec 2 10:03:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180565 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982476ile; Mon, 2 Dec 2019 02:04:03 -0800 (PST) X-Google-Smtp-Source: APXvYqxwFT24GVkbl1zXim0RS19i8tztDX7tjm/NqGhBlJ8kdZ2vSLY3yVaBG2tC2wYXTZLDwty0 X-Received: by 2002:a17:907:104a:: with SMTP id oy10mr17138941ejb.324.1575281042965; Mon, 02 Dec 2019 02:04:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281042; cv=none; d=google.com; s=arc-20160816; b=imMWrpvp4E/r5AhpFhlWTNbxJ91/koUl2TkPiyL76TK/V1tMBbu6wNiaOoPR+oEgDa KwC04FEdq4kgNh0/SF4p5kR0nI4XPjE1vs7Q0F0Bp2FhXMu9WZZMNHrRwf0MOyAYPA4l eukOnDd1wk9SNG3IX+7TUe7Yfi5+Q4RG/YFTx/FnKQBfBzWODKBUBwW2JYEB95QwgrHa UZR2kkcwmxqDpOG6FOBMHEg8g2I3FQwKx8C6ORUk2tHBlUy8vL/a3A90plpnhuzOLh6i +TV0xPEqKNHZSaz9haHq8RzHwjzCMykKH4zRkmgd6FQFLQmACvQMuGJtg15SbKaYA0V3 vyLw== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=t0RhdKt1OBlvUr3g8wwSzhDFoSAxtdel5n69P40ulHY=; b=Grgy5hiwOo3v5WtXxN8Vlb9YjjpEHVngc6AyDaXLZg+TrX4kBc483m+bJp46quGJ8N RqaUamkFdBjM758L6bjtvCodSeYSodgNQXJ5ALZC0CB4qWVB3uoeKaT5CnnInOlcbGaD lm8MjDY922u/Le5x1je4tbTXrCEkTA+haLPxqfhT32K4XcCM1JXrww/yCjLZTAe3dWme uNgJS35D0NA4oST8YQIushGVmaW2WZ1FNomfm/JmuE1/6Vlc7owFZjn+TV0em8TpphxO Z9ZjxVVEV6+TgBH6UNmiwrCdj2T8wLc4GS3egca3JQdpFXQ5Ts9bE7ASOmZOtqrFo4z+ Txtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Na/B3jcs"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 p21si21018960ejz.196.2019.12.02.02.04.02; Mon, 02 Dec 2019 02:04:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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="Na/B3jcs"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1726653AbfLBKDy (ORCPT + 15 others); Mon, 2 Dec 2019 05:03:54 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:40110 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726533AbfLBKDx (ORCPT ); Mon, 2 Dec 2019 05:03:53 -0500 Received: by mail-wm1-f67.google.com with SMTP id t14so4918076wmi.5 for ; Mon, 02 Dec 2019 02:03:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=t0RhdKt1OBlvUr3g8wwSzhDFoSAxtdel5n69P40ulHY=; b=Na/B3jcsJKsm/az0jfmMPnonDVOSKgZhjQo16Gamu6TFoGHNesAIJWbw/p0AyHEQbH zdvI1NL1m9y0q8LUhDV8g5qjz8NUOTYYPJOT98vSDKZ5lCYuIPXB+tO28JRPkd+s/tIh 2cIowCRXfXjIta1TzaUJ8GcsFBK8cYxmMTtXkdSuz4D7sJwMMYUNFBY8EO8JOBTWcrWt QhNt1UcsSkBk/hMVs2Axi+COX8c4RtqH4xp7wCjvV9Ab4JehxfUPUx7Kz1TMfua5EiV2 1RDv7DRHsZXSTPZB2teUzI9PX10m2GdfBO7Kvq3BL032OGDm67PtenzuYplL4BGf7Hr1 BDHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t0RhdKt1OBlvUr3g8wwSzhDFoSAxtdel5n69P40ulHY=; b=PJ9dCTlhbSgzYfyJ97+jWmpL/pezjKL5IgeSZT8S42j0iCL4wjo6Dx9C0t9shou8KH To1MWGrioHwDcf69EjSFv3kHN9KP6E2ovcTcbzEbyc6y12fuAuCdDiKUMwXOlL739AXN Z+e6gaXpvR9nW/87S4AWlWKhPnJHaxWWwWU/hHK96HGRijR6VLsvFZNSBXyMEw1JFM0a O+cP6y2XfwARYy1Cu/MjuWcqSFFJPshwYzXUbbqCsfZ2lE9JmkD7eCeP9fGa3oRUGWQp VjMEV/nQK4zGKWPNgKF4HlVBvN7q44X/dRN7StWDqCzbf9Ld7pL0v1VwjWmf3a6iXd6d JvUQ== X-Gm-Message-State: APjAAAVmaTHDg0hbIcTBri3XgQHbp8iNBnXALQ6dEysqKgfUXZG7iO8+ bJYKIS5Z8oEASLIjnl4sD6x/qHGyKxM= X-Received: by 2002:a7b:c449:: with SMTP id l9mr15362557wmi.150.1575281031363; Mon, 02 Dec 2019 02:03:51 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.03.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:03:50 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 04/14] net: macb: Fix SUBNS increment and increase resolution Date: Mon, 2 Dec 2019 10:03:02 +0000 Message-Id: <20191202100312.1397-4-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Harini Katakam [ Upstream commit 7ad342bc58cc5197cd2f12a3c30b3949528c6d83 ] The subns increment register has 24 bits as follows: RegBit[15:0] = Subns[23:8]; RegBit[31:24] = Subns[7:0] Fix the same in the driver and increase sub ns resolution to the best capable, 24 bits. This should be the case on all GEM versions that this PTP driver supports. Signed-off-by: Harini Katakam Signed-off-by: David S. Miller Signed-off-by: Lee Jones --- drivers/net/ethernet/cadence/macb.h | 6 +++++- drivers/net/ethernet/cadence/macb_ptp.c | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) -- 2.24.0 diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index c93f3a2dc6c1..4c0bcfd1d250 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -457,7 +457,11 @@ /* Bitfields in TISUBN */ #define GEM_SUBNSINCR_OFFSET 0 -#define GEM_SUBNSINCR_SIZE 16 +#define GEM_SUBNSINCRL_OFFSET 24 +#define GEM_SUBNSINCRL_SIZE 8 +#define GEM_SUBNSINCRH_OFFSET 0 +#define GEM_SUBNSINCRH_SIZE 16 +#define GEM_SUBNSINCR_SIZE 24 /* Bitfields in TI */ #define GEM_NSINCR_OFFSET 0 diff --git a/drivers/net/ethernet/cadence/macb_ptp.c b/drivers/net/ethernet/cadence/macb_ptp.c index 678835136bf8..f1f07e9d53f8 100755 --- a/drivers/net/ethernet/cadence/macb_ptp.c +++ b/drivers/net/ethernet/cadence/macb_ptp.c @@ -115,7 +115,10 @@ static int gem_tsu_incr_set(struct macb *bp, struct tsu_incr *incr_spec) * to take effect. */ spin_lock_irqsave(&bp->tsu_clk_lock, flags); - gem_writel(bp, TISUBN, GEM_BF(SUBNSINCR, incr_spec->sub_ns)); + /* RegBit[15:0] = Subns[23:8]; RegBit[31:24] = Subns[7:0] */ + gem_writel(bp, TISUBN, GEM_BF(SUBNSINCRL, incr_spec->sub_ns) | + GEM_BF(SUBNSINCRH, (incr_spec->sub_ns >> + GEM_SUBNSINCRL_SIZE))); gem_writel(bp, TI, GEM_BF(NSINCR, incr_spec->ns)); spin_unlock_irqrestore(&bp->tsu_clk_lock, flags); From patchwork Mon Dec 2 10:03:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180566 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982490ile; Mon, 2 Dec 2019 02:04:03 -0800 (PST) X-Google-Smtp-Source: APXvYqyS10zdGXNt0nBXLU0IlS+lHQGQbjvXqQZ2SCCzKrek29ogtxuOOVZ5W5lv+ExebI7NYDc1 X-Received: by 2002:a17:907:104a:: with SMTP id oy10mr17138990ejb.324.1575281043595; Mon, 02 Dec 2019 02:04:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281043; cv=none; d=google.com; s=arc-20160816; b=O82pjlQ+yLMgkUl2n/+GWDuz1nEXI3sAiONJsqShJP73Xx5nbNcFLPDcCJqlBbJdeQ THnLQkI9NZXeQ61so1xlAsks/rOwIXweUY68HYOl6sBSghqQhbQJ1BkU+b6xGh+sC5oy ZImhB1U+tttPoOIap6MZD3KxQb91P+OgMRcWOPeJ/5qTczFpYAptbwQPKMkCvh2jRnZD V21xpC/Z58OC+mbVF+GGbDJJCSPOVLmSww7vizJYux8xN1FknsL++vqH1wqX7EMBznkW bXRV1b3PoP4S6K6KbuEzBzvFeY8du40IHQ54b4qsoyITICA3xNUrX799/7d1T8a10aUC 7jiA== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=46LLwlvzE2FHY1ej4eoNV1VVJcCrkeV1UdzSpNWggRw=; b=Q7rOurmWmJIO2X0J0seeKY0OUmRZCHaSSCz2/mtWLg3dD6L+xvHGhNoPRPz+phQSML 5qOHdEOA3m87JMGOMaCwYRe9DWiurhFXwbIAs5/QvPgytGJGOg4sJF+PVT7gwCpd7qbY CWeYuUuVGDcf6G7BHqWt39NfZ0NQnDaJ7lp+V+LlbE79CNKkL7IV0bVIWExtBN7j8vZh I+ilUJsdEk9Cu5/ps4nEE/ArGsCo3Mh22zoJPKoe8c/1mVsd3uAtg80hxynMuqRWHrSb G7H9pN+WobE8YQSwvdCpeXmBQ0t1jEgDkqHRUYsv4CuW3kZkl7Qausbj8Rru3xR6jkzb ailA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=c4unkz5V; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 p21si21018960ejz.196.2019.12.02.02.04.03; Mon, 02 Dec 2019 02:04:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=c4unkz5V; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1726674AbfLBKDz (ORCPT + 15 others); Mon, 2 Dec 2019 05:03:55 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:39501 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726533AbfLBKDz (ORCPT ); Mon, 2 Dec 2019 05:03:55 -0500 Received: by mail-wm1-f66.google.com with SMTP id s14so15699996wmh.4 for ; Mon, 02 Dec 2019 02:03:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=46LLwlvzE2FHY1ej4eoNV1VVJcCrkeV1UdzSpNWggRw=; b=c4unkz5VBCfwH3WEOXDUBx1twRep9gpMQ2tLReLevGs9lf/4zsr7hC+JMkAQtZ3kES CzUi1nWcZ0e+/ggi5EQN4v2YveLubZx6JdvrqDlO8JCISA518uhueItn+1OHWfvLp/p/ tczY3pSRLr3xA6PtWXGfrBwR1fvXAQuWUWzOgzUumme4GhxeJbi7hK3yr2OWzJWsNzJt B+BK604CAp8gdprapc9QOnMVurKhSY1Nkh5Vs+idrsyUr4QROczMZHc14s7tSYtp+XTT 1tFScWCeeH6Enz4hY3CSu+msa0owVjZJW/cYtZ9KIDGcVzuVAdwi+qAkmhHvBMDbYCj/ J1qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=46LLwlvzE2FHY1ej4eoNV1VVJcCrkeV1UdzSpNWggRw=; b=TUaVtGC4GvF2Cj0L8E96x6XxhxpH5QGkWnALwsvi5WRTStkSAtaNNlu7DTdWp3VNjY LUrh0baXkCqOHD/IJ5Q10btaufV0HKpRGXC3j2e1/INbmKT7wdhJdzhXY5KUrThonR6O ankzgZdqqllEFd7YkxE/u1zjkbxA2qYiFKHpC8fZXnHECol5T7WmiX6n1/Q2DGJ0olqI 3aDVrvzU63vuddizKweM4MUPZy4Sn1xbQnQXWXAMVwBfUKm1G/MIY/45M+YUQljv2s4J 4z9VKoufwehsuPlAqx87ibAClCqln64EcD1NsKhmOCyiQH/2xcXE28TYDA9g+UOQeQCl wOlw== X-Gm-Message-State: APjAAAVWOtQQbkrOcXbV+cPo3DSX6OzPpQL60f0GkR3bJivql2dR3oIa 6vsnj/6GlGuxWQBHJ7FzG2jIJYyPWM0= X-Received: by 2002:a1c:9d8d:: with SMTP id g135mr24025789wme.114.1575281032564; Mon, 02 Dec 2019 02:03:52 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.03.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:03:51 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 05/14] media: v4l2-ctrl: fix flags for DO_WHITE_BALANCE Date: Mon, 2 Dec 2019 10:03:03 +0000 Message-Id: <20191202100312.1397-5-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eugen Hristev [ Upstream commit a0816e5088baab82aa738d61a55513114a673c8e ] Control DO_WHITE_BALANCE is a button, with read only and execute-on-write flags. Adding this control in the proper list in the fill function. After adding it here, we can see output of v4l2-ctl -L do_white_balance 0x0098090d (button) : flags=write-only, execute-on-write Signed-off-by: Eugen Hristev Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Lee Jones --- drivers/media/v4l2-core/v4l2-ctrls.c | 1 + 1 file changed, 1 insertion(+) -- 2.24.0 diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 1ee072e939e4..34d6ae43fc45 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -1014,6 +1014,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_FLASH_STROBE_STOP: case V4L2_CID_AUTO_FOCUS_START: case V4L2_CID_AUTO_FOCUS_STOP: + case V4L2_CID_DO_WHITE_BALANCE: *type = V4L2_CTRL_TYPE_BUTTON; *flags |= V4L2_CTRL_FLAG_WRITE_ONLY | V4L2_CTRL_FLAG_EXECUTE_ON_WRITE; From patchwork Mon Dec 2 10:03:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180567 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982504ile; Mon, 2 Dec 2019 02:04:04 -0800 (PST) X-Google-Smtp-Source: APXvYqzUPdjsjIsxznPkkvjvs4w5SEJH55gMmhGsoccleuh0jfHpS3LRNj8ntXvBlUV7A92LP2bg X-Received: by 2002:a05:6402:17e7:: with SMTP id t7mr55344807edy.114.1575281044039; Mon, 02 Dec 2019 02:04:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281044; cv=none; d=google.com; s=arc-20160816; b=qYkECzM0xHhICRETb02EnIYG6lyUcrQN0DzJqE2M/5PNDO+S/mRUdOw6NEHgIy78ZU 2Www5fQmokuXkRlTGKuc+QYI8nXD0QLjUBf5mGHs3HWaDoLwICTQDdavifdR+EargZCa /gibfp8/5v9SqfaUANSnCwRwcC73SfEKFmbVxCCCB71XUfDwILT2CyhvxNlV8ymzv3Jg 9NExDjz4MK1KYCLxLIwDxfw5FxkY+4YsSnm9uRvk0AeSun4VRtGHWZHF943x1qIsp+b0 CuCCSkcaaLNLNuFvCJ02muDdZkZpceJGD6BV7njmwMlC2lshssxUDNZXSWWLRofqYHW9 CGCA== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=RnwQaiFvjaJUW7N8MIQ/aT+fPISiZ2Sp2ScaNBJ2Tqo=; b=v5Lg64i7RmTU0kFvcKKC7lBSnwi2vfxBiQnrBr1qmnEH5uvS6CBX9plYOLlP6ZLz43 OIX4AsI4Bt2/ja6YUUE2hUK4Vxw+wQEDceKNTT7orbhTXTo8t5vhDm1X/vkLGjTlszIL a2dhStS2mnEzKcU+EuyzxwubPM7qhH/h58yNaMhpgwqzNLdf3L2iIBad+Y7cPZ3d4Jli xY0TfkSz1uzCT4TaeAnhTmdBiZjNOMf/77OLC7UDh0esVbsfz7h5LW6680sQjnlF6dRI DklJ0Rq6Csb2eEwv2PDvpGkEa/Wpsh76lrcAUTw7ueGQ8iDklJPQGuTXLEjPIjHynEWz YnOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bL8aPSA+; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 p21si21018960ejz.196.2019.12.02.02.04.03; Mon, 02 Dec 2019 02:04:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=bL8aPSA+; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1727221AbfLBKD5 (ORCPT + 15 others); Mon, 2 Dec 2019 05:03:57 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:36511 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726533AbfLBKD5 (ORCPT ); Mon, 2 Dec 2019 05:03:57 -0500 Received: by mail-wm1-f65.google.com with SMTP id p17so16574727wma.1 for ; Mon, 02 Dec 2019 02:03:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=RnwQaiFvjaJUW7N8MIQ/aT+fPISiZ2Sp2ScaNBJ2Tqo=; b=bL8aPSA+M/AVA12BBW2lbM8XWy1X5A95g2a7PtFm/e4BsqRYjl87jqaCfsJXBz28U7 V7Bq7dpfwzKLTJoz/3RLo2SPsq3W952BssHgm00JbSwfPPhjLIrKSUeokmUo6ieqXz6F gOXyvtujdbr4QUAdXD1BPE3oXLIBQl2t7UyQSC8mFscGrUcz+evOIN6o0BWdBy1SkJbW p78/3z1bwEfwtxQriA487GpppDpo2i82va73vAP61ubCLe1TXwrwYvGKUnTk4K6tHgSO 5nqB6dcp+voAX276wv4mzBIVBSAgw+2nftBApHxq/63qKMN35NPN6ri3yvq93X1bhcwl Jy7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RnwQaiFvjaJUW7N8MIQ/aT+fPISiZ2Sp2ScaNBJ2Tqo=; b=MALA84wcpcUgdH2JxsM7bwEfJjTB54SINS5cXClOOsuU55lGHBfAhQgPoQTGE4VMH5 tShJ9ZlETvgKNm5vd4vm9g1HqKqX5ucJtNtrblT7hAb0xxzjW9Pbg3DAwmrITrEBZZf7 qO0xzZmfEmf/r4DYI5F/Pml3HC2l3dBE5kD2hxGkq1729Xy0tMK31JqhE6IY7btpLMO1 pkjLKg7EPQCzPsyRC32t+5T/QRFbqhWx0BNwGJO48awYGvhLFpVwhjm/YMClwiTJtRjy 3RpsCTeIQgbET07S1looEY2tVUVL43sGEhQ/rOQiJK/LukML9GPcuw4ZHWhtJQPVjeEm 6dlg== X-Gm-Message-State: APjAAAVRsouyNk2VVILn25uQPDU0MtSZoLfse/xdajzHm0nWPY+sk/hB eyk1rTIlaxqhgtUyOYapotWX1fsGwzs= X-Received: by 2002:a1c:61d7:: with SMTP id v206mr27475897wmb.13.1575281033837; Mon, 02 Dec 2019 02:03:53 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.03.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:03:53 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 06/14] net: macb: fix error format in dev_err() Date: Mon, 2 Dec 2019 10:03:04 +0000 Message-Id: <20191202100312.1397-6-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Luca Ceresoli [ Upstream commit f413cbb332a0b5251a790f396d0eb4ebcade5dec ] Errors are negative numbers. Using %u shows them as very large positive numbers such as 4294967277 that don't make sense. Use the %d format instead, and get a much nicer -19. Signed-off-by: Luca Ceresoli Fixes: b48e0bab142f ("net: macb: Migrate to devm clock interface") Fixes: 93b31f48b3ba ("net/macb: unify clock management") Fixes: 421d9df0628b ("net/macb: merge at91_ether driver into macb driver") Fixes: aead88bd0e99 ("net: ethernet: macb: Add support for rx_clk") Fixes: f5473d1d44e4 ("net: macb: Support clock management for tsu_clk") Acked-by: Nicolas Ferre Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Lee Jones --- drivers/net/ethernet/cadence/macb_main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.24.0 diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 2287749de087..bc9ab227d055 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -2822,7 +2822,7 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk, if (!err) err = -ENODEV; - dev_err(&pdev->dev, "failed to get macb_clk (%u)\n", err); + dev_err(&pdev->dev, "failed to get macb_clk (%d)\n", err); return err; } @@ -2831,7 +2831,7 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk, if (!err) err = -ENODEV; - dev_err(&pdev->dev, "failed to get hclk (%u)\n", err); + dev_err(&pdev->dev, "failed to get hclk (%d)\n", err); return err; } @@ -2845,25 +2845,25 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk, err = clk_prepare_enable(*pclk); if (err) { - dev_err(&pdev->dev, "failed to enable pclk (%u)\n", err); + dev_err(&pdev->dev, "failed to enable pclk (%d)\n", err); return err; } err = clk_prepare_enable(*hclk); if (err) { - dev_err(&pdev->dev, "failed to enable hclk (%u)\n", err); + dev_err(&pdev->dev, "failed to enable hclk (%d)\n", err); goto err_disable_pclk; } err = clk_prepare_enable(*tx_clk); if (err) { - dev_err(&pdev->dev, "failed to enable tx_clk (%u)\n", err); + dev_err(&pdev->dev, "failed to enable tx_clk (%d)\n", err); goto err_disable_hclk; } err = clk_prepare_enable(*rx_clk); if (err) { - dev_err(&pdev->dev, "failed to enable rx_clk (%u)\n", err); + dev_err(&pdev->dev, "failed to enable rx_clk (%d)\n", err); goto err_disable_txclk; } @@ -3298,7 +3298,7 @@ static int at91ether_clk_init(struct platform_device *pdev, struct clk **pclk, err = clk_prepare_enable(*pclk); if (err) { - dev_err(&pdev->dev, "failed to enable pclk (%u)\n", err); + dev_err(&pdev->dev, "failed to enable pclk (%d)\n", err); return err; } From patchwork Mon Dec 2 10:03:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180568 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982516ile; Mon, 2 Dec 2019 02:04:04 -0800 (PST) X-Google-Smtp-Source: APXvYqwQ4ftFfWjfx4WflYDsv6yd5cG9Ex3tdQem+eh0rcOcYBDrZaYK3adr3kRi0tXzcjkVXWIq X-Received: by 2002:a05:6402:1350:: with SMTP id y16mr14139080edw.176.1575281044551; Mon, 02 Dec 2019 02:04:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281044; cv=none; d=google.com; s=arc-20160816; b=M14KNvtlkqSnxkI58E4E+x7LMdZAcLJuOuMky6XGjDFfX6xamvTMxoGp6IlIbMr30/ +vBvk5QMzDcKRq43Pqv5SQAIltp7I+a/+FsrolwZqNFb96tbljBuRcCewf9mkpspUsx7 6X0LHQug2PaLUWW8TYJdnrTlS/CYTnMLbegpPDn4Qp13BKzDESd3Nu7bMl+NgiOc6Luh +MTOQdN5XhwMPLPLBB6/VM5jCnDlekWA5xqmxG2OmGOwyjVKYUB78Jtok9ByClQGvNQx V9+WK0XjHiLEjJ5H2Dtn8ukARH9VHDSXvQdMabcFQSkq4FJ9VCKxz3FJHTNKIs93H77m BZfg== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=eItUHcPLnmpp23VMH3D0N31hOVNXeHzTJKuy0k/hYsU=; b=QvL20p4ZXKHzQE81mErm5d2wmS4aJAkvYHNaJ55ReLsXfD8czdiEx7MTQHPuxDa34t WEQ9dlBo9XEbE7mvrLYhNOkVWRLs21+nNXr2m1UMfrc1gudVJVHFkZvWzKMhlikLRgWy erjM2WCYwm3ogR8MLHH8Fit157MhF9QbcJ4Foj7WlnXDtrFhEcm2BvGupeSL0qdphg1J p1oQq0rVIrUgJ5n+lREY86h7emuUT9xDoVnsmX7dqixKgIn5BijbVe1PHNXz+AYt10Qa gX7hywJAnu5LAz9OCI9pTP04LcTUFI0+f/vO+t3gtHMJcU1zP2tduwHPYJ3StCvwTpuY eYrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SOcZYQEb; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 p21si21018960ejz.196.2019.12.02.02.04.04; Mon, 02 Dec 2019 02:04:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=SOcZYQEb; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1726533AbfLBKD6 (ORCPT + 15 others); Mon, 2 Dec 2019 05:03:58 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:42428 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726707AbfLBKD6 (ORCPT ); Mon, 2 Dec 2019 05:03:58 -0500 Received: by mail-wr1-f68.google.com with SMTP id a15so43402850wrf.9 for ; Mon, 02 Dec 2019 02:03:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=eItUHcPLnmpp23VMH3D0N31hOVNXeHzTJKuy0k/hYsU=; b=SOcZYQEb9Klb5wWtzzOsP+JSBh3vl6wZAgH/PS1GQovbhcVeTGlQ+35kWkJfiEySSM xAxhUVmCrVDOxRG4zxIBp2PrYqoPlihV63Zs2Ie9YcETRwQ1f650vSJx8+WMi7yPFOIn 0yv7orzTsMm5LWRYYLiHKq+f6XogQ/+wq5See1boGLhrt8rLBYxwjPMlE0mGI1vsqBTW 5OP6ioC8vWwIYjdOecA+h6b88YCoGAEKViKfjE0NBkQkXXHQkmR/GdDqu/iatmGnKZNw mB7SYE0CV7nE1MaOOER123yDQVfPfrol/6q+lHaaR54D0ne96OyvhjZCXFDNEC2jhpSf eLSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eItUHcPLnmpp23VMH3D0N31hOVNXeHzTJKuy0k/hYsU=; b=mLNxH4VlbenQK/xFgUEdNlsPCNbqVURMcnsv7z9eHpXKlH2xuRC6Qu+zdaxdwEEnsM m31hvyc4NG2mkRFOuZMilzl33C8sInSTX9xLMiXCXOP//tecESsMa7IzHKc5e+lhT51k YouClIlMqtyUtMESf21g1hF5P9xP5YqO8Hw2UZX3RipPRYcoinRQ7RzlzPc7iSGZ+DAQ 7h5fOwSPe4Et5d2bioOSmVPmCiXEDPYtDFupvSZ2ylzPjJhqh9Inaw87rTDKD44m23qQ OGcYZDfCUUHdnoWF8x870HALuNDf6pEWSq/t+z0CpVd2HqXfXi0xQ836XKlTWQsccpXw SbZA== X-Gm-Message-State: APjAAAV4lXJbeHrD0F26aqvQvYTXVq3VZ0hpWKNN3liKhjxF/FsAxhRo npFEoVnqQvVUIv7mGIvOzkhyvnbA8sg= X-Received: by 2002:adf:9c81:: with SMTP id d1mr66930612wre.144.1575281034857; Mon, 02 Dec 2019 02:03:54 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.03.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:03:54 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 07/14] media: atmel: atmel-isc: fix asd memory allocation Date: Mon, 2 Dec 2019 10:03:05 +0000 Message-Id: <20191202100312.1397-7-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eugen Hristev [ Upstream commit 1e4e25c4959c10728fbfcc6a286f9503d32dfe02 ] The subsystem will free the asd memory on notifier cleanup, if the asd is added to the notifier. However the memory is freed using kfree. Thus, we cannot allocate the asd using devm_* This can lead to crashes and problems. To test this issue, just return an error at probe, but cleanup the notifier beforehand. Fixes: 106267444f ("[media] atmel-isc: add the Image Sensor Controller code") Signed-off-by: Eugen Hristev Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Lee Jones --- drivers/media/platform/atmel/atmel-isc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 2.24.0 diff --git a/drivers/media/platform/atmel/atmel-isc.c b/drivers/media/platform/atmel/atmel-isc.c index d7103c5f92c3..504d1ca0330e 100644 --- a/drivers/media/platform/atmel/atmel-isc.c +++ b/drivers/media/platform/atmel/atmel-isc.c @@ -1722,8 +1722,11 @@ static int isc_parse_dt(struct device *dev, struct isc_device *isc) break; } - subdev_entity->asd = devm_kzalloc(dev, - sizeof(*subdev_entity->asd), GFP_KERNEL); + /* asd will be freed by the subsystem once it's added to the + * notifier list + */ + subdev_entity->asd = kzalloc(sizeof(*subdev_entity->asd), + GFP_KERNEL); if (subdev_entity->asd == NULL) { of_node_put(rem); ret = -ENOMEM; @@ -1859,6 +1862,7 @@ static int atmel_isc_probe(struct platform_device *pdev) &subdev_entity->notifier); if (ret) { dev_err(dev, "fail to register async notifier\n"); + kfree(subdev_entity->asd); goto cleanup_subdev; } From patchwork Mon Dec 2 10:03:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180569 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982564ile; Mon, 2 Dec 2019 02:04:06 -0800 (PST) X-Google-Smtp-Source: APXvYqzhrUenR1s14Jfwca3G1DDDSqv15og9mwpFz/4QmBmBjYJGR9etU73//rNx/CzE9072KRZM X-Received: by 2002:a17:906:19d0:: with SMTP id h16mr12302423ejd.70.1575281046225; Mon, 02 Dec 2019 02:04:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281046; cv=none; d=google.com; s=arc-20160816; b=D7pFr6cWfFTJp+/NdCh3dE9AqzghLmc4+G3avL1P7/hU4LkNMm83Sgf4E1WjNGFqCk eWnVJTuwtmFZpUV9QrgYXQ7F9XS3IhmwnNffOKGHCI40m7/k19llFuUO2XQHI90fwkpG FS1kPwEd7pIAlQKtef2bOyD3CDVlPwznti+j35KfgyoeDryeCbMcblyBYL3AKHqBjhff sxVY51SLo/8JZ2woxgggDOoL0XW4ttB8kt6HtQSCa8RVer+n+Ln+LBNKO0YM+eA6miIa cHMbG3FkHpogFEx46nZZRsbfKqpu9apqG8hSblEo8y8SgZ3HOQRbm7I4b/G0F21w9D7E Xlng== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=wtROsbUjoLDB5bCQoEYMpQvwKrmALV6Kqcb0leG5CiM=; b=OXdE24wbBWclJAf1gYZOlVbr1hEaaVXeE3+EGJKb9ydVVWqxhA2xh7koPSx8Zv9Zvw wwB/T7Z18mv7I2YWGyUY3gdX7fVUQjLMU/fy/xexhAcuLz1NnnxuyWdzyXkUdMZUBDfX J8+MomW5mc5NZJf2/Im2JwTD6bBOpqvaS6bXxROP1LfpSWkF0nZQyWuspADvHjEhAipm vpypKEhXpvBEubwyY734UcPwp8NFInPAvG5Wpjv5UOoqwBJcR7CoI0X3XNpg/UniTEzT y8+pVDGM++IfsFtgCmCZCNp21N2WOkwl3OrWpbMaxY7so/5OZBPPSwtLykI7aIFXtF2U LtBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DSAhHkT4; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 p21si21018960ejz.196.2019.12.02.02.04.04; Mon, 02 Dec 2019 02:04:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=DSAhHkT4; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1726838AbfLBKEA (ORCPT + 15 others); Mon, 2 Dec 2019 05:04:00 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:51223 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726087AbfLBKEA (ORCPT ); Mon, 2 Dec 2019 05:04:00 -0500 Received: by mail-wm1-f66.google.com with SMTP id g206so21091919wme.1 for ; Mon, 02 Dec 2019 02:03:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=wtROsbUjoLDB5bCQoEYMpQvwKrmALV6Kqcb0leG5CiM=; b=DSAhHkT4ABXACx+/YINknwIGxRO/Z6C9ZGgTY1Jp+bzKmgIig9ZZb45L9xTp7ea1hp /raeG28Q2hN3Y68iop02u6b74gAwagvMUui0AybmFKrTZn1Wf3rqR04iMID5622xeQuo /zpAQ0oqiEh/h6oulX4arXz1j+voAm8tLY/rsMe7ZoBWG6uhPwUUMmE/c28HULOecdvc XxJpCr8A83P3d5tFtU0rHa1B6r+Cmqffjde9qm3nGQZbWtqRv8Vh5Ey+6FWdiNFe6Ax9 qRpc07w/NFzrfpCESNCqb8TmkZZ69UAdgfUD3LbWORV3ZYS9Ib3yz5ciHhLyLGmTal0L YoUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wtROsbUjoLDB5bCQoEYMpQvwKrmALV6Kqcb0leG5CiM=; b=nz8u57C1uylbs9IxGq4F767qGm4pZF+ybCUGySXCHs60qQvPIacudFT7aDAcDitIWb jyX5Sa/a22YZngz5Zsfp+D7Il8zTapE83qxoxumYsYym5Ehcw8w5dme6Ehl0k4ihqMj4 qFoFRusw2us9mLP9p08jvEr8d6zhvEzXCw/c0ggiVTHmX1yCbSBmjRTO38mFyj2q8llR GtmEia+DJTG9VkAEdxMTtSif6EtNaCfKZ6MgU7Nmr3pqULEWAwjUN8TTn6fTFwwAxOd6 6jJL8vSdMaLSp3Jc8qE9E/V1pax0bmf/SEIyk8+yCQ6Pud9IA5hri3OXDLrepKdzw7ae EImg== X-Gm-Message-State: APjAAAVzj0Ki4+mQq2IKXMDRqQeeIjXZanO77AaAbqYyZAmtP92JEW8S TrIf2veC1cmQ5REJsIAtx5Q/I+GXY7s= X-Received: by 2002:a1c:7306:: with SMTP id d6mr6903830wmb.164.1575281037159; Mon, 02 Dec 2019 02:03:57 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.03.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:03:56 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 08/14] media: atmel: atmel-isc: fix INIT_WORK misplacement Date: Mon, 2 Dec 2019 10:03:06 +0000 Message-Id: <20191202100312.1397-8-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eugen Hristev [ Upstream commit 79199002db5c571e335131856b3ff057ffd9f3c0 ] In case the completion function failes, unbind will be called which will call cancel_work for awb_work. This will trigger a WARN message from the workqueue. To avoid this, move the INIT_WORK call at the start of the completion function. This way the work is always initialized, which corresponds to the 'always canceled' unbind code. Fixes: 93d4a26c3d ("[media] atmel-isc: add the isc pipeline function") Signed-off-by: Eugen Hristev Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Lee Jones --- drivers/media/platform/atmel/atmel-isc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.24.0 diff --git a/drivers/media/platform/atmel/atmel-isc.c b/drivers/media/platform/atmel/atmel-isc.c index 504d1ca0330e..0dea3cf2cb52 100644 --- a/drivers/media/platform/atmel/atmel-isc.c +++ b/drivers/media/platform/atmel/atmel-isc.c @@ -1555,6 +1555,8 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier) struct vb2_queue *q = &isc->vb2_vidq; int ret; + INIT_WORK(&isc->awb_work, isc_awb_work); + ret = v4l2_device_register_subdev_nodes(&isc->v4l2_dev); if (ret < 0) { v4l2_err(&isc->v4l2_dev, "Failed to register subdev nodes\n"); @@ -1614,8 +1616,6 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier) return ret; } - INIT_WORK(&isc->awb_work, isc_awb_work); - /* Register video device */ strlcpy(vdev->name, ATMEL_ISC_NAME, sizeof(vdev->name)); vdev->release = video_device_release_empty; From patchwork Mon Dec 2 10:03:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180570 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982576ile; Mon, 2 Dec 2019 02:04:06 -0800 (PST) X-Google-Smtp-Source: APXvYqyaaatGLx8JqnM8j5q9LzTC41B1ls4XLsvUvfo8d7Z6XgT3eeRx0dSfqYOKnOT2XzzKImoX X-Received: by 2002:a2e:880a:: with SMTP id x10mr12976012ljh.211.1575281046769; Mon, 02 Dec 2019 02:04:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281046; cv=none; d=google.com; s=arc-20160816; b=BP2sMlhMnuPJNRfOqtDxFsH3KFfixH2DTmwLnpYxdAxlMVQh+vT6wLfAgBuzE9dwNh Jc5GFiiAa0FH57TV5lKd0XmmSHbhO9U03JkrE2x6CfZLuiAobJ8QU1IwekaUypfV33HH XoH4JIzVj8QxBQzhjf8j+Ie/NjcyGCxOtIjZJ/FQHExuck0yxO9Ak+wCzAJRmvhED5ql LdFuMx4alk6uKKXfLBHoK1urgrHaOhEw0A8mfXZvUywpUlVxKZlXhGPPpUwMbCojFtcz 8DqP0EOkoeAgGRtfMXIFvm0C4GshAPEsgmyBWr2VAQ8pXVE9tt3CG3CaPoUGniEaqsjX 59Og== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=snLx6GTAmI8hTKqhJ93sNeXAAa7a7JDnkHsiqbTGl5Q=; b=TYE2JCVGYjEn3XKhQjjy6ZNuN9aCMgaM+LBgw0hpewHCHU0Nwc8QP1MyARt8CpNsTh L/NZHv/1J4eTuCGFMbkDprIILP7QSvzJ4hxfP9qjRSmAOikF97ynuXFTcJiltHeOV2Ei Rv//BSEXSg7682aCK/jFdoGgCDt9SdZOQouyCjjbfzNhJc1GunzRm3nnzrC2Zm++I7Aq ZXXg3uFM9XZsDfWuzYC2fkIsvBzBjwURWq+5XAhEKxISJMI8maXu6pZATN7wXuF89Qcn x9WZh5FJuk7HJ/wp5LPnidfnDNceVp/Rjkr8EBgxBJwv5MR5irc0ZTX+auQLXSDWI6Jf Sxng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pKxxqHEb; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 p21si21018960ejz.196.2019.12.02.02.04.06; Mon, 02 Dec 2019 02:04:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=pKxxqHEb; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1726949AbfLBKEC (ORCPT + 15 others); Mon, 2 Dec 2019 05:04:02 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:53915 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726707AbfLBKEC (ORCPT ); Mon, 2 Dec 2019 05:04:02 -0500 Received: by mail-wm1-f67.google.com with SMTP id u18so21080765wmc.3 for ; Mon, 02 Dec 2019 02:03:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=snLx6GTAmI8hTKqhJ93sNeXAAa7a7JDnkHsiqbTGl5Q=; b=pKxxqHEbjLrg4js37vFaNdCHdzcGt2brcoOT58d1XIPgE9foFdbRYeZtayCzqvdJLI y8lJb5mGxLXFazlTCn2AObgir4EOzkK0uQhntJNezTi49uNNEoJ3cgWgL8zazB4crh21 sAiBYHvWS8snKiudXz7HqXSekRLsF2rKqSJ49JWSC4LTNLg2tx1ZGRyo07Gsa2slmznZ uDQ3O8SIVsIcifkevkl/12NmFvi4wzOYU7RrabTLuea+UF74tNyunE38VwH+dFQSh+06 MtLEMt+NCYJKElUa9lYXt0QvxjT+vUnSY568bkfjLtYjBLyAK0cfYn5G/99ZONiofVbB Zpxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=snLx6GTAmI8hTKqhJ93sNeXAAa7a7JDnkHsiqbTGl5Q=; b=D+DWQmlgky7Mo+j2P8FckP0w4IIf+b9anCD1YCH0hkJ3ohn2/W93XJt4TFbiY0xDt5 qxjoMcn31Fz97KNKToLf0j9vzsnxlt87zf1MtdgBSE+zfknEe/ji0tRkGOfZGbIBarJb IsZoxkqam5W2HU+t+mzOErwZjEQhn2ijEP+cW20A44t+1doqLApYMrBA3ZhQi+hjac8q jZekfY0gFLANq9+E8/YJGs5EAXeC8CCCahxJcZRPcpdvjKrpgDLU5e2l66paO/iPc/HZ vB0jcqBB8lE/oSP/07C8zKkR9htL0F+yRux/jqzWgWfE/CE72a+6KmdOumnfGRwakwmR lclQ== X-Gm-Message-State: APjAAAXhtpekwO3f5uRz0QTsWpmBn0qLquvvmjS+xzAP2+OaY15mJ4bE D+tvs46vDhtxWio0pvHGa2teQLDjhfU= X-Received: by 2002:a05:600c:296:: with SMTP id 22mr27407278wmk.155.1575281038353; Mon, 02 Dec 2019 02:03:58 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.03.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:03:57 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 09/14] mtd: rawnand: atmel: Fix spelling mistake in error message Date: Mon, 2 Dec 2019 10:03:07 +0000 Message-Id: <20191202100312.1397-9-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Miquel Raynal [ Upstream commit e39bb786816453788836c367caefd72eceea380c ] Wrong copy/paste from the previous block, the error message should refer to #size-cells instead of #address-cells. Fixes: f88fc122cc34 ("mtd: nand: Cleanup/rework the atmel_nand driver") Signed-off-by: Miquel Raynal Reviewed-by: Tudor Ambarus Signed-off-by: Lee Jones --- drivers/mtd/nand/atmel/nand-controller.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.24.0 diff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/atmel/nand-controller.c index 0b93f152d993..d5a493e8ee08 100644 --- a/drivers/mtd/nand/atmel/nand-controller.c +++ b/drivers/mtd/nand/atmel/nand-controller.c @@ -1888,7 +1888,7 @@ static int atmel_nand_controller_add_nands(struct atmel_nand_controller *nc) ret = of_property_read_u32(np, "#size-cells", &val); if (ret) { - dev_err(dev, "missing #address-cells property\n"); + dev_err(dev, "missing #size-cells property\n"); return ret; } From patchwork Mon Dec 2 10:03:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180571 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982582ile; Mon, 2 Dec 2019 02:04:07 -0800 (PST) X-Google-Smtp-Source: APXvYqwacdxImn2/dbY6Z3Wh3cQw96uLhNKX4gjRLTffr2t84OU9KvJ+6mD43cfIQqWIe5k4244G X-Received: by 2002:a17:906:d8ae:: with SMTP id qc14mr33255710ejb.174.1575281047219; Mon, 02 Dec 2019 02:04:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281047; cv=none; d=google.com; s=arc-20160816; b=PgMZNuVQGrFhqadBPh7vylrEyRZTlgbmHLMLFI06yXvisWc2+0eQU6Oqg68SaZwyXI ByHe915D30woPxHmn7C0acEkCcAI5Xza8Xx8Btg5X91ob8umlkBIny2RIxIln5tKjOr9 mNHBBlp25ZI7JKMn7zLzveJ5LEMiejHK0w5ATYC/70qH1l347tllglsCInUSpV4ITBYj YDEZem2a5gU+U/QtvwtTAsnFdJpDNeHGd0cfgYwSe/R+j5RLMFoz5g9gQVZHYjK8Lodp 5ht4qmpdcfnuiHem8Kc2cErjFGAHkUK/TPrOGSehJIZMfxewKdTyL7anFwLhvOXczzV+ 0v9g== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=VvMatzEvj4EF7V/05uwq5RXOQ+lvILIgL3z5k3oCXqs=; b=Ls2EI0lQ6xAVNkI2zP/Lm2NfioKSiWGd4W8mpQ0BuQB9fldL8RqVScwiOodjzKcUGw Q79/w/WtFrGdc/JGVrYuAAqkgfIuEvllGFkbXmUOyICm+Fa2y+X3B1kdL5sETY7U92Ig gVJmUBgYB/W6SP4xBKTr2DmXMXuTwsMkaAXCQpSZ8SpMDgZWPcvHlHdjUSk3PuJeKMES bg4WJw3ZGJSM0tlLiwqfuCBe9bGQlh3GyN2drJLFFVpEkjDD1VPLiZahA27Wr8uWGjM1 APPEiVr7rIvoMRCM/LeHvZJn4y6EzcrTnCPmX/PV2PLvul2wxJHVV/+6NZo7xrkyceVY Vzgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZmyIMB9B; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 p21si21018960ejz.196.2019.12.02.02.04.06; Mon, 02 Dec 2019 02:04:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=ZmyIMB9B; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1726707AbfLBKED (ORCPT + 15 others); Mon, 2 Dec 2019 05:04:03 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:38357 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726087AbfLBKED (ORCPT ); Mon, 2 Dec 2019 05:04:03 -0500 Received: by mail-wm1-f67.google.com with SMTP id p17so9607516wmi.3 for ; Mon, 02 Dec 2019 02:04:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VvMatzEvj4EF7V/05uwq5RXOQ+lvILIgL3z5k3oCXqs=; b=ZmyIMB9BzKYSyE9JoYGgQ8+5aMvPeDcMs6TTzc2VIeNumTj//K1aI5tYA9GvBJR4Z4 XPZCz2rDWdbRZpVz1DkvPaIZckTF7hzc4ZUNOX18ktbq7oWa/tuwghGwWsdK0Dc0qSTm wgw+EPTyW6JbuoIAHsxop5whDcqGbhGbeI6DQJasbAsXB/RB5IoGTCmXTagC1yPCkvgd a8q7N0xWT3gs7y+Y1gkrvOIKOuxd7QnU9+oeyWtEoxg+qCD/BPlDjGaieMc+J0rmfJjC tsQ+g83KJdS2Iy6k93Gnv2zI6ThW9YDOFuJkZx1Jy6UwKO4eDSiAPnI/vUHyNoOGjvKk ZCyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VvMatzEvj4EF7V/05uwq5RXOQ+lvILIgL3z5k3oCXqs=; b=RD7uYYebLnofcL039qGsbFbW9KtanN80VEjA9ChaB1JZJu6R64+iCQPF67EgrUZSjF tzuFQGExTGtXnGSxNhndgyWANV5JzNk0eGKOT3X2YPEbMAenNi8OnTIoJnOJIOlqD+80 1lmTZAy3aT84zqDkv/jeo4mXsPr0nQW05LSGI3JLbNzjSuumF2+rS1oaZn6Yi863q2bn 6zHO0IIQ2OY6E3tDnirPiCdASkHLcBpxmdjQDw5tCe9Ewl8qHqeiLTzIapYW0CnCnZsC X+VzAhYVOcSJtWxFl3OsPqWdW2hhZjqeoQMAB4NXXAdkYWy9Xbw979dw/PQOOPLsbYlB HDgg== X-Gm-Message-State: APjAAAVzf3YysINapTD/T5aYYuZxnfThgIJKc/3yAnnr5M84FAStA2kG hhtBTXWD0ztsICwJaDJTgPfek7JJSI8= X-Received: by 2002:a05:600c:2218:: with SMTP id z24mr17961043wml.50.1575281039617; Mon, 02 Dec 2019 02:03:59 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.03.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:03:58 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 10/14] pwm: Clear chip_data in pwm_put() Date: Mon, 2 Dec 2019 10:03:08 +0000 Message-Id: <20191202100312.1397-10-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Uwe Kleine-König [ Upstream commit e926b12c611c2095c7976e2ed31753ad6eb5ff1a ] After a PWM is disposed by its user the per chip data becomes invalid. Clear the data in common code instead of the device drivers to get consistent behaviour. Before this patch only three of nine drivers cleaned up here. Signed-off-by: Uwe Kleine-König Signed-off-by: Thierry Reding Signed-off-by: Lee Jones --- drivers/pwm/core.c | 1 + drivers/pwm/pwm-berlin.c | 1 - drivers/pwm/pwm-pca9685.c | 1 - drivers/pwm/pwm-samsung.c | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) -- 2.24.0 diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index c45e5719ba17..b1b74cfb1571 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -874,6 +874,7 @@ void pwm_put(struct pwm_device *pwm) if (pwm->chip->ops->free) pwm->chip->ops->free(pwm->chip, pwm); + pwm_set_chip_data(pwm, NULL); pwm->label = NULL; module_put(pwm->chip->ops->owner); diff --git a/drivers/pwm/pwm-berlin.c b/drivers/pwm/pwm-berlin.c index 771859aca4be..7bb819e3c0c1 100644 --- a/drivers/pwm/pwm-berlin.c +++ b/drivers/pwm/pwm-berlin.c @@ -78,7 +78,6 @@ static void berlin_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm) { struct berlin_pwm_channel *channel = pwm_get_chip_data(pwm); - pwm_set_chip_data(pwm, NULL); kfree(channel); } diff --git a/drivers/pwm/pwm-pca9685.c b/drivers/pwm/pwm-pca9685.c index a7eaf962a95b..567f5e2771c4 100644 --- a/drivers/pwm/pwm-pca9685.c +++ b/drivers/pwm/pwm-pca9685.c @@ -176,7 +176,6 @@ static void pca9685_pwm_gpio_free(struct gpio_chip *gpio, unsigned int offset) pm_runtime_put(pca->chip.dev); mutex_lock(&pca->lock); pwm = &pca->chip.pwms[offset]; - pwm_set_chip_data(pwm, NULL); mutex_unlock(&pca->lock); } diff --git a/drivers/pwm/pwm-samsung.c b/drivers/pwm/pwm-samsung.c index 062f2cfc45ec..3762432dd6a7 100644 --- a/drivers/pwm/pwm-samsung.c +++ b/drivers/pwm/pwm-samsung.c @@ -238,7 +238,6 @@ static int pwm_samsung_request(struct pwm_chip *chip, struct pwm_device *pwm) static void pwm_samsung_free(struct pwm_chip *chip, struct pwm_device *pwm) { devm_kfree(chip->dev, pwm_get_chip_data(pwm)); - pwm_set_chip_data(pwm, NULL); } static int pwm_samsung_enable(struct pwm_chip *chip, struct pwm_device *pwm) From patchwork Mon Dec 2 10:03:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180574 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982591ile; Mon, 2 Dec 2019 02:04:07 -0800 (PST) X-Google-Smtp-Source: APXvYqw8TruEZ2/7kaHY4SXAcfBS09uabDvEeL9upbU5BmeWQaCSZgmQUQo1mpukCbbza/hHCALQ X-Received: by 2002:a17:906:7e4b:: with SMTP id z11mr8566674ejr.73.1575281047798; Mon, 02 Dec 2019 02:04:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281047; cv=none; d=google.com; s=arc-20160816; b=RtJq+2Tpy08118IqDpwCHinW6eQMX2dUOHxWDY0iELFfVmIQvdmoES+fQ6iQDL8CYm SkyMhj/O0ZqR1RY7YCP0QZfI6Hk62azB08yLr01m0P12DUO/lWnw4gPt5GFK6BvHOy6y rK8tRiz1C05lyvZGrTkjJZ/8XvUxGtCfwos0fVRzVvr8uKuOf/xGg7OYQ4BRZmu0/3eb jVKF+N2ibTA/uh2+n7O0/RmS9JyVNTPnzQOIAROGe4CyjkzlOSVH1vPEM9eawLghFWCK 7XHxBmUiN3siRoxAAR/lld6OohA8E7owp3ws2HHh6Eualo+itcJQ+Qjv+f+3FIQFc4YQ Y5HA== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=5ZVa6kq1mJCk2ugA3PttYrwn9cQp3DBRKWj2cZpAQC4=; b=AVITpqfHxqehy9h1mn0GUuqAgaGksTxaCqFZBzUfbNSaKy871f45jQG0pUidjfLwgC oG+VfysfQPFkMoDjSuzvhYnLfICAkLXTziWM9zwFnnlvCeFTfQ9g8mfoP/pgUbLOVkl0 4IP/N3+4p5S5s57UFNlKY87ZWPKYK2j4JxlqBX/rPEoR7/hleYiEdAOli8lTafrlrgWt mWI2BwBTIsntECJu0ELYJoM7VQK77IUalbx0cHzV01DO2Dy2hEp3oWz7zsOzjYdjtluP vmGrEKf1iwg3nMaUKmcWz5QC0USrGVGXiEoM3qdQH1izOFCq7JzxIS3FXDOR7HUjpn/1 L8Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r59hMrsF; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 p21si21018960ejz.196.2019.12.02.02.04.07; Mon, 02 Dec 2019 02:04:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=r59hMrsF; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1726087AbfLBKED (ORCPT + 15 others); Mon, 2 Dec 2019 05:04:03 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:36525 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727312AbfLBKED (ORCPT ); Mon, 2 Dec 2019 05:04:03 -0500 Received: by mail-wm1-f65.google.com with SMTP id p17so16575321wma.1 for ; Mon, 02 Dec 2019 02:04:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5ZVa6kq1mJCk2ugA3PttYrwn9cQp3DBRKWj2cZpAQC4=; b=r59hMrsFxVfzeFoTz55x4dEZj/jaxCJ6PqtUrFgBI+Thwk+qA96TIB/fDPS+MshGcJ yHBCKM6lZcVaS9DpjZ6/6RYFfBD8cPvQnrJaPKtlkUWRBsCdHve7S0szJupAd6drknA0 So4K7p1mgWucq1tDg3+phTF27WpmySKSCQYRD8kaqoL7UbCVOpB6cvHoWCRfXF7RCbMQ vVKClLa0p2Uor9lJJKVuNw6bL6Esjq4ctNCJizp5ExG89EzEFSwJbmSh8au/L4jkv228 xm4WsEF2cm+/r2kRf0WHBatanLa2TLg87wO33cCUITqIeMRO/UlxigWPTYVbpNCIzGJi wkZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5ZVa6kq1mJCk2ugA3PttYrwn9cQp3DBRKWj2cZpAQC4=; b=Fy2+F4/y6BFYVSbHSgK9MmlPry1t8olByqXSVrVUi79Pbm0BdwY0pnhHCU2oNux5hX W9VjEbuIPoOpCnGt8WG7HYUl3d7yU8xXoGewZPNRbvM9fVRzDMfXP3k+mlUfRDpA3H0N G3Yhy6+9nNqQS7hA/bdEZNhb79WBHucm8FYIp5zq+355Xn8cNmYfaiEuAtckZ14yQjJ4 OLYlmozpZfCc4pX6vPP1UjMKZD0a8eJSV2lOWfnfDFslOZyIMoxBsxPWOzuSrflamanD /hZgGuXgELxk6HO6mbBgJjBpgeM6OTPp6AkwL4/zQKfsjHgarQ4ZLCZBQ3XhRTumVakX qlOg== X-Gm-Message-State: APjAAAUz63e/BXdFsRY9GMu76cGq4H9i+nmFGhB98iHGIn5zTDIYscGw JrZOxwPBGPhJ9oleWhhHLD/lGAC7YLQ= X-Received: by 2002:a7b:c955:: with SMTP id i21mr15275918wml.172.1575281040806; Mon, 02 Dec 2019 02:04:00 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.03.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:03:59 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 11/14] net: macb driver, check for SKBTX_HW_TSTAMP Date: Mon, 2 Dec 2019 10:03:09 +0000 Message-Id: <20191202100312.1397-11-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paul Thomas [ Upstream commit a62520473f15750cd1432d36b377a06cd7cff8d2 ] Make sure SKBTX_HW_TSTAMP (i.e. SOF_TIMESTAMPING_TX_HARDWARE) has been enabled for this skb. It does fix the issue where normal socks that aren't expecting a timestamp will not wake up on select, but when a user does want a SOF_TIMESTAMPING_TX_HARDWARE it does work. Signed-off-by: Paul Thomas Signed-off-by: David S. Miller Signed-off-by: Lee Jones --- drivers/net/ethernet/cadence/macb_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.24.0 diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index bc9ab227d055..5aff1b460151 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -852,7 +852,9 @@ static void macb_tx_interrupt(struct macb_queue *queue) /* First, update TX stats if needed */ if (skb) { - if (gem_ptp_do_txstamp(queue, skb, desc) == 0) { + if (unlikely(skb_shinfo(skb)->tx_flags & + SKBTX_HW_TSTAMP) && + gem_ptp_do_txstamp(queue, skb, desc) == 0) { /* skb now belongs to timestamp buffer * and will be removed later */ From patchwork Mon Dec 2 10:03:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180572 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982602ile; Mon, 2 Dec 2019 02:04:08 -0800 (PST) X-Google-Smtp-Source: APXvYqwFK6LPX5Vzb/EOdPjWjlZREtAvihJp7WdchyuVJ8T8v8BhfazqBuyF7pWWNCscTrA/PYRY X-Received: by 2002:a17:906:7212:: with SMTP id m18mr1319499ejk.98.1575281048242; Mon, 02 Dec 2019 02:04:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281048; cv=none; d=google.com; s=arc-20160816; b=W8hMz8BYxSgRpALdy06mbtwm0QxIZyErUCAoVR9yXPAJDdsttiyOHhh98dlr+hlzrR V5DlWoDGjiK2/pRjR30hnyV2fztbtYHtuo3nlRPyeNILNAP217vsSbDfLjemyBa39dWE AWRgBZAMiI0GesfY7ShD5egNP/yYVYghQ2HaPhMUAdPHUX7J+liuNEWTsc1rNclvPlZP 7OOGJ17v0mZa/FxCEvFEUUe4O3F2ivJPP0Ka/tq5Wuc26IP1BztTq1JgqXzGJUkVXd0M mdHMuazk/+Ga9RqO3QmQTikWzEpSu3ZkFw8bek2vzKYfFdz6TfRf2HPMn8cNMDcWZ674 cp0A== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=uGmSZAgZbIPTFW/8TzESt4bSkErTu3s+CBvxeawC76U=; b=Up+lebGziNzmk+tbXq0SUyEG6UqiOD/bu6/7HVFWg1A5RR2x+Nr+VYczyCEnYjJ+Xx tdNeRJ0ZBXYQJrVt6j8YWxOeDx8cOJGW0dNnJACrzDDPrUAsPcdRYnzl9NDweOcdwRiA XWrwCVteg1Fx7FVAugWUMx6bG12U3a8JofuBISdaseUyK5qCO5Whzcy0Y6kZvsR2lZGw d/vbk32a9hH3BbSExO3dJVYUq8y2uUpjuRY0sqMzez74l/prXVcf7Blg7B+7dshbkzFr HsOcGa6KwA1r6h8cXz2ZiluxZy80MJ2pvvcimcKjgDLvpzKP/5ERIGlRoiJUbFEOT2Bj J0LQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qZQhHd96; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 p21si21018960ejz.196.2019.12.02.02.04.08; Mon, 02 Dec 2019 02:04:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=qZQhHd96; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1727358AbfLBKEF (ORCPT + 15 others); Mon, 2 Dec 2019 05:04:05 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:40991 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727312AbfLBKEF (ORCPT ); Mon, 2 Dec 2019 05:04:05 -0500 Received: by mail-wr1-f68.google.com with SMTP id b18so43406601wrj.8 for ; Mon, 02 Dec 2019 02:04:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uGmSZAgZbIPTFW/8TzESt4bSkErTu3s+CBvxeawC76U=; b=qZQhHd96YfEe19rtRg6iNa++tihwY8CHECx4KbrjLJlEmqMJhBSn4SpuI9n8+WoaQx gDANsHELWRcQqS8tPF25suuZ6Ez+ih9SxwuGo+J21SGyfG01L01wm9fzdkYUyVjteXgU ANO5am48bCZMyy33fU+ye6z/DmcApTUzgqFmd2TrodfW3N5Xy8XnEZDOJro4Ox3vTADz 2QMhGvCdaqiWXI8VZNWqmhhW5LPzjvF2usv13rPmmnPgj74uuXnAOQfDxVb0MIWk7Eep ZFSd/fed2Tud029RnxK8KSb/6lKY6pkwjS0FceK/4d3eN5tSos/hvNV74KAUVDxiJ+Cc xhCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uGmSZAgZbIPTFW/8TzESt4bSkErTu3s+CBvxeawC76U=; b=F45wc7VNPrGBHe/SJO6hCiAuNzuWbY6p1bqS5EdqjVAxMC+XY0jG1xe/q6c0cDDfmO sPxUb5VldMmNpX4bcDnjzr4Abj8IfxUviXdcHh050uI2/xCdmUVBsYKim2kBYTxJUXA2 TEpcMLPx2vURNyYYFJ0Prt6WQFApCsGSqiRAf4Dt27BVE9ZaAzhSxkfB/pRbwP8GXGOb gWe9lEGhXhxs6ZsGwsWj0ahn8DRhaNo9KG7rPc+YzYXApxKUUCpOHqwYK9qeBTB0Hcqw Ttbi1UBGaX3fK6Wv4W030QGT+MOXEjaegHu2k9XskO10kz6LHgwGVvJte9nKVXTousll +VEQ== X-Gm-Message-State: APjAAAVVAu1lSDRSZI4ZGYIHzmqeNRMTRGqFPC5b2mv8KtVsKiPEWM6S iQCxspJan5dJ2IdHglH1+9CcCBwOodI= X-Received: by 2002:adf:fd07:: with SMTP id e7mr16765754wrr.21.1575281042914; Mon, 02 Dec 2019 02:04:02 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.04.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:04:01 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 12/14] mtd: rawnand: atmel: fix possible object reference leak Date: Mon, 2 Dec 2019 10:03:10 +0000 Message-Id: <20191202100312.1397-12-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wen Yang [ Upstream commit a12085d13997ed15f745f33a0e01002541160179 ] of_find_device_by_node() takes a reference to the struct device when it finds a match via get_device, there is no need to call get_device() twice. We also should make sure to drop the reference to the device taken by of_find_device_by_node() on driver unbind. Fixes: f88fc122cc34 ("mtd: nand: Cleanup/rework the atmel_nand driver") Signed-off-by: Wen Yang Suggested-by: Boris Brezillon Reviewed-by: Boris Brezillon Reviewed-by: Miquel Raynal Acked-by: Miquel Raynal Cc: Tudor Ambarus Cc: Boris Brezillon Cc: Miquel Raynal Cc: Richard Weinberger Cc: David Woodhouse Cc: Brian Norris Cc: Marek Vasut Cc: Nicolas Ferre Cc: Alexandre Belloni Cc: Ludovic Desroches Cc: linux-mtd@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Miquel Raynal Signed-off-by: Lee Jones --- drivers/mtd/nand/atmel/pmecc.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) -- 2.24.0 diff --git a/drivers/mtd/nand/atmel/pmecc.c b/drivers/mtd/nand/atmel/pmecc.c index 4124bf91bee6..8cd153974e8d 100644 --- a/drivers/mtd/nand/atmel/pmecc.c +++ b/drivers/mtd/nand/atmel/pmecc.c @@ -875,23 +875,32 @@ static struct atmel_pmecc *atmel_pmecc_get_by_node(struct device *userdev, { struct platform_device *pdev; struct atmel_pmecc *pmecc, **ptr; + int ret; pdev = of_find_device_by_node(np); - if (!pdev || !platform_get_drvdata(pdev)) + if (!pdev) return ERR_PTR(-EPROBE_DEFER); + pmecc = platform_get_drvdata(pdev); + if (!pmecc) { + ret = -EPROBE_DEFER; + goto err_put_device; + } ptr = devres_alloc(devm_atmel_pmecc_put, sizeof(*ptr), GFP_KERNEL); - if (!ptr) - return ERR_PTR(-ENOMEM); - - get_device(&pdev->dev); - pmecc = platform_get_drvdata(pdev); + if (!ptr) { + ret = -ENOMEM; + goto err_put_device; + } *ptr = pmecc; devres_add(userdev, ptr); return pmecc; + +err_put_device: + put_device(&pdev->dev); + return ERR_PTR(ret); } static const int atmel_pmecc_strengths[] = { 2, 4, 8, 12, 24, 32 }; From patchwork Mon Dec 2 10:03:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180575 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982623ile; Mon, 2 Dec 2019 02:04:09 -0800 (PST) X-Google-Smtp-Source: APXvYqwQi4JcTY/fk5KbOk9AKCaWeJuMPYUwbFaLP3qxAaehH07YyfmPXDc89vE4LwNf1HM8os6A X-Received: by 2002:a17:906:ecf9:: with SMTP id qt25mr7452295ejb.331.1575281049066; Mon, 02 Dec 2019 02:04:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281049; cv=none; d=google.com; s=arc-20160816; b=VPJOKzFkNf98/YK7a6pBgEFcWpZM1yw13UT7ktoz4gJ6vpDRvEqlK1Z2iQIvWYfrcu /UpCWijdLVw2fsAoQXV+pa0wWX3n7jl2iszc5rQEkP+BWebtQ0YzJL2ciTkxIaaRuz/G 5h1gmDax4TcdeQmFSME5m5S1xF3cB7GoPlrJutX0NBFzCd+T4zY45ytBmzRWlu0qeEJH fyLxKJMSQpvPLJV+XLYC9B5+ZIAHUlwN2G8FGRzmew9IDxoSE4kWjnkDnTy8mifOv5g+ TY1aBT5Il0q0t9V4HUVUmjQmFJru/itAXgkdAmQrzxcXqmD60SbX26kzRlU+uN0Z1EN1 xLBg== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=PQ3vTayhg9dI4DRY5KzmFS+ZI1OUJq8YM60IUamu6Zk=; b=rl7aFdjDVmY+xPfQNeoga0NwrEAb3lXLwqQ7ZK6a94QFvUXtcb1Sr8G+yKZ0uZ+JYk fqfU6MYcSK3fbupahQuC3hKK6ppAYFtr/Okx58uIXGGYQER8DasX/9CTgBSYHqyGXAdl 9jI5OffNm6UAe3G/XdrqQqd88f15idSLF4Mggqu8HAUsWlqa4SeoEhFNjh7S4Gfs2Ebp s+7kNWey4Y0vBFfQpYPtXU2u3blEwAjvEeQ3dhNbSdXr8pUJGSl2pQodPTB/GIvj+gAC xim7WlG10DGxlDG7nB6Z4w66i8pMgT9cKYP6Q86boxqaqSrjuWYZTaCJPU2ha2WQKPg3 ezKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CkSMeFFb; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 p21si21018960ejz.196.2019.12.02.02.04.08; Mon, 02 Dec 2019 02:04:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=CkSMeFFb; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1727312AbfLBKEG (ORCPT + 15 others); Mon, 2 Dec 2019 05:04:06 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:37058 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727326AbfLBKEG (ORCPT ); Mon, 2 Dec 2019 05:04:06 -0500 Received: by mail-wr1-f68.google.com with SMTP id w15so12448742wru.4 for ; Mon, 02 Dec 2019 02:04:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=PQ3vTayhg9dI4DRY5KzmFS+ZI1OUJq8YM60IUamu6Zk=; b=CkSMeFFbfFnffmFzGIlUI+GKcfJPkVXNI2+6h6m9loRymOdPG6H6G2SO7iq7yV9o33 Wio9M8K3VLKAJBEMeKj1VUyjzwq3iosLDBcGO42JOVu0K+xrPyXcFhPOGOmh+/CBQEhB FPISibRfHjAI8dK5d7L5c9rYLY4gvqc/l1BF4fq927Nk+Y/GiokyGco8Zp4qa5NnwJvY OrwSXYrqIADN3QbL79z9U9aesYSnLGN2Um7xS/0Tavy6fom4vtth03rZvTWv71AxaQHx sFukBRwMmJoRcQvNWfeBclM1TU/05QLNXR6jTm74HTDb1uwVVP+qX7OgWV51LecBUNuO Jwow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PQ3vTayhg9dI4DRY5KzmFS+ZI1OUJq8YM60IUamu6Zk=; b=HvYb95B+hRV61sd1biRaN/v7iwt4TnBBLl1fHB1eayzRsDnAO91D3f2Rq0BhsS3DL6 soBS9dgyFQrhhVI/R5P6EFwFAG0MTNatInFGwjdYh7X0q14WqqoA2Hi7k3wyu51z65hv 25ZpDBVP/2d1eFmXhAdNS5AjLMMPXb7a9iqNYl6UlYDLcLvjEdgElGA11e1IMxGIc6hn 9eKGW3/X+k0091ZWEtq65FbkHT5T1Opdv3sC4EN7D/7fZqU6HWPNAzNhUpEBPsa/8SfN 65b2iirDqgf+iHw1DtxvHaNzbvLRnMPFoDXN7JQUQTgZIVD/xQ/dpZKzbUKK+xjuXv4O DbDw== X-Gm-Message-State: APjAAAXJtnDSLfL4F+EjXXrkkNTb/DYWSp97dvtGcJldHlxi8EA8mcjC B3bv9lBiMOH+/jlrgUkWJvLFq0mzSZ0= X-Received: by 2002:adf:9c81:: with SMTP id d1mr66931386wre.144.1575281044118; Mon, 02 Dec 2019 02:04:04 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.04.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:04:03 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 13/14] mtd: spi-nor: cast to u64 to avoid uint overflows Date: Mon, 2 Dec 2019 10:03:11 +0000 Message-Id: <20191202100312.1397-13-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: "huijin.park" [ Upstream commit 84a1c2109d23df3543d96231c4fee1757299bb1a ] The "params->size" is defined as "u64". And "info->sector_size" and "info->n_sectors" are defined as unsigned int and u16. Thus, u64 data might have strange data(loss data) if the result overflows an unsigned int. This patch casts "info->sector_size" to an u64. Signed-off-by: huijin.park Reviewed-by: Geert Uytterhoeven Signed-off-by: Boris Brezillon Signed-off-by: Lee Jones --- drivers/mtd/spi-nor/spi-nor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.24.0 diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 6c013341ef09..d550148177a0 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -2382,7 +2382,7 @@ static int spi_nor_init_params(struct spi_nor *nor, memset(params, 0, sizeof(*params)); /* Set SPI NOR sizes. */ - params->size = info->sector_size * info->n_sectors; + params->size = (u64)info->sector_size * info->n_sectors; params->page_size = info->page_size; /* (Fast) Read settings. */ From patchwork Mon Dec 2 10:03:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180573 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982625ile; Mon, 2 Dec 2019 02:04:09 -0800 (PST) X-Google-Smtp-Source: APXvYqyX+oGdL5NV5wF6exrYP5JNiZQdF75qOWYAGs+ipn26SYXD2j0JLb0itSnXlr51vLAaOtN9 X-Received: by 2002:a17:906:d8ae:: with SMTP id qc14mr33255932ejb.174.1575281049510; Mon, 02 Dec 2019 02:04:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281049; cv=none; d=google.com; s=arc-20160816; b=L2TC1yxKYPL2toMs4kyVfylD0rHhKvrFapeOGt9qbmcffq+ca9opWBrOccWND076lf 5NwMHWdlIHmzGfR5Wm/gtzflEjhrLzuJ3mJHKOoq0r3AtcUE/zxC2ome9S/7iRpLyYzK JhqGhFWJLqb0RsA7zq2Ub59MoFMainsR4rR3puyGwlzfvQ6OYdvqbPLlP7nAWzepi0qB /8lNPyPPGAnn4sTw36wWePQML9dgk0LLFjGn+uNUJeF2jnbO0Vh1Q8qEtDWlwQMVB8Dg 0J9+OMr0hRvqmUJWmh6vOxkwDp1871PlCvx5tZa/f6yaCTt2lXZxgQH81/S7Ak/5+ttM v8cQ== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=sHiG2NnNDoK8S4KpbBXz2iGAVpRQXWcAfC+CtzhYGHc=; b=C9ILSNiPhonZcdoraTXwCciK7aYb80ZqFi7ubYfxJoVnozXS/3LdVDEPYGMaEAqS7P y4LBmmbQl4gEaZhOsIMIt5j0l7sZ2HpgiCt27BuAQMhyLrN4cfe7d5VcZ/lTGmVpsRCe K0eae2C+BbOYJhp/RUs3Hnihawctr8YNdLNJbv1O5AHjU5z8Naq3E2CKQPs+KvAoKE4e 9wsdnjEnd9cYrmu1YN0/pqSoZR4v30hH9ssh6a89hMpdtjpOIiW3dW4GFykx1svaZ9QO Y7bm/5rNs5fXprwc3M195dV7zXuKuWSl9T4SRTo6vbyY49BXGcKzfIwjPSWQEv8tMpRh FzFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="u4Xa/h8h"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 p21si21018960ejz.196.2019.12.02.02.04.09; Mon, 02 Dec 2019 02:04:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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="u4Xa/h8h"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1727377AbfLBKEI (ORCPT + 15 others); Mon, 2 Dec 2019 05:04:08 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:46699 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727326AbfLBKEI (ORCPT ); Mon, 2 Dec 2019 05:04:08 -0500 Received: by mail-wr1-f68.google.com with SMTP id z7so39934569wrl.13 for ; Mon, 02 Dec 2019 02:04:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=sHiG2NnNDoK8S4KpbBXz2iGAVpRQXWcAfC+CtzhYGHc=; b=u4Xa/h8hEnYiRzqh7/6FkLRwCeyu0R4ZVqr47DL35nqS1oGdiZq9CwpkP25kjVPuY4 jTZV87ZdRR5xGQhlHhXndxMzAP7wnbudfLggnffK9fqV50g7b0tp5pqShj/QCir8hiGp sjjT/Qik61HO+GpMkGAdvlzI9Jv8JITBtRYRCXJhTRfyTCW8euq1Y4SDFvpb7BjjEeIb 23jSBtZGJo3jxUQBfIHGgeL/C+/V2SyJ6byyTOAzWCVTSfAlHhdC6VXj/6YnsCaTyX8A FFnoNThGan7BDkrACOHJSZBc8lnOML8KZBoD8NgjqZ5GVQB1NVT9ov6zRmtPT1y0gMuk lKuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sHiG2NnNDoK8S4KpbBXz2iGAVpRQXWcAfC+CtzhYGHc=; b=tywPa2YIpReebn+IUnBVh23Om+kTYeeC7J3PJnrodpYdUIE8R/DQN9GU2P0dhJGK3r 5rQHKDNN3QwoNEyGo4iRO14V9LyGMtW3aPBZuXM3lVUXEiQKEK4imFZCxZj4ZDyvFBbO 9oDgxY6petwO4nt0Ly8P+7lWM80eRuB/Ip607aRiGtWRx7dFOeENustcOYfyftDt/IlC QUk0/wp5CXmyEPZ7hWYfLwRiPdlPGEdzMk7rPsAYezdyAHa21LZpo9pQRdsx+cNpQUt7 prZmcAZ1+b6ZUw/wmues+HfK0dl+S/4jB/EchIbw7zWNBBvoMTaEJCnF6LNdVkBzGWe/ eO8Q== X-Gm-Message-State: APjAAAW3vKumL0KNSEsAE5I1IBdM+oqbT+6R6N/kpqr5jTb+of3qAYxG 8Ps4CJSSg5KnUkVjFs1q7XdWiwsc3+4= X-Received: by 2002:a5d:6b47:: with SMTP id x7mr12327249wrw.277.1575281045056; Mon, 02 Dec 2019 02:04:05 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.04.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:04:04 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 14/14] clk: at91: generated: set audio_pll_allowed in at91_clk_register_generated() Date: Mon, 2 Dec 2019 10:03:12 +0000 Message-Id: <20191202100312.1397-14-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alexandre Belloni [ Upstream commit c1e4580a1d0ff510d56268c1fc7fcfeec366fe70 ] Set gck->audio_pll_allowed in at91_clk_register_generated. This makes it easier to do it from code that is not parsing device tree. Also, this fixes an issue where the resulting clk_hw can be dereferenced before being tested for error. Fixes: 1a1a36d72e3d ("clk: at91: clk-generated: make gclk determine audio_pll rate") Signed-off-by: Alexandre Belloni Signed-off-by: Stephen Boyd Signed-off-by: Lee Jones --- drivers/clk/at91/clk-generated.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) -- 2.24.0 diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c index 113152425a95..ea23002be4de 100644 --- a/drivers/clk/at91/clk-generated.c +++ b/drivers/clk/at91/clk-generated.c @@ -284,7 +284,7 @@ static void clk_generated_startup(struct clk_generated *gck) static struct clk_hw * __init at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock, const char *name, const char **parent_names, - u8 num_parents, u8 id, + u8 num_parents, u8 id, bool pll_audio, const struct clk_range *range) { struct clk_generated *gck; @@ -308,6 +308,7 @@ at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock, gck->regmap = regmap; gck->lock = lock; gck->range = *range; + gck->audio_pll_allowed = pll_audio; clk_generated_startup(gck); hw = &gck->hw; @@ -333,7 +334,6 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np) struct device_node *gcknp; struct clk_range range = CLK_RANGE(0, 0); struct regmap *regmap; - struct clk_generated *gck; num_parents = of_clk_get_parent_count(np); if (num_parents == 0 || num_parents > GENERATED_SOURCE_MAX) @@ -350,6 +350,8 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np) return; for_each_child_of_node(np, gcknp) { + bool pll_audio = false; + if (of_property_read_u32(gcknp, "reg", &id)) continue; @@ -362,24 +364,14 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np) of_at91_get_clk_range(gcknp, "atmel,clk-output-range", &range); + if (of_device_is_compatible(np, "atmel,sama5d2-clk-generated") && + (id == GCK_ID_I2S0 || id == GCK_ID_I2S1 || + id == GCK_ID_CLASSD)) + pll_audio = true; + hw = at91_clk_register_generated(regmap, &pmc_pcr_lock, name, parent_names, num_parents, - id, &range); - - gck = to_clk_generated(hw); - - if (of_device_is_compatible(np, - "atmel,sama5d2-clk-generated")) { - if (gck->id == GCK_ID_SSC0 || gck->id == GCK_ID_SSC1 || - gck->id == GCK_ID_I2S0 || gck->id == GCK_ID_I2S1 || - gck->id == GCK_ID_CLASSD) - gck->audio_pll_allowed = true; - else - gck->audio_pll_allowed = false; - } else { - gck->audio_pll_allowed = false; - } - + id, pll_audio, &range); if (IS_ERR(hw)) continue;