From patchwork Fri Dec 14 22:10:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 153908 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2596524ljp; Fri, 14 Dec 2018 14:12:04 -0800 (PST) X-Google-Smtp-Source: AFSGD/XjIiIjTBq2WKNfzWCi71sIlF3teOMg5SY2lYVqI5xGwnay7gder8q5hhoKmOcTY+yhs0bu X-Received: by 2002:a17:902:3383:: with SMTP id b3mr4386970plc.170.1544825524755; Fri, 14 Dec 2018 14:12:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544825524; cv=none; d=google.com; s=arc-20160816; b=K88zRQsDCf8ntK+dhGOGrGQ16uz1uAL6KNEwX3zOarSjhessxTNi8aZgVSURxbemxq IgMKRDjdHm3tX8UwctUDoXXDyC7zsLcE72BKIsE3oWVgKH3r4FbK8zgumu3wLsvmQXgx o6Uic6NGeGNc+gEW9Q5v16WlEs9TlCnBXpZwdK800LmJm2YUmF8/hbhLjUJrbqmqcGyV QWUBzT4yoM0NoHYld4WG6QveZ5QqpbQNkjk7VJ+0oGwBBKjDqrRec9FySMJXbDBpm2M2 uf4pCRfaBuAuOci2eOrCMaMfO/HrBR04l6o0HFeurVYo4/8gc0JySth/ZK7Zyok7F8WZ /leQ== 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:cc:to:from; bh=PDdMzULqNv9ax2gC6WbhrYcuyPD2ETglyfq8OOmGFLU=; b=02WYEtxwlzwh61iDadP+dBGMqYCwp/7BJt4m+WiN01JA+mtx/CKApTxYdtnwskmUEH +qj+71OkoAuZzjTDODVzU6pbj0DnfbQV7IxL6bhukyIsS4OGKsYcDhqjTApQC/uLKJE7 C4SBZXATOVOcVm4z9PeIasL+AkD7Jfz7DEGlkQxISpqlM+fokAfu5+DbwSZSjYU15SFJ W82H6tEG8E5MgKAXkvao1FDNsfkgyILEb+o9sx0s+OVtz44yBBowxRX6M99mktCDXugA hwVIRB1LCtGqdY37BDAsqh5jz+0j6Z4A/+z3sa33nQHm4UauKd/kbMB0oiQ2AtXl2CDk wPdQ== ARC-Authentication-Results: i=1; mx.google.com; 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 ce19si5057251plb.13.2018.12.14.14.12.04; Fri, 14 Dec 2018 14:12: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; 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 S1731289AbeLNWMB (ORCPT + 15 others); Fri, 14 Dec 2018 17:12:01 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:53583 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730909AbeLNWMB (ORCPT ); Fri, 14 Dec 2018 17:12:01 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1MeknF-1h6Rg20aGL-00amXY; Fri, 14 Dec 2018 23:11:11 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman , Ingo Molnar , Peter Zijlstra Cc: stable@vger.kernel.org, Vincent Guittot , Dou Liyang , Miguel Ojeda , Linus Torvalds , Thomas Gleixner , bp@alien8.de, dou_liyang@163.com, Ingo Molnar , linux-kernel@vger.kernel.org Subject: [PATCH 1/7] sched/pelt: Fix warning and clean up IRQ PELT config Date: Fri, 14 Dec 2018 23:10:06 +0100 Message-Id: <20181214221023.3878670-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214221023.3878670-1-arnd@arndb.de> References: <20181214221023.3878670-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:57FGmNaiHLQwFjePeSA3gvj7+nUCyrD3AuRVyPYLmqzk3gaOp/t /AB9s5LN/3QCiofnr46yXNd5asuNSH04HyqdG/MLjNm70I1nQ5YOgfMViHAXSX2VUqUMWO8 mrlf+kZlrfbRc4g1IwA0LzyJuNdYaskhc+Je3ATGR+L4plbbotN43Gm6hKQhbvt5zVSR9Lz lW5Sgzu3pa7nFUso31Zkg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:ab0W2afYI7E=:s57k89YB+OxybK5HdB+e4Y ejdT0dtNrsNufjnbBCPYRdxBZZKub7bEk71id8CYbDIFFkQxEqJOaVKrIsgoGn6q+EgmvAyJI EB5c+I+LA1+JYKfeF5hNDjHthV7+uEpm2KkHFKU4sKupfpIpE4fQ2CgPSAaP9awDSe7yMTn/P rKLNOe5HzukJ5HvnB7aGOXEa4nDmPgFLqP/663k+DrD3pxRdAVsHnbDd7bs0RNxQCt9judD5/ Cy3Tw32LhEksoB+pnhs4+wSlwO0FJa9aMdn7uczE582MnjEY0P5ucPS0SSeSX2s3VpdbHB4RP SqWXlD9b3sRdl/WetwK7TvQto7Y4vuuPmf/qviVUcQz6gVxL1qwMGq40zGzlltDFUjGPX8AEq rUqCKS3hiOcVJUesvrtWcxTmwn3AD4wdizlIfk4pnvosxqayUDz9T44GzqTdM3x09mpXfskJR mcBnJUmF73HQWutKihKt7RN9YIR/P1S7MHmDVSfWUVUuxxtJQ6p6jCAoMDYjUAh3zndGq0aWa zNLLLRj6qN6OK8IsO91yxrXL9O86YfINzeLYP6ueillCPdc7ByS5rrndZR6tbQhSo78/9ulqL mFFDJ/54crvkvobNOQqHjA2zADcZC6Hzi1HNLgPBosuRvYW33p3CM3Az5/IJQ14OtiUpdfVIs qzCINEwtCU58PHQVbB1nwb5Xy9e8BHPM+lg/tcJuHvKSpgr+bk5+/0s9RgJNSSJdKm/7mKG8k 5qdIa+2y27LjhamsB7a5+eHhPdy2h20i6PTeig== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vincent Guittot Commit 11d4afd4ff667f9b6178ee8c142c36cb78bd84db upstream. Create a config for enabling irq load tracking in the scheduler. irq load tracking is useful only when irq or paravirtual time is accounted but it's only possible with SMP for now. Also use __maybe_unused to remove the compilation warning in update_rq_clock_task() that has been introduced by: 2e62c4743adc ("sched/fair: Remove #ifdefs from scale_rt_capacity()") Suggested-by: Ingo Molnar Reported-by: Dou Liyang Reported-by: Miguel Ojeda Signed-off-by: Vincent Guittot Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: bp@alien8.de Cc: dou_liyang@163.com Fixes: 2e62c4743adc ("sched/fair: Remove #ifdefs from scale_rt_capacity()") Link: http://lkml.kernel.org/r/1537867062-27285-1-git-send-email-vincent.guittot@linaro.org Signed-off-by: Ingo Molnar --- init/Kconfig | 5 +++++ kernel/sched/core.c | 7 +++---- kernel/sched/fair.c | 2 +- kernel/sched/pelt.c | 2 +- kernel/sched/pelt.h | 2 +- kernel/sched/sched.h | 5 ++--- 6 files changed, 13 insertions(+), 10 deletions(-) -- 2.20.0 diff --git a/init/Kconfig b/init/Kconfig index 1e234e2f1cba..317d5ccb5191 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -415,6 +415,11 @@ config IRQ_TIME_ACCOUNTING If in doubt, say N here. +config HAVE_SCHED_AVG_IRQ + def_bool y + depends on IRQ_TIME_ACCOUNTING || PARAVIRT_TIME_ACCOUNTING + depends on SMP + config BSD_PROCESS_ACCT bool "BSD Process Accounting" depends on MULTIUSER diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2beda4b726e2..13ddfa46d741 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -135,9 +135,8 @@ static void update_rq_clock_task(struct rq *rq, s64 delta) * In theory, the compile should just see 0 here, and optimize out the call * to sched_rt_avg_update. But I don't trust it... */ -#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING) - s64 steal = 0, irq_delta = 0; -#endif + s64 __maybe_unused steal = 0, irq_delta = 0; + #ifdef CONFIG_IRQ_TIME_ACCOUNTING irq_delta = irq_time_read(cpu_of(rq)) - rq->prev_irq_time; @@ -177,7 +176,7 @@ static void update_rq_clock_task(struct rq *rq, s64 delta) rq->clock_task += delta; -#ifdef HAVE_SCHED_AVG_IRQ +#ifdef CONFIG_HAVE_SCHED_AVG_IRQ if ((irq_delta + steal) && sched_feat(NONTASK_CAPACITY)) update_irq_load_avg(rq, irq_delta + steal); #endif diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 1162552dc3cc..eabbf6b10b44 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7361,7 +7361,7 @@ static inline bool others_have_blocked(struct rq *rq) if (READ_ONCE(rq->avg_dl.util_avg)) return true; -#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING) +#ifdef CONFIG_HAVE_SCHED_AVG_IRQ if (READ_ONCE(rq->avg_irq.util_avg)) return true; #endif diff --git a/kernel/sched/pelt.c b/kernel/sched/pelt.c index 35475c0c5419..48a126486435 100644 --- a/kernel/sched/pelt.c +++ b/kernel/sched/pelt.c @@ -358,7 +358,7 @@ int update_dl_rq_load_avg(u64 now, struct rq *rq, int running) return 0; } -#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING) +#ifdef CONFIG_HAVE_SCHED_AVG_IRQ /* * irq: * diff --git a/kernel/sched/pelt.h b/kernel/sched/pelt.h index d2894db28955..7e56b489ff32 100644 --- a/kernel/sched/pelt.h +++ b/kernel/sched/pelt.h @@ -6,7 +6,7 @@ int __update_load_avg_cfs_rq(u64 now, int cpu, struct cfs_rq *cfs_rq); int update_rt_rq_load_avg(u64 now, struct rq *rq, int running); int update_dl_rq_load_avg(u64 now, struct rq *rq, int running); -#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING) +#ifdef CONFIG_HAVE_SCHED_AVG_IRQ int update_irq_load_avg(struct rq *rq, u64 running); #else static inline int diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 6c25bbe87bd3..b63172288f7b 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -859,8 +859,7 @@ struct rq { struct sched_avg avg_rt; struct sched_avg avg_dl; -#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING) -#define HAVE_SCHED_AVG_IRQ +#ifdef CONFIG_HAVE_SCHED_AVG_IRQ struct sched_avg avg_irq; #endif u64 idle_stamp; @@ -2215,7 +2214,7 @@ static inline unsigned long cpu_util_rt(struct rq *rq) } #endif -#ifdef HAVE_SCHED_AVG_IRQ +#ifdef CONFIG_HAVE_SCHED_AVG_IRQ static inline unsigned long cpu_util_irq(struct rq *rq) { return rq->avg_irq.util_avg; From patchwork Fri Dec 14 22:10:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 153906 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2596267ljp; Fri, 14 Dec 2018 14:11:47 -0800 (PST) X-Google-Smtp-Source: AFSGD/Uz00npykwj0Y8gaTN4BlCkLjO7iBUKksMuNEHtM2hcZZcNDAA+9MVts+eEjqsC878ILgDg X-Received: by 2002:a63:f74f:: with SMTP id f15mr4286499pgk.190.1544825506945; Fri, 14 Dec 2018 14:11:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544825506; cv=none; d=google.com; s=arc-20160816; b=O2ro4tI1ppq1Dlo1sXYL716G9nXWwPaLBGCrRliL2N6Fh4Aj7ThEBkVLcECc60zWxN +jSCe6QA+aKaTSJyXUSgdSDTnsWx4emvClCk4JqGWiagv+ArJyb2dcGDNQGMEGHk1G72 KoKahJJ/PczQUyXAzIOo3HhIhgL/9yDvCdiy4qIAkULlIVEOfK8BeUZ52ner5g1j365a AXbe8wLM4f5di9XpSB36QcpLbt8UGHr6PcuT01muapL9sA3qo1CUZYSGBTv0qnggkceM qSZl1gVummJe8M3QHGLltP5CRcerYTym6mwPiDcxaznVHvkoFpUrho2eBMU4R3JE4G6z eKSg== 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:cc:to:from; bh=2s048n0KLKaZLbPSgLnz88wBZoGLG76fW+lQa/4J43U=; b=AB3ejzcdHM1atNMcLzAA1N00bU1CUAVgt+K//08hm/JWV8IfcPGXMKR37PSAm6nDcc HRo8o5126PwTjIlNL3apgbMRr5gGA+TuXEgmM7BwYbZd+98cdL5w4vbL/v67hEXgCXX9 69sOVwImnm3alOme3Lu9EqMhkIQplIn16hwOqq5BxqWAqgYxS/PuxtRLX4OetX+0LR8D ZF+Th95P4GzWG8RsAo3c+m2iFDuRBc5pmspLFdDldgF2p5ZRgK8xsoTSuM5xw26SVnyH AqSlFk9wtBE0A8vptnuK5iosjMSkWwEt25zTDNCfwBsCjF4gxinGJKX5FkVavn3H8hBk q8Yw== ARC-Authentication-Results: i=1; mx.google.com; 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 d8si4859532pgl.386.2018.12.14.14.11.46; Fri, 14 Dec 2018 14:11:46 -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; 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 S1730987AbeLNWLh (ORCPT + 15 others); Fri, 14 Dec 2018 17:11:37 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:49217 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730909AbeLNWLh (ORCPT ); Fri, 14 Dec 2018 17:11:37 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1M9nhF-1gSj920Den-005rZg; Fri, 14 Dec 2018 23:11:29 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: stable@vger.kernel.org, Arnd Bergmann , "Martin K . Petersen" , "James E.J. Bottomley" , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/7] scsi: raid_attrs: fix unused variable warning Date: Fri, 14 Dec 2018 23:10:07 +0100 Message-Id: <20181214221023.3878670-3-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214221023.3878670-1-arnd@arndb.de> References: <20181214221023.3878670-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:WD/yj5Ry9KafPGHVw9edfVP0752pVKVw0uXAKK5BxXcrQDej+Uc mH3rUo7bMb2CKYrIxPnuIHlgiZMl9KSp1h5y8SeUhaECGrDYSyItPRvRbRlsh4p4MruhZZj RDkdtFpQzz3tXSdWUvm0pM9mYlKoSrUrIW+NEtKiw5u5xOzBmojQ5dYMbKk6iZ1Ci4/DUvy cqaK8Un+A1sjX6MYdTisw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:X780U6YvOBM=:iIMrWABabKU5tg+LtoWDjT vKjL6EWAOgNwgMWj7M7CUndT4xirt8nkXay/8LiR+CN5aTgLt7SmuAuojmDmWPIi1FOjDM+FS KULiLFZqnZLCufJkoQKVp40r3H+vyRccpPnj9NZrxSVpaH25kfSzTZZCvHQ4YshuanvMmklhL SwppLpdJcCS2k+KkJ4Om4jUNqjYIy2ZBFEwU6RPm2FC6oap8Z3uzW529Pvfaw4f2oXbnXwCLD eVKINt8jqd/RqwK9U+80V8IUvZwoY1wsgRs0gGBU8pw/j39Ld/tsYJTRSx+dNEtcrl+XIZQx3 kvuPLElxJJSNXseBvSu9lK+kFRFr7PXtmpiFCGYku+FBruifhKuuRkBqVaYrcLVDdK8yFRBeB Ypw9bxdG6uv8l3l7o2YAheVypSlDC8z1NM6Mt/XUxc3m57hQby9a2tjG3KElP8KdxM1TY1vwG 7zW21DUysg8cF/n4Py8k6A5hjGm2V9EfKWBGv0ok+Kwisq9kO/WKBy4MixwIZSkaIAUifox6Z vSv9JmMZdfz6JeGT96R/JrSfUmVZsbNnNttVTfoU/WUKXWswkJAd3pkssPy5mvSg+g5beACt0 E4get/uJCtLpWrWW8tRFl9IcQV8fs1jAq2IAPazdt3beTPsZJX7a5T1shgqT47EjtuVLEVuUX OV2pOCZMFrnyAQtpLWCA9eswg9MUP5WnUCJ6h5CgZO1UXOS4y3VWapdkDcjPg8MZbS30REC6X 3tELOeU7TiVIWNf+/pUTSoxQsrF11tr6fwMTeA== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 0eeec01488da9b1403c8c29e73eacac8af9e4bf2 upstream. I ran into a new warning on randconfig kernels: drivers/scsi/raid_class.c: In function 'raid_match': drivers/scsi/raid_class.c:64:24: error: unused variable 'i' [-Werror=unused-variable] This looks like a very old problem that for some reason was very hard to run into, but it is very easy to fix, by replacing the incorrect #ifdef with a simpler IS_ENABLED() check. Fixes: fac829fdcaf4 ("[SCSI] raid_attrs: fix dependency problems") Signed-off-by: Arnd Bergmann Signed-off-by: Martin K. Petersen --- drivers/scsi/raid_class.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.20.0 diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c index ea88906d2cc5..5c3d6e1e0145 100644 --- a/drivers/scsi/raid_class.c +++ b/drivers/scsi/raid_class.c @@ -63,8 +63,7 @@ static int raid_match(struct attribute_container *cont, struct device *dev) * emulated RAID devices, so start with SCSI */ struct raid_internal *i = ac_to_raid_internal(cont); -#if defined(CONFIG_SCSI) || defined(CONFIG_SCSI_MODULE) - if (scsi_is_sdev_device(dev)) { + if (IS_ENABLED(CONFIG_SCSI) && scsi_is_sdev_device(dev)) { struct scsi_device *sdev = to_scsi_device(dev); if (i->f->cookie != sdev->host->hostt) @@ -72,7 +71,6 @@ static int raid_match(struct attribute_container *cont, struct device *dev) return i->f->is_raid(dev); } -#endif /* FIXME: look at other subsystems too */ return 0; } From patchwork Fri Dec 14 22:10:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 153909 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2596537ljp; Fri, 14 Dec 2018 14:12:05 -0800 (PST) X-Google-Smtp-Source: AFSGD/VYKo/vGTEKkyi9WFyccgydXytVzEOL2pGE3CtshvYxm2Rh6JkUz57o6yTttQOoE8v9zSYN X-Received: by 2002:a62:d148:: with SMTP id t8mr4603611pfl.52.1544825525622; Fri, 14 Dec 2018 14:12:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544825525; cv=none; d=google.com; s=arc-20160816; b=dEzKSXoVuq86nsatwYQWmUKSwrJCmS6SHZAhE7xS1ZaSn+L6CRbK/V4sgWnsd5f7kc 5TUwsDkHCXIr5FWqBH1cEQ2yfMnuZzgxQ94SUhICOPbZ3aXLF4sPdLG9NN5cPuyvv7a2 fHcu+Mg8JWPZ9cSgF04kivIatids5rFrDk3AbFf++xc1MrRK11YMJI7WqaqScgaj1fDF uo8j2f7enNBupVh6CAwUOEOfevTuLqfdKCxXylTMOULsGxDBT97txCWj/ZVVcNkuONX0 1DcbFOGHPOJftTgPQwRq7RZiMnQkhCYoBRFhL8eFAOlGrdCA2aj0NOqXUeMPLA2QWEbZ sl2w== 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:cc:to:from; bh=FmcXUY1rXqXaWdnfoCMS5zattP2pza6yf+pZQzMnul0=; b=ADMK76DQy9WRKBi69lEm0mTPhcj2E4KsSk5KASPXrYrfKR6kaELoF7BJ7CgWly0sdI 1hprGSisxiYSu8ukLma7upMOznS7fB0EOrBDNSr1Uq7xYiFGC+aIdGKGZqZTItei3+bM 4eaexLBbj1PZ+N8JZN1yQa0QMAN0r9GKMX7knYxAaMEAjGsimCe+ngCZRfoZHc1vuVj6 6x0PYs7F8KYllRcfvWDZ/S066tIFvp8guWSFP6tEad60aPsU3/d1+x+ymsIDjeTRvvtC wE4WbGrs3tzgK/E6+LWA/zzUoojRfja6rFGIxgyzLk+FPAkEMzlz+atFY7W/yz2dBlOC 3vkw== ARC-Authentication-Results: i=1; mx.google.com; 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 ce19si5057251plb.13.2018.12.14.14.12.05; Fri, 14 Dec 2018 14:12:05 -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; 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 S1731326AbeLNWMC (ORCPT + 15 others); Fri, 14 Dec 2018 17:12:02 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:53369 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731325AbeLNWMC (ORCPT ); Fri, 14 Dec 2018 17:12:02 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1MrPyJ-1hBNIh32BT-00oa3u; Fri, 14 Dec 2018 23:11:56 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman , Jens Frederich , Daniel Drake Cc: stable@vger.kernel.org, Lubomir Rintel , Arnd Bergmann , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/7] staging: olpc_dcon: add a missing dependency Date: Fri, 14 Dec 2018 23:10:08 +0100 Message-Id: <20181214221023.3878670-4-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214221023.3878670-1-arnd@arndb.de> References: <20181214221023.3878670-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:6NF59hTn5Qzuli2IiOA6knNRGZupLt4BS0OkWcb0EjIMLMnylec hxl46i/o+u2EImFAPr715x2QY7DUo7h+n24cvuLjHnlf6HxVayvURPS1SEL7KxFOZBJDTDd AIo7wwxP+B9bos8Ga2uun6zXWLNaqXMw8h5TyOHy2HfFqDv9hrWarx/OAZoCNBqSkhQhxgh ZPailpPvzzDS/YC3OHQxA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:sLcGHBNApXU=:wJgmVO4I8dQx631yOX7vIp IpGxspICmW5c59RyTybBjpsW6Zh4l3/urQv5Q2bWAEku/eFzaUW2Q1KfBZljikVcZr/9+XbMb MMe7RB5T63kwLIFDC+xqu9W+VyA2a2+ft9fO0NhNv7WQlwGV0epg6PXPPHoeNh7o6UkhUkudA BhleU0iG3tkPKZYkuDkg0wHzao3eUjIfKwfPirwezEcxSJkA46fP2Hb+UXzf8ZH9UpmYqW376 WtWeQXtTdeG5pvOSHofxIFmJB+qGb0ifN3PHB4QGqJNyH/xucGkyfAsh6vz0y1yg+XtK5niof 8TQ/XmMF/YAscPwvLQpGs0Kay2vS7vTiL3VgDdUu6CnWbrUH5Vw2ByfutTS4OeJKs8OSd3op2 Y3G0H1BXc6zJ0zPyvNEkYKaQwYB469Goy+iga2TlSjgxIst/zQWGUtryKJmzwwcw7lgoshRHu TMG5o3UTt5w9smA/8qSOtMK3Cw3JQrF4v1ky6XcD/hng6+Z1+nBYhTdIsg1hTF20kIyW5Xtv8 +NL7o3v4M8XmbivXaH9JYYKQdnp6guRQfYUrsdxRGVCcpriOqK8IASR4FEwZmTAco6AIcVjgJ aglhNMDfDblRL0AjG7wC1o/cDUSFt5/cYknjg9kynTJGEleRzVbUPvHufmfQMbnj8q7ZRI8tL BveHvBUm+/if7rlTsjmptkyrl1xnG4k45ijP+RTy9VJfHtbjnJWFZsTCd8Idi8NhAft1n8phw gtT/bQTj1l15CyVXALwsb177XGsmLEtQFmJK1Q== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lubomir Rintel Commit 33f49571d75024b1044cd02689ad2bdb4924cc80 upstream. WARNING: unmet direct dependencies detected for BACKLIGHT_CLASS_DEVICE Depends on [n]: HAS_IOMEM [=y] && BACKLIGHT_LCD_SUPPORT [=n] Selected by [y]: - FB_OLPC_DCON [=y] && STAGING [=y] && X86 [=y] && OLPC [=y] && FB [=y] && I2C [=y] && (GPIO_CS5535 [=n] || GPIO_CS5535 [=n]=n) Signed-off-by: Lubomir Rintel Signed-off-by: Greg Kroah-Hartman --- drivers/staging/olpc_dcon/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.20.0 diff --git a/drivers/staging/olpc_dcon/Kconfig b/drivers/staging/olpc_dcon/Kconfig index c91a56f77bcb..192cc8d0853f 100644 --- a/drivers/staging/olpc_dcon/Kconfig +++ b/drivers/staging/olpc_dcon/Kconfig @@ -2,6 +2,7 @@ config FB_OLPC_DCON tristate "One Laptop Per Child Display CONtroller support" depends on OLPC && FB depends on I2C + depends on BACKLIGHT_LCD_SUPPORT depends on (GPIO_CS5535 || GPIO_CS5535=n) select BACKLIGHT_CLASS_DEVICE help From patchwork Fri Dec 14 22:10:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 153910 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2596742ljp; Fri, 14 Dec 2018 14:12:20 -0800 (PST) X-Google-Smtp-Source: AFSGD/VdA7hXDAIfQUQLJ9Jh1KDq25FYHWltRY468pAmoTjne8tPoolnNtNUKgpB1/EvJd1ZRBls X-Received: by 2002:a17:902:ab92:: with SMTP id f18mr4274927plr.221.1544825540255; Fri, 14 Dec 2018 14:12:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544825540; cv=none; d=google.com; s=arc-20160816; b=qhqXY2mBjSYEDvE9mPBNfNcbCHvRa68LDCtqVbQAt5DeeOlEBfUp8LjSG6BNivWg1m rt90TMrUUybv/XwQwH8X+vhcJF2ulhSo/h4epsY5YoG0qJzt3BPQ/qs8gvSQPP7WIgx6 lBgBP8ddQfL1Nbg6WAuOW93ccIxlycfVDkLlkYA9ROHcFHTRcCvzfIqdbLmzfazdiSnL DuFR7N2k5OQnMPKGi5oOwl0tDr/RPJGEVFTfzaiOrdVr7KACvkh4bA4A2r6wSUd4DoLg IKyd0tKAYv/sMmX0PL4kZ/4JJW4ociE0Qm6fOdJW37hzz3G/xtpSeu9zMT5RuUyncqPz YP6A== 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:cc:to:from; bh=Km8Ad0MALcqCR0Epz2foqqeFFdFyBNqGYzDq1IBop8c=; b=Y0Wf6xeYjIuLFkhyRLCCr8A9aH4VgEAGXCX7Fw7M06LBragP0YSbE79iRIpwNIRW4E FnLB3mb50kwN5daWZqNrMnwO6uBRz0Iql/ARqr95it0zR2cv1bwUmeWMrH84qE/4fzFM X/Q3uGI7h4fpVQy5FR0aoe8ARVZdH0ohkRirD26E3/qxW25eRV82epHyKg1WXkbrmXLU bd2glnw9v6NNwbzI1GjL4HBWEN6VnmK3eFvZqQ4A/5fUfQBNE4TbDkhNRYYc6u1UxwkN dBwhwsQ2JFV6b2PRv4h5FPBvWel98qeEzu2tQKF8L6fFFZ5Ew1QorcfUd6F0NwJiWFFO ml1w== ARC-Authentication-Results: i=1; mx.google.com; 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 ce19si5057251plb.13.2018.12.14.14.12.20; Fri, 14 Dec 2018 14:12:20 -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; 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 S1731286AbeLNWMT (ORCPT + 15 others); Fri, 14 Dec 2018 17:12:19 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:44931 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731234AbeLNWMT (ORCPT ); Fri, 14 Dec 2018 17:12:19 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1Mv3I0-1hOvqp0o40-00qwLd; Fri, 14 Dec 2018 23:12:15 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman , Srinivas Kandagatla Cc: stable@vger.kernel.org, Arnd Bergmann , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/7] slimbus: ngd: mark PM functions as __maybe_unused Date: Fri, 14 Dec 2018 23:10:09 +0100 Message-Id: <20181214221023.3878670-5-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214221023.3878670-1-arnd@arndb.de> References: <20181214221023.3878670-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:GNKPCeeeEz26uJbtRM7gc0MoAF3J/yMkeTY15ugg9ZR34VsoVSz 0VKVSfwkmxC9jw1gjdVesiNiv757xJnzNi93wiDAQTBRqefgOFs4VmnzwX7QezOHsLVjWkd WM1RYVJc2/8E5OlsIAmlBHt5frnjOrneQ/Drv0r6WZBuar3Zztw5ZXisMcPBQSQGT48EVfq mXsbo81AdNfyYAJCUepcA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:mSOC5O6HTCE=:clOJfzWbo27T4UpGKVDOkh 1hkxFTCziPHNJoG1yDcLOUMQAsONPlu5+4UTN+y3UpKbNeXlkuVUKwJyn/+XByqh3NI8910Kn RqbD0V9zjk9A7kA14/HHFMijMeVvLQ8k1RmjLi7bPO1h7Wrr3lDMba0L65C6C85Y2iS2IsKw6 N84/z7RMxyB91qmtwJzZEaF9FdUZaF9oicwkZUzKn2MvQ8+yatl1kWrvLtS69wKwvxZblxz8t ET7yYttpXJCbAsGGwysleRf0KTyiMQ8uEWLUtKgDEGl0ucPdhDGsmVA0IS2OBii68KqvMBlSc tRyP/i9YvtA/LOCcRi45IOzR7d7MugeQ1W7rmWIDtylUze6WQgCW+iF9rQalp9UlJK0j922PK I9zdPw880BRC/prt0rC3RVS/QKGwYrm1pLw9Mc45X7FqnAGaQJmpLBKm0M51FO4mi5NpYcEwC fYM0tBCXeY8Ygzq2zyiSK7E2ec29xluUDh/QJ74322m60zBwBcBtWQswcsWReRRUOGwvOXMxo /p3LttYjwMrX5XsioQsS1FSTNkFV3p7aKW6PNgDm6H7BUXoh61401HLp5NSFv8a3O2lLkJe2F NS3d2gP7nnGZGt4MizCQupAmaS3uGGxKyk0dph3zvaeMTKuVAIIQAkGS/SovDjRrrHy5y1fPr a4sCvhQaAPeu0IZScT7kTr/OAdodTkCgU8YMasAUrvrpeeH2nsILbjSKTJyIiqpdndOUy1qAP MUv8kHo5QyBU33/o1z6ON7IawSW3DyabBjq0DA== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 2e6ae11dd0d1c37f44cec51a58fb2092e55ed0f5 upstream. qcom_slim_ngd_runtime_suspend is protected by an #ifdef, qcom_slim_ngd_runtime_idle is now, which causes a build time warning: drivers/slimbus/qcom-ngd-ctrl.c:1470:12: error: 'qcom_slim_ngd_runtime_idle' defined but not used [-Werror=unused-function] Marking both as __maybe_unused lets us get rid of the warning as well as the #ifdef. Fixes: 917809e2280b ("slimbus: ngd: Add qcom SLIMBus NGD driver") Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- drivers/slimbus/qcom-ngd-ctrl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.20.0 diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index 8be4d6786c61..14a9d18306cb 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1467,7 +1467,7 @@ static int qcom_slim_ngd_remove(struct platform_device *pdev) return 0; } -static int qcom_slim_ngd_runtime_idle(struct device *dev) +static int __maybe_unused qcom_slim_ngd_runtime_idle(struct device *dev) { struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev); @@ -1477,8 +1477,7 @@ static int qcom_slim_ngd_runtime_idle(struct device *dev) return -EAGAIN; } -#ifdef CONFIG_PM -static int qcom_slim_ngd_runtime_suspend(struct device *dev) +static int __maybe_unused qcom_slim_ngd_runtime_suspend(struct device *dev) { struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev); int ret = 0; @@ -1491,7 +1490,6 @@ static int qcom_slim_ngd_runtime_suspend(struct device *dev) return ret; } -#endif static const struct dev_pm_ops qcom_slim_ngd_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, From patchwork Fri Dec 14 22:10:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 153911 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2597197ljp; Fri, 14 Dec 2018 14:12:53 -0800 (PST) X-Google-Smtp-Source: AFSGD/WIjzUlOe1jPU7MacLFAlu08c2AkOwSoI3reDRZijl0gGqUnUoK0cC7+qltUddpVAeDOqnd X-Received: by 2002:a17:902:d806:: with SMTP id a6mr4265861plz.172.1544825573285; Fri, 14 Dec 2018 14:12:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544825573; cv=none; d=google.com; s=arc-20160816; b=dPAqFlHPNTDaCVFteQOAxjw485gv6NTUz6HOks2islPuycmPszEP21E3A4y3BUkF0+ cLGFEaRmG4WAnGRifa95vV06y6c7LiLljYM0b0nrTpxNk8sRLdv93hJQtKjSOxM1BVE6 mZg0AKMHIqbp1oR+3AQgGiJa/D+yhUlrtZ/pTQNAuGWi2QTPQUg/rHTv0JwopvZYyTGW MQZ7PCkp/NJ+Zjikxqj7n58Z+4h/iSo6/re6ELSy3v7Usm56KvacUf+qPg0Hpx88uGeW Q/Q92SkHY00K2DE6v6KPtmqnOdO6LI405nZn9PROTvZNt8iw7mv5X0umhj7WtY3FQSbm WBmg== 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:cc:to:from; bh=VKqdC173t+YyvsaifB4tFpfFAau6ZzEJR1lwQSuKc3g=; b=Qsuu00qO9DOTOQyqJWeZZbugWkym+pDext0ItsHm8/T/K2qJ2sXj7Zq2l1daRIKhOk g1KNZNdg6tF0xhquDrhe2UXZDtZYuSS/soX527DmE1L18ItFU7lg4B5u1m6qoJgQm0xT lYYwTMzArKnW7nhb3qBmMzM6frI2kNdpT6eZjO2WUOj6oXuIuGrnGb+Z6zspA24JccZN tRbB6O+O1rWhNHX2XAkgUEJCn5HoWwsPInf+mwiGq5UqkuqQ3HV1VJH5zqNTSw5NCwUL g62RJ0F00lip0ZzhlhVH80BNo4UmhWR2I/rYDr5C4DTIhwY4oIUzGrzwoMNtAIPmRgr4 wCQg== ARC-Authentication-Results: i=1; mx.google.com; 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 y11si4976346pgj.442.2018.12.14.14.12.52; Fri, 14 Dec 2018 14:12: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; 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 S1731234AbeLNWMw (ORCPT + 15 others); Fri, 14 Dec 2018 17:12:52 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:42579 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731080AbeLNWMw (ORCPT ); Fri, 14 Dec 2018 17:12:52 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1N3sye-1hXhFg13ei-00zm3J; Fri, 14 Dec 2018 23:12:48 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman , Brendan Higgins , Joel Stanley Cc: stable@vger.kernel.org, Arnd Bergmann , openbmc@lists.ozlabs.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] [stable-4.19] i2c: aspeed: fix build warning Date: Fri, 14 Dec 2018 23:10:10 +0100 Message-Id: <20181214221023.3878670-6-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214221023.3878670-1-arnd@arndb.de> References: <20181214221023.3878670-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:UkDh7AG484n7mftoFIvINl/KQAshkFrxhFrTWJuknl6fAci4RsD r2sYU/EayygD4/EPUGi7OUGgeEz8n2p/M+Tl6MGhPwME2fZB/wFT5SuwNsriCqXSOdTEcWW jp6L6hj5ezeETo5Wg1oJ1f7cUqzp7K8vXjVFXzRnaDopCPsED3a61Kzok8i7h1gei2g7Xcm 6GiXNpZ+un4kJECeNifyg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:6IHFjg9tjAo=:4lnIT+guTjNYoSjojKvvus FlNJlSRsw3A5h2E+krCs1Y0XYo9DChsirZBJbWsMmoG5YsETyQHhkCmbiQeTmr6+xzwg5A/4B FPoqRvcabPtLPb58dYyKOibH795LjlUipGPkWZeYXHABTXJZKgGoeFLX5B16+Tql9XKbIjLFl momG+Hehdo2gDB2A/vXzhQTkiAben4xOeyMWUmuB4AMERW//gQwno2YQvrLqH9vfvnbnOuTmu 6WSjKAQkGtve5fk8YL19Ph+i3M9prBYhiyFl9vUJxMhAxegZgbYBCO1AbPa6SE/DVuTDCrc5U uAtZHA1IVEFZ9JooL23QL+7lk3T7/A/ctts5fwOpbwgqs/CJIR1q8h8HlhdWDKBQPN+r7IOFz aFb4LJ89wA642EJ4v8XwJPi1d6bWnLKPEet+WwPgqeNt2Cbwc+VfVqFAZgOTxVqD2GJDN8zBB wv45HwnuqBDq5bYRWSPb2HLY0gdZQun36S9NnlRaWKw+Qx5TQO8u3kcR3TkhPgmH8pRqV0Nzk +ikjw8aytriWZPc6trGNFKL6vpOb9eAaHlj7kPqY7W9sXssLvf/T28aXrPdO7raNmQBnxG136 MmiDflf2CRgQXJ3ERaNAuxTDumq3/lDxPmPsaaRgNQrOD3o3Lp666q6kosuu/pWd6wv4/QToB MjKqgvuW6XAl/aBQXVIntSvQVDI+SFzIUhZfDbk4x9NMrk/bOR+Vel1iMyv9P9JDdjkxCMMEk PKJXsZ46yhupIVqyULyg9DD3h2CRlZOaK71I/g== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Upstream commit 3e9efc3299dd ("i2c: aspeed: Handle master/slave combined irq events properly") reworked the interrupt handling and fixed a warning in the process: drivers/i2c/busses/i2c-aspeed.c: In function 'aspeed_i2c_bus_irq': drivers/i2c/busses/i2c-aspeed.c:567:1: error: label 'out' defined but not used [-Werror=unused-label] The warning is still present in v4.19.8 and can be fixed either by applying that original patch, or by adding a simple #ifdef. Here, I choose the second simpler option as the original patch seems too invasive for a stable backport. Signed-off-by: Arnd Bergmann --- drivers/i2c/busses/i2c-aspeed.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.0 diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c index a4f956c6d567..a19fbff16861 100644 --- a/drivers/i2c/busses/i2c-aspeed.c +++ b/drivers/i2c/busses/i2c-aspeed.c @@ -555,7 +555,7 @@ static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id) spin_lock(&bus->lock); #if IS_ENABLED(CONFIG_I2C_SLAVE) - if (aspeed_i2c_slave_irq(bus)) { + if (IS_ENABLED(CONFIG_I2C_SLAVE) && aspeed_i2c_slave_irq(bus)) { dev_dbg(bus->dev, "irq handled by slave.\n"); ret = true; goto out; @@ -564,7 +564,9 @@ static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id) ret = aspeed_i2c_master_irq(bus); +#if IS_ENABLED(CONFIG_I2C_SLAVE) out: +#endif spin_unlock(&bus->lock); return ret ? IRQ_HANDLED : IRQ_NONE; } From patchwork Fri Dec 14 22:10:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 153913 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2598033ljp; Fri, 14 Dec 2018 14:13:56 -0800 (PST) X-Google-Smtp-Source: AFSGD/X/qkeWPAvBY+WbFp8f8Hnwn9sdQOQsEyqAGPyTZFh0ZfDtDROvISx/WPT3VNdzvhOSX7iT X-Received: by 2002:a63:151f:: with SMTP id v31mr4210269pgl.34.1544825636306; Fri, 14 Dec 2018 14:13:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544825636; cv=none; d=google.com; s=arc-20160816; b=IjwGSfjY4CFysou1hjA0CqpY45+eNx6JbwFnsTIiELFrHhZrguEddzIkkR0y3FqnDx cu6zdzxUh5px5a6P4gzhU7fARd8rHME8ZaZk3f6GEYELbYNzoQCAP5fVSajsmVv72y2N Em8f2po2Qg/vYR0Bmdlz4khiJs/+XXp9oAuf7wbaMSlw/5p2+4oZkYgNm0VGd0ebj6LH HxVL284XjLrx4dasezHZksBsNOfft9qhbIS1DFOgOvy3q8j1WrUVHBpPUpiyd+JlPs2d aIKtkHqi7TcUlOaUOYT69jxvszJzvrkvJtl6vrfPpzynA23aNtGq3ghcXNxABPubzglG OgEA== 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:cc:to:from; bh=q5XHdJz/QgYv67bd/YJK8FjMqLF701e+BgavjD16B4c=; b=IXJuAAWO5KPHgWb1/1Gtc7mP5tXo//VrukwrdFCZlYjCZRF6iGhVnTn8Y/fV32B8Jv NIAWvd/uA40ARY59DZVdASgNHhZQLWppQdGIaVKawoku4HIEGqC7Cv+ye/Z8LALMVbJw mX0mj4F9U9ZeUyuc/UuV67uNxPaReQtykpmkrI+2Gs+Q0poM/d/ckl28OVkGBfUVoxq0 cfuedn9X87Tcfzk/jsa5R6cR4vQ6uW/71VJ9M2KVvBQtUjsDtsrNvzsOVgt7A0Z/+2R/ KOa3S0E54fRN6IUinzix6UHouvG95Hq1VMMOuNF7vHjCgXG+CFOsnOzimQoVZtOhRnRw 3FMw== ARC-Authentication-Results: i=1; mx.google.com; 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 f90si5051248plb.362.2018.12.14.14.13.55; Fri, 14 Dec 2018 14: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; 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 S1731064AbeLNWNy (ORCPT + 15 others); Fri, 14 Dec 2018 17:13:54 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:38237 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730956AbeLNWNy (ORCPT ); Fri, 14 Dec 2018 17:13:54 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1N2lzA-1hYnJJ3KJQ-0134uH; Fri, 14 Dec 2018 23:13:49 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: stable@vger.kernel.org, Arnd Bergmann , Rob Clark , freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] [stable-4.19] drm/msm: fix address space warning Date: Fri, 14 Dec 2018 23:10:12 +0100 Message-Id: <20181214221023.3878670-8-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214221023.3878670-1-arnd@arndb.de> References: <20181214221023.3878670-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:RALjA4tkloILgjm6jR+7T/S9goEocRFmUxYdSSKmhq8BVzr3cEe hXH994KH1JsI6FXYdhmRFjzNMOaN1XtRkYxMYxMjHTmqsbeLKNFlxFXRibvAtZgo+IDsTgk Q6F5VoxotmMJ+4lLatWxJ6/VyuZI/xxrO7OgCRnHkm17cuuYd6rk3OeafmWcoBG0M8zzIIL QMy6rhCltkgWKitzPnrFQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:K9rLjnmW5vk=:jVB6ky/IMCgCbvqNg5+HnQ mxpLVgI6lrqRNSExZI2nhNZXTAeJdFPvsWnDbLdT1Nbdzkjb8Qv3wftXDwG4zv2MSYs76Ci6O h8BCuUzmlRv5q9dsTL4IN4fXMAwTyruiIFBca4YFX/Wl0b7yBxuQ0quuMv43FZxgfvAHtH1fH Y6w9w42BWUc992cE3d72RiBuQQSZR6l1ABbFG79NlDD2jH5QuevaouIDAN7b7vycPdvINcXJ/ XlUCp6U4vMCiaIN7DJiW3yw7pwzcc+LpzTIw1IlxGg0xOOMZhKlfw9bRTTkWSuhkC9fy33YsV dUjPrZdoRFxVB9HG4vOazAuj/K9+QidwSEK6ZKOAt/F08ZZdH3in6u0IGiuyjoAcCfl93fw1J I3lwC6v5EM/5R9B5PA+xspDHAm/CNr7zAHBoQak5mhSSVd/vmaAPfF/RV35TqV8mNekaqrTjq j15sfm7LkoTK5wV/Y0JWl4WKqkLrdSYglxCozuyUjaOdaAcqrVWDySJkG/jeXApdAAYhZaZQl CYDpDomBUB9X1WebGZDDb2srYAa+Hcom6amDZD0Mv5R0RayMzns0o/rYpvLTxmM/H8qEo9lCN RD7NIL7ynQmesZ909Wrpa9GceE3gtzGrnJprle0pKOUsU8tWCO0BsRpO4ZNf1RQKcDibCkayD qBaaCcbElSDOHDB7QQcpjIDmioPc6vugVkrtGPWihsYYDOl5qAePTP17nxRX3fbf5Y3CbEP6Y ZAUWqa3FAMDWeba8jW5OewxgFNvgG5fYe+bqjA== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org In the linux-4.19 stable kernel, we get a warning about a type mismatch between phys_addr_t and dma_addr_t: drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c: In function '_dpu_dbg_dump_dpu_dbg_bus': drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c:2003:16: error: passing argument 3 of 'dma_alloc_coherent' from incompatible pointer type [-Werror=incompatible-pointer-types] list_size, &phys, GFP_KERNEL); ^~~~~ In file included from include/linux/dma-buf.h:31, from drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c:20: include/linux/dma-mapping.h:561:15: note: expected 'dma_addr_t *' {aka 'long long unsigned int *'} but argument is of type 'phys_addr_t *' {aka 'unsigned int *'} dma_addr_t *dma_handle, gfp_t flag) ~~~~~~~~~~~~^~~~~~~~~~ drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c: In function '_dpu_dbg_dump_vbif_dbg_bus': drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c:2154:16: error: passing argument 3 of 'dma_alloc_coherent' from incompatible pointer type [-Werror=incompatible-pointer-types] list_size, &phys, GFP_KERNEL); ^~~~~ In file included from include/linux/dma-buf.h:31, from drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c:20: include/linux/dma-mapping.h:561:15: note: expected 'dma_addr_t *' {aka 'long long unsigned int *'} but argument is of type 'phys_addr_t *' {aka 'unsigned int *'} This code was removed in linux-4.20 with upstream commit effec874792f ("drm/msm/dpu: Remove dpu_dbg"). Rather than backporting the large patch, this just fixes the warning by using the correct type. Fixes: 25fdd5933e4c ("drm/msm: Add SDM845 DPU support") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.20.0 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c index ae2aee7ed9e1..e741d26185df 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c @@ -1962,7 +1962,7 @@ static void _dpu_dbg_dump_dpu_dbg_bus(struct dpu_dbg_dpu_debug_bus *bus) u32 *dump_addr = NULL; u32 status = 0; struct dpu_debug_bus_entry *head; - phys_addr_t phys = 0; + dma_addr_t dma = 0; int list_size; int i; u32 offset; @@ -2000,7 +2000,7 @@ static void _dpu_dbg_dump_dpu_dbg_bus(struct dpu_dbg_dpu_debug_bus *bus) if (in_mem) { if (!(*dump_mem)) *dump_mem = dma_alloc_coherent(dpu_dbg_base.dev, - list_size, &phys, GFP_KERNEL); + list_size, &dma, GFP_KERNEL); if (*dump_mem) { dump_addr = *dump_mem; @@ -2101,7 +2101,7 @@ static void _dpu_dbg_dump_vbif_dbg_bus(struct dpu_dbg_vbif_debug_bus *bus) u32 value, d0, d1; unsigned long reg, reg1, reg2; struct vbif_debug_bus_entry *head; - phys_addr_t phys = 0; + dma_addr_t dma = 0; int i, list_size = 0; void __iomem *mem_base = NULL; struct vbif_debug_bus_entry *dbg_bus; @@ -2151,7 +2151,7 @@ static void _dpu_dbg_dump_vbif_dbg_bus(struct dpu_dbg_vbif_debug_bus *bus) if (in_mem) { if (!(*dump_mem)) *dump_mem = dma_alloc_coherent(dpu_dbg_base.dev, - list_size, &phys, GFP_KERNEL); + list_size, &dma, GFP_KERNEL); if (*dump_mem) { dump_addr = *dump_mem;