From patchwork Thu Dec 19 18:32:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 182188 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp897935iln; Thu, 19 Dec 2019 11:15:37 -0800 (PST) X-Google-Smtp-Source: APXvYqy8tug7sO5pXsrLPP0OhnOXWfaDOP7e8Kpi7CGHhWxjAvrRjoN0otUoyXTNhYvPTdSOMspu X-Received: by 2002:a9d:7f11:: with SMTP id j17mr10834108otq.281.1576782937311; Thu, 19 Dec 2019 11:15:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576782937; cv=none; d=google.com; s=arc-20160816; b=rFkiH4nsAuRjJX83hjtqa1+9L57SlMSmcvNERK0qqRV3IsbzCwdJczSzkKNsx1JPDA 8SHFGmXHqtFGJ5BVWyP+amICH3MbHMZHX8PSi6ADQLgrSJ+lfD8wc7KW8k/TOqIqEVRM NPQVGYfoMXZo9loPlRA6+O7stoP5pBHaCkzLw60BKn6ut0jEPv6ZEQISvS7ew5+GqVbE ke+8BA+AQhjs3fIgN0e5h9Dkemkj/7zsDA7XGoNBCZhSqz6n7YHjeVwWkzs8+tz/X2B7 OaJb9C4aYxLE1+NeInyIkawzx6VWBmBrlkbt3aWmBlIxFjhc3X9SxTtqs2CoNJTQu2Va jqXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DV9bvWfRPmR9/PyHBvj9WHIhay8wbHB4XtLeqjH95LQ=; b=UW4VxR4DylK8xZSI2Yt3f+uUIHYCz6ye9zVJ3Ve82kWu9BEQIDS3UggnhIOJrXEFJo Bz2Kd9RXVXRWkCyWqrqCq9IaV/GF4qNkRkk2Q+dgCd97LqZlX++w2y0PsfDz/jhIKTBw zA4SZD4u8kWaJBb8lLVSDahV8GzMlDPVBhVgSCCd+xOH8Nnoi7+aaFU/9AkLOF5r/SGo XptRNA9Bu9RAldRZmw/GaH1kFPG4t5EUljIH+vIjRPslViNwFZKVTaHR/5C+ezWHqESb 0VoMfhfpgCi24fhoxZGlMqMoojk5Ja4ydtIAct0b2m2TsuPXzKbT1WR3JQfy7uAhqVP3 u6zA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JxMJ1eED; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v26si3819910otj.0.2019.12.19.11.15.36; Thu, 19 Dec 2019 11:15:37 -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=@kernel.org header.s=default header.b=JxMJ1eED; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726984AbfLSTNM (ORCPT + 14 others); Thu, 19 Dec 2019 14:13:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:52348 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727215AbfLSSfk (ORCPT ); Thu, 19 Dec 2019 13:35:40 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 57F7D24672; Thu, 19 Dec 2019 18:35:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780539; bh=2N4Y9xksKY4hiMNzYExeA6o7SGmT7mrkpbxqZrLxnAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JxMJ1eEDhI2oCOgiDy9KMHDqoed53ZlJMeSr19lquInq4Pcw9K3VDVBj8fXB9qBD5 tYnk3e3WWWicvjjFKzy4+jjJRApGEo/ig8GviQG+aDfHxO+W5uCFK6rXUCTYkXpuYI EFIPBT9Jnle8BH1WtPExs08XefryC/DBjcaR4Zxs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Szyprowski , Chanwoo Choi , Sasha Levin Subject: [PATCH 4.4 016/162] extcon: max8997: Fix lack of path setting in USB device mode Date: Thu, 19 Dec 2019 19:32:04 +0100 Message-Id: <20191219183206.742077693@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183150.477687052@linuxfoundation.org> References: <20191219183150.477687052@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Szyprowski [ Upstream commit a2dc50914744eea9f83a70a5db0486be625e5dc0 ] MAX8997 driver disables automatic path selection from MicroUSB connector and manually sets path to either UART or USB lines. However the code for setting USB path worked only for USB host mode (when ID pin is set to ground). When standard USB cable (USB device mode) is connected, path registers are not touched. This means that once the non-USB accessory is connected to MAX8997-operated micro USB port, the path is no longer set to USB and USB device mode doesn't work. This patch fixes it by setting USB path both for USB and USB host modes. Signed-off-by: Marek Szyprowski Signed-off-by: Chanwoo Choi Signed-off-by: Sasha Levin --- drivers/extcon/extcon-max8997.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c index b2b13b3dce147..3d6b42f61f56e 100644 --- a/drivers/extcon/extcon-max8997.c +++ b/drivers/extcon/extcon-max8997.c @@ -320,12 +320,10 @@ static int max8997_muic_handle_usb(struct max8997_muic_info *info, { int ret = 0; - if (usb_type == MAX8997_USB_HOST) { - ret = max8997_muic_set_path(info, info->path_usb, attached); - if (ret < 0) { - dev_err(info->dev, "failed to update muic register\n"); - return ret; - } + ret = max8997_muic_set_path(info, info->path_usb, attached); + if (ret < 0) { + dev_err(info->dev, "failed to update muic register\n"); + return ret; } switch (usb_type) { From patchwork Thu Dec 19 18:32:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 182158 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp851936iln; Thu, 19 Dec 2019 10:37:27 -0800 (PST) X-Google-Smtp-Source: APXvYqxAoUEJ1YT++2YyQdDCrOGzPWCsh8Tv764JKBnvtzjFFsPHpEDI66Tr0KkKYO8eKiyXHFAy X-Received: by 2002:a05:6830:1149:: with SMTP id x9mr10578951otq.156.1576780647079; Thu, 19 Dec 2019 10:37:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576780647; cv=none; d=google.com; s=arc-20160816; b=mcNMNiTffdP0IejGSGe1q7hvTB29XKizlPrsXrM9BzRCzkgEAa3HXXofTaOIOaRcET 8tS1Oc9g3yRP3/3MyiLdUgxbBU4BGjZSDYnaTchrm+1qkhsafykryjcYUdpL9zdbQ3om Yoo0Htxh9m+GQFotqc0NDOMTB/smpi+06DaaBTzWLmXxeGL7tcxyG6+Ia92r6p6x1ofy 9RgnBlDlC1e2N43IRuW8rWeWjDHUZJeUqJKtn1x7tnPWE+J4gpoaJQvXMlDG0t0nMLGX OZu9DyjvhFk/IbM3G8bbWhIpaL0aaTp9B5TOcgOmhyg8u7h1SactgmkHiV+LOg1U5nHn xQHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Lqa7z+Y5G6gVR6ooNhCnbiNpQ5LyZqtBHLeDDA8gvh0=; b=etRgL/kLQhbwOqusgHr7S7JFLxr42Xz3stQlI17BtDyonWfwAcm+/vj8RqVx/c2qT6 5ECf/mri03IW9sJWhqXZgWnkkQNF1Ipq3KjPAcnKORTwnvv9s4AXCmpfveuS4TB0gMf3 Xf3o7B62Qtdr19+TRijA6Sz7+DAz4hwpMm/KR3rIcT29nGOiZjnOElry2BdaA7ZFQ+Ly c1E63EHDt79cx2ABiWPFkfD5/5IiTa2seSSK4yLg+1RW8NwNo/YANqmZwUOjazgu3IQE iFxms06Lq4KJDv0T5AUgENse/33HL0TWDSR77r4ZfzGvI57sCIICSzXbdgkMKiXLRhYG TaRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NDqbVa2q; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i6si3672606oth.182.2019.12.19.10.37.26; Thu, 19 Dec 2019 10:37:27 -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=@kernel.org header.s=default header.b=NDqbVa2q; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727822AbfLSShZ (ORCPT + 14 others); Thu, 19 Dec 2019 13:37:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:55010 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727818AbfLSShZ (ORCPT ); Thu, 19 Dec 2019 13:37:25 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2A21D2467F; Thu, 19 Dec 2019 18:37:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780644; bh=ScASG/VjKteCyDiSyPA9ri5oFWrggjTwuysKo02NQB0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NDqbVa2qaxiUwYX5KQoCrO0WB7kWL8KoseHcMJ9lRGgOuUJ8hKCejPafx/pkT0AyK QrFHWxGWJMVgibKC80HHzARf024Rp73/Grok57Hzb+RqWHf1GkGVRtLWYaVK3ZWyNC vjwC+hirqfI5g3dWQO7PMVtEUqjM/n9plOuF0rQ4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stephen Rothwell , Vinod Koul Subject: [PATCH 4.4 031/162] dmaengine: coh901318: Remove unused variable Date: Thu, 19 Dec 2019 19:32:19 +0100 Message-Id: <20191219183209.593181643@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183150.477687052@linuxfoundation.org> References: <20191219183150.477687052@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vinod Koul commit 35faaf0df42d285b40f8a6310afbe096720f7758 upstream. Commit 627469e4445b ("dmaengine: coh901318: Fix a double-lock bug") left flags variable unused, so remove it to fix the warning. drivers/dma/coh901318.c: In function 'coh901318_config': drivers/dma/coh901318.c:1805:16: warning: unused variable 'flags' [-Wunused-variable] unsigned long flags; ^~~~~ Fixes: 627469e4445b ("dmaengine: coh901318: Fix a double-lock bug") Reported-By: Stephen Rothwell Signed-off-by: Vinod Koul Signed-off-by: Greg Kroah-Hartman --- drivers/dma/coh901318.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/dma/coh901318.c +++ b/drivers/dma/coh901318.c @@ -1810,7 +1810,6 @@ static struct dma_chan *coh901318_xlate( static int coh901318_config(struct coh901318_chan *cohc, struct coh901318_params *param) { - unsigned long flags; const struct coh901318_params *p; int channel = cohc->id; void __iomem *virtbase = cohc->base->virtbase; From patchwork Thu Dec 19 18:32:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 182155 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp851365iln; Thu, 19 Dec 2019 10:36:53 -0800 (PST) X-Google-Smtp-Source: APXvYqwuEP7MXequ4i9SfZ5rGVhPNAickH1mraRtpvespdm15o3YdziVJUS+Oc5Fo94/Cb5utTb6 X-Received: by 2002:a9d:7586:: with SMTP id s6mr10107703otk.342.1576780613819; Thu, 19 Dec 2019 10:36:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576780613; cv=none; d=google.com; s=arc-20160816; b=OcxMjm2i0Ba99+/ArdEPxB+gA68EqeznklusPWlFHMLwc57wniBTuK8BuikdO9H6nM YryXte/gv2JRJnsaKMIcqf5Xf7F0F3HBmqnUUSZviv//nRJmAxegxF0cJpdLrpnrZIE8 c74qr46aQEFw/2r9qVtNlyZTq2Mnu0I6JpAHRpiq9oOoYUISsMsAXekq2IMpqgDIsz8c CNdCOF8dnNjpCE/2Zp3IvOFcNZyEi7tyBA/RpSUMJAewMMkOpVfHXHyNk4xKVKtMVRsy sm6rSOqMWisAmxysIvXVsrpuzqPOmjTVOzbjkbbyo4XmSRpJCmCxG7lGywHoJUBDuqIy Y5vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cWzW9yRIZfF7HSE7jm5yPHlVGQgPt+TUWJFNAfwkYZ0=; b=G3S4nImBEoM59B5EaSBn60DFmcmILmtaIYTtI7qVUKJN39KZfAmuJGnGME/ewd+HFN BGt3mL86BwsVJU4M3oyWslWPFySWyiy8Dw4DqHc1TdWXotDkVvf+zrrshMzAuhHLtzT+ dL84r9sI7W4elsIBL8xJzQPpeNI9ETcqWrzUjuuGZJwc7UJ5F7VLVdKKEYmXK5pyr7j0 XS4X6FMTfOhauONeXCKjEKhiMNVz02adWnEm9PZe2zjLk1+DyCrVJyPfrV1tOT+i6G05 OuRWZO1vfHzTPR1FWh38D8bz/5HX53PNl2B0Akby8VBnvIVZsp94sqXHHkZM8kgNhrZ7 pPjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=z6b0IQ89; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m23si3411609oic.43.2019.12.19.10.36.53; Thu, 19 Dec 2019 10:36: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=@kernel.org header.s=default header.b=z6b0IQ89; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727705AbfLSSgw (ORCPT + 14 others); Thu, 19 Dec 2019 13:36:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:54058 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727688AbfLSSgv (ORCPT ); Thu, 19 Dec 2019 13:36:51 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 459CD24679; Thu, 19 Dec 2019 18:36:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780610; bh=Ry25ZJNwSjwRt9dR556q7Qn9xzg36UfXvQGRWDhy/jM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z6b0IQ89qfoNWKmnxl4QVaLdV+A3euAPJmbweoIwSWGseI78IBTvDJGeh8AFHOi/V PJWs69MIv4xDE6Zs3B6zfgHCZ/qcgS6Jw7M/j5jdy62AVZhM5y+wL57fOQv+TBQjQQ GTGH8ZyBFUHDEykhxJvQlywdKB/4/6+7zZVz2BgY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masahiro Yamada , Sasha Levin Subject: [PATCH 4.4 045/162] kbuild: fix single target build for external module Date: Thu, 19 Dec 2019 19:32:33 +0100 Message-Id: <20191219183210.650928864@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183150.477687052@linuxfoundation.org> References: <20191219183150.477687052@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masahiro Yamada [ Upstream commit e07db28eea38ed4e332b3a89f3995c86b713cb5b ] Building a single target in an external module fails due to missing .tmp_versions directory. For example, $ make -C /lib/modules/$(uname -r)/build M=$PWD foo.o will fail in the following way: CC [M] /home/masahiro/foo/foo.o /bin/sh: 1: cannot create /home/masahiro/foo/.tmp_versions/foo.mod: Directory nonexistent This is because $(cmd_crmodverdir) is executed only before building /, %/, %.ko single targets of external modules. Create .tmp_versions in the 'prepare' target. Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin --- Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/Makefile b/Makefile index eb4f5b889a1cc..42102ffb9eff8 100644 --- a/Makefile +++ b/Makefile @@ -1424,9 +1424,6 @@ else # KBUILD_EXTMOD # We are always building modules KBUILD_MODULES := 1 -PHONY += crmodverdir -crmodverdir: - $(cmd_crmodverdir) PHONY += $(objtree)/Module.symvers $(objtree)/Module.symvers: @@ -1438,7 +1435,7 @@ $(objtree)/Module.symvers: module-dirs := $(addprefix _module_,$(KBUILD_EXTMOD)) PHONY += $(module-dirs) modules -$(module-dirs): crmodverdir $(objtree)/Module.symvers +$(module-dirs): prepare $(objtree)/Module.symvers $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) modules: $(module-dirs) @@ -1478,7 +1475,8 @@ help: # Dummies... PHONY += prepare scripts -prepare: ; +prepare: + $(cmd_crmodverdir) scripts: ; endif # KBUILD_EXTMOD @@ -1602,17 +1600,14 @@ endif # Modules /: prepare scripts FORCE - $(cmd_crmodverdir) $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) # Make sure the latest headers are built for Documentation Documentation/: headers_install %/: prepare scripts FORCE - $(cmd_crmodverdir) $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) %.ko: prepare scripts FORCE - $(cmd_crmodverdir) $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) $(@:.ko=.o) $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost From patchwork Thu Dec 19 18:32:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 182157 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp851706iln; Thu, 19 Dec 2019 10:37:13 -0800 (PST) X-Google-Smtp-Source: APXvYqxLudZC2jd6uaUxNWvHZbGiw3/waIWPFLJaPZ9JLM52AhmNEn3XQ65h+FfcV3XpIEJsYarS X-Received: by 2002:a9d:461b:: with SMTP id y27mr11118192ote.280.1576780633075; Thu, 19 Dec 2019 10:37:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576780633; cv=none; d=google.com; s=arc-20160816; b=m3TiqH1rkBcuHTlda9QsQToOf8MkUtYuUhIvFLt3QrfDzVsB8oLNn9x1XE6yp2odSn rJXA+HI/Unv89qOHmJzngqW/7cthKwYEfB1pit3Y2MqtnG0PG0LctDLiKLdVxsqteHt0 e2+0xwDfPG7pkCFu2OZz353Z+bCV0OMew+zWH7rce5zP9BQ+bHCz2HeL/Ty/14CaY87X H97YP49DQJ2bvcGY+2mubdm8n05+N4YybbgCaldsTV8IDbUbvaquQFOhFaMqNIk2peyU XkmGK+GXLDhh3kjRXfNJqDAAatVXxXZ0wkBuJf3KPVi++2XCdb1Yxm/XGLDx4yKJcpTC h65w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Iu6TqCgMd9AIHDzzVfScYSohESVh+aRURvkX6oUa+VY=; b=VbGSyM6bbdg6AC+biFg1CfzmI8x1T51wtibMOBX6punU9B2MgBVsyxyG2hOrPxiw/O jvIofXS938+0AXSkVtIfFY3qFzATCXk6TGOSBVr/Uudb9gTE9RY+gXLPs+q2sGKaZFe7 8MyXafMY+px/iXthxkqSs2PXmKJp+akzXzqQHgG33Q27Zz+TUqNy7PuydbbvgHk8l2eb GmIFJ7Y810rv8h+NH+PYNMsznSuT3EGg2GAQbQ7CWjmsCoEfXU0cAwVlkhTTylAhl+m0 yxpzL3ftpzIWX+d6i03YEdSo7/MWzgzAaJshINiqoX1OefSiSvif2E/Nqok88AwShCuh 7Fag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Njj56N4+; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g26si3509643otk.324.2019.12.19.10.37.12; Thu, 19 Dec 2019 10:37:13 -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=@kernel.org header.s=default header.b=Njj56N4+; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727270AbfLSShL (ORCPT + 14 others); Thu, 19 Dec 2019 13:37:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:54570 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727750AbfLSShK (ORCPT ); Thu, 19 Dec 2019 13:37:10 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A99DA2467F; Thu, 19 Dec 2019 18:37:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780630; bh=qyRQK2XNFhzNTl1dttZTfXeag5fD1ibX+yF6N58wdvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Njj56N4+tp4l7oN0hL46LGbxammfIuNV+yeeYdy+yM62JO/LromhUncKEgXU1vyXF 0L/P+A0koVGn/EH+WfFlAzzTf93doC8M8zY6LwM3oO1lMaLm1zwgJrMyouLV8WtQCS 7IbC67ML7KAG8je0Dn+Nd57NnOatsnZ1e7ZJPzII= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maxime Ripard , Chen-Yu Tsai , Rob Herring , Will Deacon , Sasha Levin Subject: [PATCH 4.4 052/162] ARM: dts: sunxi: Fix PMU compatible strings Date: Thu, 19 Dec 2019 19:32:40 +0100 Message-Id: <20191219183211.060566900@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183150.477687052@linuxfoundation.org> References: <20191219183150.477687052@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rob Herring [ Upstream commit 5719ac19fc32d892434939c1756c2f9a8322e6ef ] "arm,cortex-a15-pmu" is not a valid fallback compatible string for an Cortex-A7 PMU, so drop it. Cc: Maxime Ripard Cc: Chen-Yu Tsai Signed-off-by: Rob Herring Acked-by: Will Deacon Signed-off-by: Maxime Ripard Signed-off-by: Sasha Levin --- arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index b6ad7850fac69..698970d0281f3 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -167,7 +167,7 @@ }; pmu { - compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu"; + compatible = "arm,cortex-a7-pmu"; interrupts = , , , diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index e02eb720c4fc1..a7b4dbda1a878 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -167,7 +167,7 @@ }; pmu { - compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu"; + compatible = "arm,cortex-a7-pmu"; interrupts = , ; }; From patchwork Thu Dec 19 18:34:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 182187 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp897566iln; Thu, 19 Dec 2019 11:15:23 -0800 (PST) X-Google-Smtp-Source: APXvYqxYzYP9pruLFg6b3rLLDL3o4V1jPplatGin0hH0sfyx0QnHEutocXB0Z0u/9EEb28aaPxpE X-Received: by 2002:a05:6830:20cf:: with SMTP id z15mr10411092otq.277.1576782836555; Thu, 19 Dec 2019 11:13:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576782836; cv=none; d=google.com; s=arc-20160816; b=lciEY9Dsn/OAZzQ4R4oLyRqeaQ8zk0zlOtAtosvDQv0/PPcHSvtsBCZYjQv6/XzRWA 4AQgy/O+dY8SpQ1KfNpcsUpx1Ym+8lsKUi1FcQNRj/CVqKry0PVWRRLl9wWZf3pX7fom pHLxhnITVeApl8t/tiFTsydzzb8YDM/GbaTeAc1RxpnDWuOrJEXAvt86e9Xez0yHsijw lnVhUVKaelmjtal655NA9Yl4QdrdewNAX8RpL7K61KqNFid1J88lbAbb7ga5n4IN8xe3 tfW59mwFDxKnVqHdKSm6nVR+7Ki5lXeUb0tjx8OUlBApp7H4F/AhZPUBbbDIGAXoeJDH yIAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=E8yiXsxy5all/+5undOIIjHMHtEaZsCHUCCuHRt6NmU=; b=wyvmxn0rIg623fN1rBBALC0RE95R1pF6pBtAkohoFsYYb+OOmFFjPH/LDDcY8doO9Y ZKege1bxo+e3WCY4NXfzRD/o9OHvRC2Gi9ITD4aQNZkScoFHjbmo2O1nOzLB2abb/iQ8 VNg8BhmweV+4J47SOXYPUG62JTSzKzP1Nj9W43E2aSUZTOtEwRSgdUcbEHs6Vk1YOdXG 8cqRrSvZ6vJ2byS4QIabDiHBbbhFs100Qr0VZYRo+uZwWlcpnuvC0+Ayh6CX2q2RG5V8 +cUTLMFKyurvGKsWBr5PciqYFeumC9nbAEhl0F42Q7TuOuqwnL2eWTJyNsLEQcI/tQfh XIbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=V0wQghgz; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v26si3819910otj.0.2019.12.19.11.13.56; Thu, 19 Dec 2019 11:13:56 -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=@kernel.org header.s=default header.b=V0wQghgz; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728483AbfLSSlQ (ORCPT + 14 others); Thu, 19 Dec 2019 13:41:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:60188 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728493AbfLSSlN (ORCPT ); Thu, 19 Dec 2019 13:41:13 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 89EA6206D7; Thu, 19 Dec 2019 18:41:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780873; bh=TsvhNeAS7QpjrVGbREBFkeHb/CNC3NqL0b7YAKujFZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V0wQghgzG+ML5tFxcXHoeug07yUTGDNOkJE0jcxdNclnnNonlFpJElZuiJZ8Q3W/t 0c2htEgZF2r920JaksdscKgi3NnGHfRiMn3XkZTJXCgHXc0jmYGXlJ1rNWRrK+dzaC vx4Q2CmA3bTfxusxVtqPW9n8QyVS25QnldOKeU6I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Grygorii Strashko , "David S. Miller" Subject: [PATCH 4.4 150/162] net: ethernet: ti: cpsw: fix extra rx interrupt Date: Thu, 19 Dec 2019 19:34:18 +0100 Message-Id: <20191219183216.904800822@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183150.477687052@linuxfoundation.org> References: <20191219183150.477687052@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Grygorii Strashko [ Upstream commit 51302f77bedab8768b761ed1899c08f89af9e4e2 ] Now RX interrupt is triggered twice every time, because in cpsw_rx_interrupt() it is asked first and then disabled. So there will be pending interrupt always, when RX interrupt is enabled again in NAPI handler. Fix it by first disabling IRQ and then do ask. Fixes: 870915feabdc ("drivers: net: cpsw: remove disable_irq/enable_irq as irq can be masked from cpsw itself") Signed-off-by: Grygorii Strashko Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/ti/cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -777,8 +777,8 @@ static irqreturn_t cpsw_rx_interrupt(int { struct cpsw_priv *priv = dev_id; - cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_RX); writel(0, &priv->wr_regs->rx_en); + cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_RX); if (priv->quirk_irq) { disable_irq_nosync(priv->irqs_table[0]);