From patchwork Tue Apr 21 12:39:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 227378 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E52BC55182 for ; Tue, 21 Apr 2020 12:40:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1D6F92074F for ; Tue, 21 Apr 2020 12:40:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Zw+fbxzX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728853AbgDUMkr (ORCPT ); Tue, 21 Apr 2020 08:40:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728739AbgDUMkr (ORCPT ); Tue, 21 Apr 2020 08:40:47 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7074C061A10 for ; Tue, 21 Apr 2020 05:40:46 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id g13so14257618wrb.8 for ; Tue, 21 Apr 2020 05:40:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o52HgE6vtTr4ukwLmsBnTEMam/haSnG9EfojG3rdDcg=; b=Zw+fbxzXfJ+EbaH1RANOXtZgZHXj4l+ZCymWDg4HLUhSONEVxeQw+HoGaiHoe55EWy neIW1kI0JRnAxpmrrxzB54DaCBFRkCT3Axv7ymPTKORCp8CjWUUyLxtuLaXQ7NeTlyW/ vsv0z6cVPGkLGEiRnH4UcFZbeUMNlW0pR2krMBtW279R9gAtmdidZ1EJKnQJCVKBowXF HriPFf1hNKNawblr9TDzppf9n0rnGOZsCJhbW3BySWw/vDDp/mkryMAACvCTYx4V5Ikm OFExHxezYJ0iME9xhFlSA60orX4zvtX9jybNNvpa8k2fhgvwdJUNfOwECuOA8qZRqN60 M6rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o52HgE6vtTr4ukwLmsBnTEMam/haSnG9EfojG3rdDcg=; b=cUI7OK5CcrusXmw4DmkEPudgIRlhKtC1ac/GX5oQdiNPTD9mje24F9Uaer9Pud0ACb xo+1ybU96NJth+xAxUBUS5NPcjTVgUhcsJ0pU63cd5nujzziFfBL8+uVf10/QqgM/77g EFk6Y+3v49ulj/p+8Qs2e1DltcFKSRzPGS5G/Ydy4RgM+z3ifTtdaLAON97ia6pwgBtz drVuKlvSi/c0uf/GUJta0fO9r99WRmJmqUx4nLSb+Hw0EDke+giSkzQ1hCFfJtOkFM8F rdADrYPb6Ron3z9PvSbLq6HxHzsbtcLkaevtTSxePcxkVALAQcu9YemEjSFXJN5v83Ho 4Muw== X-Gm-Message-State: AGi0PuahHXWVcXSIpjjKWq/Pty2/qbUOcdc3GypURZiQDy5Npt8+KKZy Xx0ZGrvDI4kDVtnviK4p9bEvo6Z0QDQ= X-Google-Smtp-Source: APiQypKFVf/wE3tY2Xwz9ptmJ/oNNP6/+IY12QZhLCxfOSgonuKknE8FyGHKTRmJHBgsvvTcHaa/ZQ== X-Received: by 2002:a5d:52d1:: with SMTP id r17mr22716894wrv.333.1587472845359; Tue, 21 Apr 2020 05:40:45 -0700 (PDT) Received: from localhost.localdomain ([2.31.163.63]) by smtp.gmail.com with ESMTPSA id u3sm3408232wrt.93.2020.04.21.05.40.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 05:40:44 -0700 (PDT) From: Lee Jones To: stable@vger.kernel.org Cc: Joe Moriarty , Steven Sistare , Daniel Vetter , Lee Jones Subject: [PATCH 4.14 01/24] drm: NULL pointer dereference [null-pointer-deref] (CWE 476) problem Date: Tue, 21 Apr 2020 13:39:54 +0100 Message-Id: <20200421124017.272694-2-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200421124017.272694-1-lee.jones@linaro.org> References: <20200421124017.272694-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: Joe Moriarty [ Upstream commit 22a07038c0eaf4d1315a493ce66dcd255accba19 ] The Parfait (version 2.1.0) static code analysis tool found the following NULL pointer derefernce problem. - drivers/gpu/drm/drm_dp_mst_topology.c The call to drm_dp_calculate_rad() in function drm_dp_port_setup_pdt() could result in a NULL pointer being returned to port->mstb due to a failure to allocate memory for port->mstb. Signed-off-by: Joe Moriarty Reviewed-by: Steven Sistare Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20180212195144.98323-3-joe.moriarty@oracle.com Signed-off-by: Lee Jones --- drivers/gpu/drm/drm_dp_mst_topology.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index f0d819fc16cd7..4a008fb8b1afc 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -1043,10 +1043,12 @@ static bool drm_dp_port_setup_pdt(struct drm_dp_mst_port *port) lct = drm_dp_calculate_rad(port, rad); port->mstb = drm_dp_add_mst_branch_device(lct, rad); - port->mstb->mgr = port->mgr; - port->mstb->port_parent = port; + if (port->mstb) { + port->mstb->mgr = port->mgr; + port->mstb->port_parent = port; - send_link = true; + send_link = true; + } break; } return send_link; From patchwork Tue Apr 21 12:39:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 227377 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B21EC54FD0 for ; Tue, 21 Apr 2020 12:40:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7812A2074F for ; Tue, 21 Apr 2020 12:40:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="vLKSrKHB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728739AbgDUMku (ORCPT ); Tue, 21 Apr 2020 08:40:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728874AbgDUMku (ORCPT ); Tue, 21 Apr 2020 08:40:50 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B88FDC061A41 for ; Tue, 21 Apr 2020 05:40:49 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id y24so3495436wma.4 for ; Tue, 21 Apr 2020 05:40:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FufN8ACRAoxbxjTegJ+M/1R/ELgdwjuEiGq1TqIq1Lc=; b=vLKSrKHBC50HSMEdUg3fKqcwrRGVHBJu7KLH38rc0PcUh6NQ+hOhqV3S39seQRhw0f o33MVGiFdMGCo9284qpruQ2jhc/Ui+O3ieHQvF5mdpbf7MG9xow358kY8NNJkarcutuw Wh1Z8TXg1PshyCVx5EWPyG2Zz9drckRADrqb/2IvB/kAnXdHexjLejkNZrSh7jVaBHSy 9oqOfuTlKOJL+xJxIV1wPC2Iyutby492EpNZdi9gSi33CAbI5Ehed4bW5P1EJFyO9fSS BOvzWfpG3PGdtw9BbU4jS5fKPPYyts9IJt8sqR+9BpqZQ2H+YGQPo6Uh5UwprN+xCEpT 7rsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FufN8ACRAoxbxjTegJ+M/1R/ELgdwjuEiGq1TqIq1Lc=; b=SsJxM5e7TaIb8rgOzlBPzl+Q+3MTnc5kSzZ7JUE53lbMfOiboO9SHv0WOl4MmgtXA/ FDKssMgkoUkuUcNuuN5nmPbLgsD0MgBJkiRg5YeQDq9Y694Qwh5ta1uNNehxJKAsSbor tjSRP1VJ9gQV4DqzZiJL18X3njAg0Xpczo3mHefP4SFpsh1pQ+Ti875/8rhx1Ukvzmyk jjJC0EqhZSd/vxdCsJZXPKg/PPf5ec7qXTIPr24zixoyiHBIIdNLno0PjAkPkJsqG47e LLQMu/Biv/y09wl592BgU0LQQpqt0xp3qJpBt33aDPgPEScY8FMwibr+Y/pwJ6BVyE5d Gzeg== X-Gm-Message-State: AGi0PuZ4ffKQKpnlnxVwQoWapYnrzKvuutHizvJpSGDArms9FV5JKVWl zeV5XjOKqkbqI7wbplrbe3Se7pErXbg= X-Google-Smtp-Source: APiQypLDkm0AyICgP+rg7hysUAnYTbVKrjTvaL/62bezJ48PyKrWuUyqg3dDcSP1h71u3NvC3ObVjQ== X-Received: by 2002:a1c:4085:: with SMTP id n127mr5008186wma.163.1587472848215; Tue, 21 Apr 2020 05:40:48 -0700 (PDT) Received: from localhost.localdomain ([2.31.163.63]) by smtp.gmail.com with ESMTPSA id u3sm3408232wrt.93.2020.04.21.05.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 05:40:47 -0700 (PDT) From: Lee Jones To: stable@vger.kernel.org Cc: Timur Tabi , Stephen Boyd , Linus Walleij , Lee Jones Subject: [PATCH 4.14 03/24] Revert "gpio: set up initial state from .get_direction()" Date: Tue, 21 Apr 2020 13:39:56 +0100 Message-Id: <20200421124017.272694-4-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200421124017.272694-1-lee.jones@linaro.org> References: <20200421124017.272694-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: Timur Tabi [ Upstream commit 1ca2a92b2a99323f666f1b669b7484df4bda05e4 ] This reverts commit 72d3200061776264941be1b5a9bb8e926b3b30a5. We cannot blindly query the direction of all GPIOs when the pins are first registered. The get_direction callback normally triggers a read/write to hardware, but we shouldn't be touching the hardware for an individual GPIO until after it's been properly claimed. Signed-off-by: Timur Tabi Reviewed-by: Stephen Boyd Signed-off-by: Linus Walleij Signed-off-by: Lee Jones --- drivers/gpio/gpiolib.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index f0777a7a4305b..d5b42cc86d718 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1245,31 +1245,14 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data) struct gpio_desc *desc = &gdev->descs[i]; desc->gdev = gdev; - /* - * REVISIT: most hardware initializes GPIOs as inputs - * (often with pullups enabled) so power usage is - * minimized. Linux code should set the gpio direction - * first thing; but until it does, and in case - * chip->get_direction is not set, we may expose the - * wrong direction in sysfs. - */ - - if (chip->get_direction) { - /* - * If we have .get_direction, set up the initial - * direction flag from the hardware. - */ - int dir = chip->get_direction(chip, i); - if (!dir) - set_bit(FLAG_IS_OUT, &desc->flags); - } else if (!chip->direction_input) { - /* - * If the chip lacks the .direction_input callback - * we logically assume all lines are outputs. - */ - set_bit(FLAG_IS_OUT, &desc->flags); - } + /* REVISIT: most hardware initializes GPIOs as inputs (often + * with pullups enabled) so power usage is minimized. Linux + * code should set the gpio direction first thing; but until + * it does, and in case chip->get_direction is not set, we may + * expose the wrong direction in sysfs. + */ + desc->flags = !chip->direction_input ? (1 << FLAG_IS_OUT) : 0; } #ifdef CONFIG_PINCTRL From patchwork Tue Apr 21 12:39:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 227376 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57F9CC54FD0 for ; Tue, 21 Apr 2020 12:40:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 29D182076C for ; Tue, 21 Apr 2020 12:40:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="atQxxuGY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728890AbgDUMkx (ORCPT ); Tue, 21 Apr 2020 08:40:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728874AbgDUMkw (ORCPT ); Tue, 21 Apr 2020 08:40:52 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20725C061A10 for ; Tue, 21 Apr 2020 05:40:52 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id y24so3495610wma.4 for ; Tue, 21 Apr 2020 05:40:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m+/aHHzA7P1xYHmkYaS5NJbgJVCxVABFSZYdM1niH8Q=; b=atQxxuGYRMD5JWzZ9lDXiYAFhPj69ahwVTbl2ZpyP5oOsE6rmOtuRWQI7+evuZsb6Z TwqMi46lmu3/qP1uVOfwJNF+O5ycwfn5FOAY8E/A/Zv8L5Gs2izOSiwmp36OULqnX1iO XRi8EiUqyPvz9GhNCgBPZhdQeSf9FzK2VJsS4kFU2Etaw5VnGsSZbDUtiQLMWKBQmb2K ogE35qBXx+nYprie3dUFyC65OBlrys6WWNxiUmJUyyO9pMy2+ckJPRrw9A+9BEO4KzXz ung94/U98P+PkvYHRZTWVXn1CpJE/gp9Bcw0Btz1hd0TQTrBS0DyZ+g7vm/8Sb9zM1Pc sdKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m+/aHHzA7P1xYHmkYaS5NJbgJVCxVABFSZYdM1niH8Q=; b=Y4wJUdnSipq/4GHF+UKUrMrChPftiomcP+3BElnzKn3OjcbPHaGPtcOArttYXyVAPr sawlD1biZUNXbWBK3+0axq+QDTpDWU5XMduGR6WtaqoR9Omto5Np8ivtpOsu5s6W9Pvl 13NtdTdpdKci3tWexztFFx4gkavoZJrTmMXB//fYBq4jxN3ISNoZu9wiy8mJnu1fCTAl 1yb67QyZMikEXKr7p+P+oETU3blH+3Niw3b2v7WFTIQlJlm7T1mQ4uononi9zmJXJBqE kZnh2t6+v6TdposfIBh+F1lUVYKobfWDuFovN/YRWG3BZn6mPm62M3scq2vdZahLB/+q LS2A== X-Gm-Message-State: AGi0PuYbNzPI5i5kI1KENHuVYgzjcytmuOTQXKZU8IENYnFENRq0mMdy sC7mhCJe1+CSNwqS/iL5P8JqxynNins= X-Google-Smtp-Source: APiQypL4HHsensgoe2o2aPb18GcdzdD7ChqjkqlfXd4DUCVBQHAebfaJwVAgDUFj6wH0LtVR9zTO1Q== X-Received: by 2002:a1c:1d4b:: with SMTP id d72mr4564052wmd.19.1587472850630; Tue, 21 Apr 2020 05:40:50 -0700 (PDT) Received: from localhost.localdomain ([2.31.163.63]) by smtp.gmail.com with ESMTPSA id u3sm3408232wrt.93.2020.04.21.05.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 05:40:49 -0700 (PDT) From: Lee Jones To: stable@vger.kernel.org Cc: Will Deacon , Laura Abbott , Lee Jones Subject: [PATCH 4.14 05/24] arm64: traps: Don't print stack or raw PC/LR values in backtraces Date: Tue, 21 Apr 2020 13:39:58 +0100 Message-Id: <20200421124017.272694-6-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200421124017.272694-1-lee.jones@linaro.org> References: <20200421124017.272694-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: Will Deacon [ Upstream commit a25ffd3a6302a67814280274d8f1aa4ae2ea4b59 ] Printing raw pointer values in backtraces has potential security implications and are of questionable value anyway. This patch follows x86's lead and removes the "Exception stack:" dump from kernel backtraces, as well as converting PC/LR values to symbols such as "sysrq_handle_crash+0x20/0x30". Tested-by: Laura Abbott Signed-off-by: Will Deacon Signed-off-by: Lee Jones --- arch/arm64/kernel/process.c | 8 ++--- arch/arm64/kernel/traps.c | 65 ++----------------------------------- 2 files changed, 6 insertions(+), 67 deletions(-) diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index ee5ce03c9315d..2ff327651ebec 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -186,11 +186,9 @@ void __show_regs(struct pt_regs *regs) } show_regs_print_info(KERN_DEFAULT); - print_symbol("PC is at %s\n", instruction_pointer(regs)); - print_symbol("LR is at %s\n", lr); - printk("pc : [<%016llx>] lr : [<%016llx>] pstate: %08llx\n", - regs->pc, lr, regs->pstate); - printk("sp : %016llx\n", sp); + print_symbol("pc : %s\n", regs->pc); + print_symbol("lr : %s\n", lr); + printk("sp : %016llx pstate : %08llx\n", sp, regs->pstate); i = top_reg; diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 5ae9c86c30d1d..b30d23431fe11 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -59,55 +59,9 @@ static const char *handler[]= { int show_unhandled_signals = 0; -/* - * Dump out the contents of some kernel memory nicely... - */ -static void dump_mem(const char *lvl, const char *str, unsigned long bottom, - unsigned long top) -{ - unsigned long first; - mm_segment_t fs; - int i; - - /* - * We need to switch to kernel mode so that we can use __get_user - * to safely read from kernel space. - */ - fs = get_fs(); - set_fs(KERNEL_DS); - - printk("%s%s(0x%016lx to 0x%016lx)\n", lvl, str, bottom, top); - - for (first = bottom & ~31; first < top; first += 32) { - unsigned long p; - char str[sizeof(" 12345678") * 8 + 1]; - - memset(str, ' ', sizeof(str)); - str[sizeof(str) - 1] = '\0'; - - for (p = first, i = 0; i < (32 / 8) - && p < top; i++, p += 8) { - if (p >= bottom && p < top) { - unsigned long val; - - if (__get_user(val, (unsigned long *)p) == 0) - sprintf(str + i * 17, " %016lx", val); - else - sprintf(str + i * 17, " ????????????????"); - } - } - printk("%s%04lx:%s\n", lvl, first & 0xffff, str); - } - - set_fs(fs); -} - static void dump_backtrace_entry(unsigned long where) { - /* - * Note that 'where' can have a physical address, but it's not handled. - */ - print_ip_sym(where); + printk(" %pS\n", (void *)where); } static void __dump_instr(const char *lvl, struct pt_regs *regs) @@ -177,10 +131,7 @@ void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) #endif printk("Call trace:\n"); - while (1) { - unsigned long stack; - int ret; - + do { /* skip until specified stack frame */ if (!skip) { dump_backtrace_entry(frame.pc); @@ -195,17 +146,7 @@ void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) */ dump_backtrace_entry(regs->pc); } - ret = unwind_frame(tsk, &frame); - if (ret < 0) - break; - if (in_entry_text(frame.pc)) { - stack = frame.fp - offsetof(struct pt_regs, stackframe); - - if (on_accessible_stack(tsk, stack)) - dump_mem("", "Exception stack", stack, - stack + sizeof(struct pt_regs)); - } - } + } while (!unwind_frame(tsk, &frame)); put_task_stack(tsk); } From patchwork Tue Apr 21 12:40:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 227375 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D2D1C54FD0 for ; Tue, 21 Apr 2020 12:40:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4A3022075E for ; Tue, 21 Apr 2020 12:40:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="k6ZfrlSY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728903AbgDUMk4 (ORCPT ); Tue, 21 Apr 2020 08:40:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728898AbgDUMkz (ORCPT ); Tue, 21 Apr 2020 08:40:55 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37023C061A41 for ; Tue, 21 Apr 2020 05:40:55 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id 188so3393216wmc.2 for ; Tue, 21 Apr 2020 05:40:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GiktMIoV1OYAqlxtIDqvHy2UdqWYzp89wwK6vhfs1Yk=; b=k6ZfrlSYeP4ex/U5u0dtLCo39z1l0m812h9TjU8lb9PuhbvMh/WGM7i3NOINDBpB89 p8cHS2WEvetVqB4sfftW+eKTU8D+jq+aVHrgFQ0X3vC3bFaU6Zv4TSKpXjhWVjasBgrL dCjxI2me2G8nMNLN66x34ZHRiYDReY4UdCOk832Eq6yHtC2BfYpNmTmeJ4xWwRWWMh7T R7lnKmDCXOP+nen91Omz5LE3waRk2+otV5MOG9Gwnk7CF2W4ZDtZXEpGx3rsw8YDx6Jn 1tCzM/rbSqoqO1Iqrvq8FDO9ZLTtiVhg4VG1er3y01UN4Lymx/6J4CZQo4E9l+c7RvBF WHVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GiktMIoV1OYAqlxtIDqvHy2UdqWYzp89wwK6vhfs1Yk=; b=Zve/yQ5M9RZioquhF/rsPZOJgLjfOExc+kG4XTJcqlU8FCqJE40aaxZjJtKTt7GeXc lJRryHgp6WG1NZyTIiCtMU++3s4+FU8YlPVGBtDSrB/Qlj3KykzJhUGiLQTP6/wu4xFK His72xE5/d2nkfz+lbDEXTunyUFx+K+Mc4i5dM47bux8e+Q07t7MU/AfCQsnQ3jxpy0P SzSCQTXCRHu1WYc4zSXnzCz0v8dnGL2/Ueeoq2gVKe8DXtxYHlFUCPUDkfTQzsUfA+iF TtMeJmhNS0N/XEL5LJ7V4B9hRWjRUg5SfrkbtHdFlKgQ2T8uHved3ThPfMTB3IR6CfD0 oZvA== X-Gm-Message-State: AGi0Pubgao6WXkTivD+cLi8tYuW267wrKKYdeojMtWHGfINVlYVyksM5 DbTqPDAjQviH447AICPvhwBSKMnAIIY= X-Google-Smtp-Source: APiQypLdJXL3FgvBAN2DJvX9BRvsbxCsSHJjpGsWViLVIvXwx2oyQ0cNn19lHkdhd6eJupZA/IzXbg== X-Received: by 2002:a05:600c:29c2:: with SMTP id s2mr4629912wmd.111.1587472853691; Tue, 21 Apr 2020 05:40:53 -0700 (PDT) Received: from localhost.localdomain ([2.31.163.63]) by smtp.gmail.com with ESMTPSA id u3sm3408232wrt.93.2020.04.21.05.40.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 05:40:52 -0700 (PDT) From: Lee Jones To: stable@vger.kernel.org Cc: Prasad Sodagudi , Viresh Kumar , Greg Kroah-Hartman , Lee Jones Subject: [PATCH 4.14 07/24] arch_topology: Fix section miss match warning due to free_raw_capacity() Date: Tue, 21 Apr 2020 13:40:00 +0100 Message-Id: <20200421124017.272694-8-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200421124017.272694-1-lee.jones@linaro.org> References: <20200421124017.272694-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: Prasad Sodagudi [ Upstream commit 82d8ba717ccb54dd803624db044f351b2a54d000 ] Remove the __init annotation from free_raw_capacity() to avoid the following warning. The function init_cpu_capacity_callback() references the function __init free_raw_capacity(). WARNING: vmlinux.o(.text+0x425cc0): Section mismatch in reference from the function init_cpu_capacity_callback() to the function .init.text:free_raw_capacity(). Signed-off-by: Prasad Sodagudi Acked-by: Viresh Kumar Signed-off-by: Greg Kroah-Hartman Signed-off-by: Lee Jones --- drivers/base/arch_topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 41be9ff7d70a9..3da53cc6cf2be 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -96,7 +96,7 @@ subsys_initcall(register_cpu_capacity_sysctl); static u32 capacity_scale; static u32 *raw_capacity; -static int __init free_raw_capacity(void) +static int free_raw_capacity(void) { kfree(raw_capacity); raw_capacity = NULL; From patchwork Tue Apr 21 12:40:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 227374 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62CF2C55182 for ; Tue, 21 Apr 2020 12:41:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C2582074F for ; Tue, 21 Apr 2020 12:41:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="SPeFlrNy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728901AbgDUMlB (ORCPT ); Tue, 21 Apr 2020 08:41:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728915AbgDUMlA (ORCPT ); Tue, 21 Apr 2020 08:41:00 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDB02C061A10 for ; Tue, 21 Apr 2020 05:40:59 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id j1so10871850wrt.1 for ; Tue, 21 Apr 2020 05:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y12kj5rwfob3P4HMM4TUh3MSvYrBnXpxaUuKSuJ7rB8=; b=SPeFlrNytCRuHZZY7Lm/dvHA1EJZF1+B1QjuWeye/H2AzQcyfGmYjbqStuToDCi1U3 m+nZDgELcnFFtyeyr6+8wqIFcMlHxrVy7DJZ7LD0GkvvWcsAlJYfeqNl17A3l4kZiQAR PU/Ag02LzFqJqmzICC7zfoCc2+OtSfAFcvCDcK42MNGVMT0idQFnECU1DvOdwHN8pFR+ lo+Lh39+3QEz+6qnw69zUxJ0BYfF/0J/IWkVtnXhvZYZrQc6ozCsG5OrOt7fn8A3wOEo l6p6444bYVDUUY0NRvCLpso//mkNPKp4qrtUqBQb0dZ6Mn3NKbyCHb4L+czrUu86YaNK oyKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y12kj5rwfob3P4HMM4TUh3MSvYrBnXpxaUuKSuJ7rB8=; b=N8+LOIy5ezRhVbAV4D8URdgfuqvIxsm7JeKGxd/A+2BqIJlbUpFWABetRKlNuf1Lcd nYA2bpoeE8zE+yfR0dJvEZ7wbp7ceasHZbe/gu82gBxz8Kbmlfp3a8MuAHG3c0Tkotty zqJUqfOYxQ1pzT6eBciZkqh+g9Mer3Gsw73+siqsJZHh1GY4EgzZBSCjkUsOmiXRt9BG 19SejSTLlMO7mVH4CuWWVhnt/kIhjN19Wo9/K5mg4xmEUWDlNQNPdpiVNip8iPNcgHI2 mHiEZYApDzWpfAGKG8zpWrpdIbx5qUrdq+S5FGJTOFYfHhJkaYzcQ7dvkqoaanmqPakw 2idw== X-Gm-Message-State: AGi0PubRZw/amDFP+fUfkhd5JXrSpZibQXeb8GpRWBuJAxeoxNB4vdz8 Wg7f4RY27wlYlm/i6z+/IBTvxtI4ocw= X-Google-Smtp-Source: APiQypKUrUHvK1VRzwRgxmcdhpseXaz8POJy4qGtSJUeJXbXz2RCmQ2ZDeMa3xcjUFnh+FI6nAvjcQ== X-Received: by 2002:adf:80ee:: with SMTP id 101mr12270093wrl.156.1587472858307; Tue, 21 Apr 2020 05:40:58 -0700 (PDT) Received: from localhost.localdomain ([2.31.163.63]) by smtp.gmail.com with ESMTPSA id u3sm3408232wrt.93.2020.04.21.05.40.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 05:40:57 -0700 (PDT) From: Lee Jones To: stable@vger.kernel.org Cc: Venkat Gopalakrishnan , Asutosh Das , Subhash Jadavani , "Martin K . Petersen" , Lee Jones Subject: [PATCH 4.14 10/24] scsi: ufs: make sure all interrupts are processed Date: Tue, 21 Apr 2020 13:40:03 +0100 Message-Id: <20200421124017.272694-11-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200421124017.272694-1-lee.jones@linaro.org> References: <20200421124017.272694-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: Venkat Gopalakrishnan [ Upstream commit 7f6ba4f12e6cbfdefbb95cfd8fc67ece6c15d799 ] As multiple requests are submitted to the ufs host controller in parallel there could be instances where the command completion interrupt arrives later for a request that is already processed earlier as the corresponding doorbell was cleared when handling the previous interrupt. Read the interrupt status in a loop after processing the received interrupt to catch such interrupts and handle it. Signed-off-by: Venkat Gopalakrishnan Signed-off-by: Asutosh Das Reviewed-by: Subhash Jadavani Signed-off-by: Martin K. Petersen Signed-off-by: Lee Jones --- drivers/scsi/ufs/ufshcd.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index c350453246952..f4f2c4f22b5f5 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -5366,19 +5366,30 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba) u32 intr_status, enabled_intr_status; irqreturn_t retval = IRQ_NONE; struct ufs_hba *hba = __hba; + int retries = hba->nutrs; spin_lock(hba->host->host_lock); intr_status = ufshcd_readl(hba, REG_INTERRUPT_STATUS); - enabled_intr_status = - intr_status & ufshcd_readl(hba, REG_INTERRUPT_ENABLE); - if (intr_status) - ufshcd_writel(hba, intr_status, REG_INTERRUPT_STATUS); + /* + * There could be max of hba->nutrs reqs in flight and in worst case + * if the reqs get finished 1 by 1 after the interrupt status is + * read, make sure we handle them by checking the interrupt status + * again in a loop until we process all of the reqs before returning. + */ + do { + enabled_intr_status = + intr_status & ufshcd_readl(hba, REG_INTERRUPT_ENABLE); + if (intr_status) + ufshcd_writel(hba, intr_status, REG_INTERRUPT_STATUS); + if (enabled_intr_status) { + ufshcd_sl_intr(hba, enabled_intr_status); + retval = IRQ_HANDLED; + } + + intr_status = ufshcd_readl(hba, REG_INTERRUPT_STATUS); + } while (intr_status && --retries); - if (enabled_intr_status) { - ufshcd_sl_intr(hba, enabled_intr_status); - retval = IRQ_HANDLED; - } spin_unlock(hba->host->host_lock); return retval; } From patchwork Tue Apr 21 12:40:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 227373 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E0E2C54FD0 for ; Tue, 21 Apr 2020 12:41:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 382F62075E for ; Tue, 21 Apr 2020 12:41:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="vGohs4E0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728899AbgDUMlD (ORCPT ); Tue, 21 Apr 2020 08:41:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728915AbgDUMlC (ORCPT ); Tue, 21 Apr 2020 08:41:02 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92054C061A10 for ; Tue, 21 Apr 2020 05:41:01 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id u127so3516521wmg.1 for ; Tue, 21 Apr 2020 05:41:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b9U0M3sx67B1Gb7lifHPL1pZ9q1gXirVR2CbXmiCZYc=; b=vGohs4E03peZwz1hFcr6NA31HpugyE4+F1ssTFPWuPQOiwhIDYhWEEuZU1szJNsLNW PFGDb5KUtm/hdH3o3haaneVED1YJLye+LgnZB0V8KvIU7anUDN0hQl5JLPlglu63bcrc AHA1DU+EO/uMJbegHJUQxNKUw6E6PTI7ufzdx3MSuGVlS3Yo2Hqeq71mKOs7emPIGxLj 5Rl5z1izrKQPpQmxK5b9wW7BHEu2YcReVbLvGpZWVbyzG1jLMIgdD8NIyMp0CrcP/WtU +EyK6UwELiStEOZyGgk9lTcP9oSiAKPn1U87m7Z63TbvouESdb+VWEctBWM2bXjdQl6z VUmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b9U0M3sx67B1Gb7lifHPL1pZ9q1gXirVR2CbXmiCZYc=; b=uX3GDf6x0+l4oSa0NMhTAFTI5XWpzAsXgx7BLMdvThOisjGLf/+pTAwKVcx4cF0JM6 YsXwSdbPEfYMg3NQJCt/pwM8icSqkUz0tuDm/4HCfmOQe2kuTzaPV6w3vnE19j4Qoi6R grRgjtpBZUzjuyhUkBU0Fl36TjlchRG1EU639uMo/LssvVrgpBQPfI+U4G2eBFFnszar DS9BDYPW5IPXERNo+CO1loAzmqhiOz0AzEaSYkR5NzwgcTwS0fSU48YPNwL9KTQzZcOU TiC4XKhEXfrRcbzILeJXxSlkVOZHOoNou/fpxbbe+sbziLoI5O9Qyb+N3SYvheEjFi3+ S/Wg== X-Gm-Message-State: AGi0PuaFEKf9WNlpZZVD5bctMAvQlgRTNw9VcsaOhlpWUOIHKYwp3/fr NEe5tKlytIYjEuThTjPOqrh73u+C0m8= X-Google-Smtp-Source: APiQypKWBLB4fKH3xpUaQ0c3shhEfuAzko1WiiferLjjGbk4SbKD7YGwfEEYCQyV9Ib0XmR2Dz5MIg== X-Received: by 2002:a7b:c931:: with SMTP id h17mr5033926wml.105.1587472860164; Tue, 21 Apr 2020 05:41:00 -0700 (PDT) Received: from localhost.localdomain ([2.31.163.63]) by smtp.gmail.com with ESMTPSA id u3sm3408232wrt.93.2020.04.21.05.40.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 05:40:59 -0700 (PDT) From: Lee Jones To: stable@vger.kernel.org Cc: Subhash Jadavani , Asutosh Das , "Martin K . Petersen" , Lee Jones Subject: [PATCH 4.14 11/24] scsi: ufs: ufs-qcom: remove broken hci version quirk Date: Tue, 21 Apr 2020 13:40:04 +0100 Message-Id: <20200421124017.272694-12-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200421124017.272694-1-lee.jones@linaro.org> References: <20200421124017.272694-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: Subhash Jadavani [ Upstream commit 69a6fff068567469c0ef1156ae5ac8d3d71701f0 ] UFSHCD_QUIRK_BROKEN_UFS_HCI_VERSION is only applicable for QCOM UFS host controller version 2.x.y and this has been fixed from version 3.x.y onwards, hence this change removes this quirk for version 3.x.y onwards. [mkp: applied by hand] Signed-off-by: Subhash Jadavani Signed-off-by: Asutosh Das Signed-off-by: Martin K. Petersen Signed-off-by: Lee Jones --- drivers/scsi/ufs/ufs-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c index c87d770b519a7..f2b8de195d8af 100644 --- a/drivers/scsi/ufs/ufs-qcom.c +++ b/drivers/scsi/ufs/ufs-qcom.c @@ -1094,7 +1094,7 @@ static void ufs_qcom_advertise_quirks(struct ufs_hba *hba) hba->quirks |= UFSHCD_QUIRK_BROKEN_LCC; } - if (host->hw_ver.major >= 0x2) { + if (host->hw_ver.major == 0x2) { hba->quirks |= UFSHCD_QUIRK_BROKEN_UFS_HCI_VERSION; if (!ufs_qcom_cap_qunipro(host)) From patchwork Tue Apr 21 12:40:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 227372 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72C44C54FD0 for ; Tue, 21 Apr 2020 12:41:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 535B72074F for ; Tue, 21 Apr 2020 12:41:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="u25KT+8x" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728712AbgDUMlH (ORCPT ); Tue, 21 Apr 2020 08:41:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728921AbgDUMlE (ORCPT ); Tue, 21 Apr 2020 08:41:04 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3600BC061A10 for ; Tue, 21 Apr 2020 05:41:04 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id g12so3502979wmh.3 for ; Tue, 21 Apr 2020 05:41:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kBbkNev7JBcXLr1TGpXKoVWw/2EDkyMfr9A7uSxU+qU=; b=u25KT+8xR5AXQxc68Ku3vgXjhHRqaq7mnRKTG1Wr6wXfo92CDanaVUiTc6e+1jeyZv CHmOYTFjpvEGtSc82yvWVoBj6RXF/8zVoUGTYOHeCbJaxrjMvvF4l5kE64H39sJdaGyZ Pke5OwKkS3vlyhl60xcsfaEPnXGOQYgS4DYZK+bwmPGjs8xc5cFDhcoVIKNT7Da48m7a +/PqqVkmee4p31+ljtam7SaGBWS1w+COfE+SfnjKVFsuKwWj22GzYvMrpLXGJgYz6nw2 cJ5wvpZGhPlQg4IXaM31sZb70KyxyG35bTEn4eI5UuX31PnUarCMJEsZXGCkb3y+XzXY J6nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kBbkNev7JBcXLr1TGpXKoVWw/2EDkyMfr9A7uSxU+qU=; b=EAGGI8CMccW+h3OP+yD3a3ES58+C8AcEWQSCbYSm/gqojp0iPPpb5CDY2TSZs/uguf 7s2RBAeBb/WpcP0uLtGtjCXkWcnq8sdbZDtX5MqEgIJtjHuI+nH5v9RyWbwQWhwlFcnU BsC3D9rJ3BmQxbS5tTsL5lSA+NVOEhX8QDTkuvNzPvhAbaf1gyx0gFWZ3qf+UTgorba4 jHhn8nxPeLyrUd0mfs3c9VwZDSyUUNJGXEN48H+JX+2GLIJkLGxMu7OzTKb0iSfqmqDG xcY2IAlBZfVX8fYInXunVFNPYFrjvvPBz6BAm13Vh0y2criooNJ7V1+/HtmyWOXQHZ7D njMw== X-Gm-Message-State: AGi0PuakXyQi4qcTlucWXVSVJgTaERgYoarWX0hkRHxrQfmp7ZNiy6uZ ClizoHAYn2PECVEm16Gj0NsszFLglAI= X-Google-Smtp-Source: APiQypJc3MXjPsErcfLAvRFYtP7qzhrLmupmXDdqPvL7RJPHnvSablsnLM9RCtRnohZXiyjtK5OUhw== X-Received: by 2002:a1c:4c10:: with SMTP id z16mr4784518wmf.77.1587472862641; Tue, 21 Apr 2020 05:41:02 -0700 (PDT) Received: from localhost.localdomain ([2.31.163.63]) by smtp.gmail.com with ESMTPSA id u3sm3408232wrt.93.2020.04.21.05.41.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 05:41:01 -0700 (PDT) From: Lee Jones To: stable@vger.kernel.org Cc: Arvind Yadav , Bjorn Andersson , Lee Jones Subject: [PATCH 4.14 13/24] rpmsg: glink: use put_device() if device_register fail Date: Tue, 21 Apr 2020 13:40:06 +0100 Message-Id: <20200421124017.272694-14-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200421124017.272694-1-lee.jones@linaro.org> References: <20200421124017.272694-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: Arvind Yadav [ Upstream commit a9011726c4bb37e5d6a7279bf47fcc19cd9d3e1a ] if device_register() returned an error! Always use put_device() to give up the reference initialized. And unregister device for other return error. Signed-off-by: Arvind Yadav Signed-off-by: Bjorn Andersson Signed-off-by: Lee Jones --- drivers/rpmsg/qcom_glink_smem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/rpmsg/qcom_glink_smem.c b/drivers/rpmsg/qcom_glink_smem.c index 2b54e71886d9c..69a14041ef1fe 100644 --- a/drivers/rpmsg/qcom_glink_smem.c +++ b/drivers/rpmsg/qcom_glink_smem.c @@ -212,6 +212,7 @@ struct qcom_glink *qcom_glink_smem_register(struct device *parent, ret = device_register(dev); if (ret) { pr_err("failed to register glink edge\n"); + put_device(dev); return ERR_PTR(ret); } @@ -294,7 +295,7 @@ struct qcom_glink *qcom_glink_smem_register(struct device *parent, return glink; err_put_dev: - put_device(dev); + device_unregister(dev); return ERR_PTR(ret); } From patchwork Tue Apr 21 12:40:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 227371 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1444BC55183 for ; Tue, 21 Apr 2020 12:41:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E65752074F for ; Tue, 21 Apr 2020 12:41:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="npoSRLpB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728924AbgDUMlJ (ORCPT ); Tue, 21 Apr 2020 08:41:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728898AbgDUMlH (ORCPT ); Tue, 21 Apr 2020 08:41:07 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 915E6C061A10 for ; Tue, 21 Apr 2020 05:41:07 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id v4so2437778wme.1 for ; Tue, 21 Apr 2020 05:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=egX0tfu7NRZXkI34xEHvcmq3oOPGI9lnyNWYVxggksI=; b=npoSRLpBjdLdDlhjUgIX3WhXryFFpXmLF5GO6fLIqIc2O3lNBEFVjfpKIMDNSHub1U W9l+UFTedIZH7f7Uy/Mqk9BPoKApCowMvWOl75G141pjhqBDQI/gptroQfF97yP+zKra 1apR4uUrRlVwtWoHGQUrtvUuwLrvCLQgiMGGerJOkrH5B2rXOpIo0Lvak5p0c28WDudZ IAz8XXBMYvg+cWHostlfa3l3wY3rByfCQwcdumhnGBoWz/4r22Xe2RRrLeZ07nID2v/a PmJ9LLAafV4llX4f6N37xrggYiexdNRfgnPV6fsTxbwyAT5ywWkXClWD9PASMtv1aWj9 7pnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=egX0tfu7NRZXkI34xEHvcmq3oOPGI9lnyNWYVxggksI=; b=HhQiVVPF3WaX5pGuheD7pST8XDoIQCF8YuoapvarSrwTkfhJcAmVpT7cvkgB3eRhao yzikGHdRY0EX5AvRA0oWqTbTNAxTllQwC0vqrk482sVposdUGRF4yEuvgkbMng4Neh+d qIXPhLsggthgTGaONZ4JQO8CkoSIEtU+qi/GkrekoAZe5YZkr1FIoVBVAektZuSOcDxy RbAHt1N34lUdIOhKvlE1HVkdLO5B90CuJG0bI8EyqwgbJ0eeEIS/mb3VLG1Vt/LPfPnc aMkAzZPBydb8r1whBCBIRbANkJSIC5wzqNZXrrkSZJ3h+ZMvOFq8f0457tQf3Fybx/xY fYRw== X-Gm-Message-State: AGi0PuYxEhfjVzdwmL2m2oE5XAq67pVBiUgCv7QMn9PxHw7Ap71KghWa Jjy2axSQcvh02wfnDRDOllWfPzzR10Q= X-Google-Smtp-Source: APiQypJwaDQmrykRLrWQJflqKHFkuDzvsIvJLB7YxoxEARHqfny1HcBgnDsQNg7Lbtsy0VS27Tkm8w== X-Received: by 2002:a1c:7415:: with SMTP id p21mr4628517wmc.93.1587472866040; Tue, 21 Apr 2020 05:41:06 -0700 (PDT) Received: from localhost.localdomain ([2.31.163.63]) by smtp.gmail.com with ESMTPSA id u3sm3408232wrt.93.2020.04.21.05.41.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 05:41:05 -0700 (PDT) From: Lee Jones To: stable@vger.kernel.org Cc: Wei Yongjun , Bjorn Andersson , Lee Jones Subject: [PATCH 4.14 16/24] rpmsg: glink: Fix missing mutex_init() in qcom_glink_alloc_channel() Date: Tue, 21 Apr 2020 13:40:09 +0100 Message-Id: <20200421124017.272694-17-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200421124017.272694-1-lee.jones@linaro.org> References: <20200421124017.272694-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: Wei Yongjun [ Upstream commit fb416f69900773d5a6030c909114099f92d07ab9 ] qcom_glink_alloc_channel() allocates the mutex but not initialize it. Use mutex_init() on it to initialize it correctly. This is detected by Coccinelle semantic patch. Signed-off-by: Wei Yongjun Signed-off-by: Bjorn Andersson Signed-off-by: Lee Jones --- drivers/rpmsg/qcom_glink_native.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c index 114481c9fba12..7802663efe332 100644 --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -221,6 +221,7 @@ static struct glink_channel *qcom_glink_alloc_channel(struct qcom_glink *glink, /* Setup glink internal glink_channel data */ spin_lock_init(&channel->recv_lock); spin_lock_init(&channel->intent_lock); + mutex_init(&channel->intent_req_lock); channel->glink = glink; channel->name = kstrdup(name, GFP_KERNEL); From patchwork Tue Apr 21 12:40:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 227370 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4655BC55184 for ; Tue, 21 Apr 2020 12:41:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A8662074F for ; Tue, 21 Apr 2020 12:41:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="qINMZlr3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728898AbgDUMlK (ORCPT ); Tue, 21 Apr 2020 08:41:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728926AbgDUMlJ (ORCPT ); Tue, 21 Apr 2020 08:41:09 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E7DFC061A41 for ; Tue, 21 Apr 2020 05:41:08 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id t63so3379981wmt.3 for ; Tue, 21 Apr 2020 05:41:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=92Rf6n3jfz/AKB5KQ5ygummyywSmBTVtgJ/40A7EfC4=; b=qINMZlr34Z67zq317QBYXWSlsITOb/RlKWRmvoH8Gq6PdOV0BzFtEXAhQBSBv/liCn eurB0GWRvo1s+5LzheDCWDELPEvTwxluolLEFrd8lQB6pd0Jo0833BvjwT+R1Zs/n1NG kVUJgpO64JQdvebtZYSsGwtM/XhEDvWON2lopyASM80gyfiT/nwKANsb6NxV/sCk9IBm relNjZHKUXaqCpEO4/+UcN6lG89c6Bd/eVFsHUMpDN4oPnIotJ/4JaJd0fehZUYXoKfN wkmLc9PZu1l1Syma9xBXBy0K5SAas26teMDz25lFW2lgRfu/TEijP8vYG7oJ35buDsLg stxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=92Rf6n3jfz/AKB5KQ5ygummyywSmBTVtgJ/40A7EfC4=; b=FuE+CRuTx2esZ6jfqtaba5LZOicwnMHi2d+e3d3L7fwYq4Fjrm9QO/OvAwvTzrcT2o 8WMdhLtmDPassVTcyN0NFQuSpbYis+VCbXhKU3FZtXBMUUcmJ6MXIoKeMkVxiOPY8hmc M6oTQbMOZF9BxjLyRvW38Kx65Oa5f6mi2WuOHX9jg210kPun0SAJe+w+ywcr9URmuuuC 02PhtMnhyaEXeL2dNQp+YWp244roZpiMy6U53ClbNugnP9jhozvn4yv8bDrP+tr3+x6e R9hNzLB2qVxGe2+nllE0V8wAAipq8TAsurxwwpuONUEaqwZnq1btKQyVA+bk8zTC4qfg /HbA== X-Gm-Message-State: AGi0PuaEJTClSmSZsQd/z2xUDDn31pM2Ln5hyZY3K4P1pM9Rx2P9HjRL 8MPNY2hb+3xvj4CTzjq/a3jCuuoLjuY= X-Google-Smtp-Source: APiQypIHN3pqVFzfx06ELIg43fWXhdXcg8ZPYljnBMtv/FIfXyRbs5zgL6moeeXcWB/mGcq7Qcx6MA== X-Received: by 2002:a05:600c:414b:: with SMTP id h11mr4673616wmm.9.1587472867159; Tue, 21 Apr 2020 05:41:07 -0700 (PDT) Received: from localhost.localdomain ([2.31.163.63]) by smtp.gmail.com with ESMTPSA id u3sm3408232wrt.93.2020.04.21.05.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 05:41:06 -0700 (PDT) From: Lee Jones To: stable@vger.kernel.org Cc: Bjorn Andersson , Chris Lew , Arun Kumar Neelakantam , Lee Jones Subject: [PATCH 4.14 17/24] rpmsg: glink: smem: Ensure ordering during tx Date: Tue, 21 Apr 2020 13:40:10 +0100 Message-Id: <20200421124017.272694-18-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200421124017.272694-1-lee.jones@linaro.org> References: <20200421124017.272694-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: Bjorn Andersson [ Upstream commit 9d32497361ff89d2fc8306407de6f04b2bfb2836 ] Ensure the ordering of the fifo write and the update of the write index, so that the index is not updated before the data has landed in the fifo. Acked-By: Chris Lew Reported-by: Arun Kumar Neelakantam Signed-off-by: Bjorn Andersson Signed-off-by: Lee Jones --- drivers/rpmsg/qcom_glink_smem.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/rpmsg/qcom_glink_smem.c b/drivers/rpmsg/qcom_glink_smem.c index 69a14041ef1fe..ed616b0bc563d 100644 --- a/drivers/rpmsg/qcom_glink_smem.c +++ b/drivers/rpmsg/qcom_glink_smem.c @@ -181,6 +181,9 @@ static void glink_smem_tx_write(struct qcom_glink_pipe *glink_pipe, if (head >= pipe->native.length) head -= pipe->native.length; + /* Ensure ordering of fifo and head update */ + wmb(); + *pipe->head = cpu_to_le32(head); } From patchwork Tue Apr 21 12:40:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 227367 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79175C55184 for ; Tue, 21 Apr 2020 12:41:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4CBAD2074F for ; Tue, 21 Apr 2020 12:41:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="gxdfRnvb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728778AbgDUMl0 (ORCPT ); Tue, 21 Apr 2020 08:41:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728934AbgDUMlM (ORCPT ); Tue, 21 Apr 2020 08:41:12 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AB89C061A10 for ; Tue, 21 Apr 2020 05:41:12 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id u16so3491249wmc.5 for ; Tue, 21 Apr 2020 05:41:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y2qCj2VEWLETSdDzdg9wby0Dp4VMBOBRFzvR2ZFa7wU=; b=gxdfRnvbMkmyuVPAMawnyxVUxNMmFvuexXJKU1WRh33ZWZgtcX6PZdtXiCg4lZRBIH XJAFyhaNqdsX98wdGhl7eB7Gn/Adv4tbtqWHa2Oof6cw8HXuzg+k98smiLjVwoHHJBhn KPejye8XGj+h8doOcHXx/sHWHA3ywOuZoHImvflnUV/Ax1T4TQDXhbqeM07pbCmeID5v /hm9TJ6F3bfmMt7cf+6ldOsy9HeqJ/EX8laocxi520SOZRd8YWnZH/cVBkH8uM8wxP1y ygpDpiaLaMFwZKAPD7MsV1CnXp7Ztg7mgdyTmGnXENKR5OQ2OlFzDnDW0FblE6A7RVQA w0lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y2qCj2VEWLETSdDzdg9wby0Dp4VMBOBRFzvR2ZFa7wU=; b=QBvZf80XE2/R1d/cPFTw3XbPljqN76ZqSohqM1fNty4kUOb5oFthNSIdFOmBMFHvUL kxh66H9zEwA7MA4H81JueDHyKgYXdxxxZCF2ku8BgVpmL85cXk4dSeLZW6QRnEyI037h dMkfS4My6u7DbsvdWSqweY5AuCJZCPX+JPd8WNXjky2zm+WEKq4dw6LH7KIQIqACNJtZ h4hX/lmM7qStGvXxamJbaOQXEqGdSQrs2SqEjNB4jtYDjdHjEdvgdHeSHBQbRLyATPPZ X/O3VRyvtKm1wpUg3WH8KnJULatXYxiOzEo32qkr+p+5Lq7ach6MycOWyGNZpEbtOPll 2AIw== X-Gm-Message-State: AGi0PuYeeudLmQF8QPEWtq5x/1JxCmrdpNVwwlMhIugMNIqkQWUqC/yG TOsdKhYwOl4wTKtdLeagOg4D2j51Hc4= X-Google-Smtp-Source: APiQypLyACVUnJpzIQswVVw/FLoDeZFabr/mLK8ufw4xJcVpTESApldSVgKFm5Yvf6ADcyTRdcfUhg== X-Received: by 2002:a1c:48c:: with SMTP id 134mr4436861wme.47.1587472870366; Tue, 21 Apr 2020 05:41:10 -0700 (PDT) Received: from localhost.localdomain ([2.31.163.63]) by smtp.gmail.com with ESMTPSA id u3sm3408232wrt.93.2020.04.21.05.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 05:41:09 -0700 (PDT) From: Lee Jones To: stable@vger.kernel.org Cc: Lior David , Maya Erez , Kalle Valo , Lee Jones Subject: [PATCH 4.14 20/24] wil6210: fix length check in __wmi_send Date: Tue, 21 Apr 2020 13:40:13 +0100 Message-Id: <20200421124017.272694-21-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200421124017.272694-1-lee.jones@linaro.org> References: <20200421124017.272694-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: Lior David [ Upstream commit 26a6d5274865532502c682ff378ac8ebe2886238 ] The current length check: sizeof(cmd) + len > r->entry_size will allow very large values of len (> U16_MAX - sizeof(cmd)) and can cause a buffer overflow. Fix the check to cover this case. In addition, ensure the mailbox entry_size is not too small, since this can also bypass the above check. Signed-off-by: Lior David Signed-off-by: Maya Erez Signed-off-by: Kalle Valo Signed-off-by: Lee Jones --- drivers/net/wireless/ath/wil6210/interrupt.c | 22 +++++++++++++++++++- drivers/net/wireless/ath/wil6210/wmi.c | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/wil6210/interrupt.c b/drivers/net/wireless/ath/wil6210/interrupt.c index 59def4f3fcf3d..5cf341702dc11 100644 --- a/drivers/net/wireless/ath/wil6210/interrupt.c +++ b/drivers/net/wireless/ath/wil6210/interrupt.c @@ -358,6 +358,25 @@ static void wil_cache_mbox_regs(struct wil6210_priv *wil) wil_mbox_ring_le2cpus(&wil->mbox_ctl.tx); } +static bool wil_validate_mbox_regs(struct wil6210_priv *wil) +{ + size_t min_size = sizeof(struct wil6210_mbox_hdr) + + sizeof(struct wmi_cmd_hdr); + + if (wil->mbox_ctl.rx.entry_size < min_size) { + wil_err(wil, "rx mbox entry too small (%d)\n", + wil->mbox_ctl.rx.entry_size); + return false; + } + if (wil->mbox_ctl.tx.entry_size < min_size) { + wil_err(wil, "tx mbox entry too small (%d)\n", + wil->mbox_ctl.tx.entry_size); + return false; + } + + return true; +} + static irqreturn_t wil6210_irq_misc(int irq, void *cookie) { struct wil6210_priv *wil = cookie; @@ -393,7 +412,8 @@ static irqreturn_t wil6210_irq_misc(int irq, void *cookie) if (isr & ISR_MISC_FW_READY) { wil_dbg_irq(wil, "IRQ: FW ready\n"); wil_cache_mbox_regs(wil); - set_bit(wil_status_mbox_ready, wil->status); + if (wil_validate_mbox_regs(wil)) + set_bit(wil_status_mbox_ready, wil->status); /** * Actual FW ready indicated by the * WMI_FW_READY_EVENTID diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c index 6cfb820caa3ee..22bfa10ea8276 100644 --- a/drivers/net/wireless/ath/wil6210/wmi.c +++ b/drivers/net/wireless/ath/wil6210/wmi.c @@ -231,7 +231,7 @@ static int __wmi_send(struct wil6210_priv *wil, u16 cmdid, void *buf, u16 len) uint retry; int rc = 0; - if (sizeof(cmd) + len > r->entry_size) { + if (len > r->entry_size - sizeof(cmd)) { wil_err(wil, "WMI size too large: %d bytes, max is %d\n", (int)(sizeof(cmd) + len), r->entry_size); return -ERANGE; From patchwork Tue Apr 21 12:40:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 227369 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CAD3C55184 for ; Tue, 21 Apr 2020 12:41:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61E0E2075E for ; Tue, 21 Apr 2020 12:41:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="bwUQKGe5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728950AbgDUMlP (ORCPT ); Tue, 21 Apr 2020 08:41:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728929AbgDUMlN (ORCPT ); Tue, 21 Apr 2020 08:41:13 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B316C061A10 for ; Tue, 21 Apr 2020 05:41:13 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id u13so16304144wrp.3 for ; Tue, 21 Apr 2020 05:41:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9HCLRvGXYC5n1AHCqufnjpyrxqZW9cO7ygbPcIujNSw=; b=bwUQKGe56p+Rs1RmD/AiA06aHfBOlHOD6TKND4DIGz5FuxhdyaxYcYMUdi+6n1KULV tmSha+Nf83O+z3Kn0M07bmdK/Af2K5JSzbZgEdF+m9c0nVZJPndVzDqcSMXnMve6Fa+s zBQOV/rUC1BLg/cKBxkOnMYScyEjj4fA77H8qLXMa0cKTtPiJlq22iTZZl7DNCNC0qaN iCPqCQ4u+vnrRs/AWztinKX0IE6HWwivzFtP06IL/oh+CjlbLHdA/pXZJq0F6h3HTuh4 zfkqvZGs0UyTLEOcHoekUfKhX+Rzty0Y8uZvO55/4oow+gNGB2uI+OTatjTxZnHh3bqu GgDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9HCLRvGXYC5n1AHCqufnjpyrxqZW9cO7ygbPcIujNSw=; b=pdw55CL5TMV5+PtYFRMBFXwVfyGgtdIgsV0GXAo+ouSL9RJYqeFUSuUn0dIK+zgq6Y 3yNsuWRcdVYmFBXz5XHyWzJjWoXUUeitFaKxouxW7Bnjr16d0Yq/E5onOg0bBXPzjX0C GkNP5BFAn0gjNGdkr9ZxK34ifhnmD5PtJrB42wr4CeVwMM/lQiU9zYLNdhvO7VaYD35M 0gGm9Ww8w14Dz+CGYaZLAOMj3WveVx8YYmmSSfGMocn5f9S9kBsxGwEcZXxVMV+M7i+5 vZNGDR5hlqxPJqrGF2dPfkdCnoOyE/5kiwWihukPA6LIhgQGgbABEdvgKStYa3zbLRlG 8+OA== X-Gm-Message-State: AGi0PuYe9FNVgvFjbs1IkubxeVrUZtWmrcaXyuMTxiI0+fU31e7dHiun X6jIp4Hg+eW5OS/6HC5QnmDPMT+MOaE= X-Google-Smtp-Source: APiQypLOCU+TuG15DRz77enIi3nX5O4aw9mUl8N0ZM2hWbnm0tl9IWNalAbI0vJLd/nNtgvrGPVLRQ== X-Received: by 2002:adf:b181:: with SMTP id q1mr5559173wra.414.1587472872093; Tue, 21 Apr 2020 05:41:12 -0700 (PDT) Received: from localhost.localdomain ([2.31.163.63]) by smtp.gmail.com with ESMTPSA id u3sm3408232wrt.93.2020.04.21.05.41.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 05:41:10 -0700 (PDT) From: Lee Jones To: stable@vger.kernel.org Cc: Hamad Kadmany , Maya Erez , Kalle Valo , Lee Jones Subject: [PATCH 4.14 21/24] wil6210: abort properly in cfg suspend Date: Tue, 21 Apr 2020 13:40:14 +0100 Message-Id: <20200421124017.272694-22-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200421124017.272694-1-lee.jones@linaro.org> References: <20200421124017.272694-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: Hamad Kadmany [ Upstream commit 144a12a6d83f3ca34ddefce5dee4d502afd2fc5b ] On-going operations were not aborted properly and required locks were not taken. Signed-off-by: Hamad Kadmany Signed-off-by: Maya Erez Signed-off-by: Kalle Valo Signed-off-by: Lee Jones --- drivers/net/wireless/ath/wil6210/cfg80211.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c index c374ed311520e..58784e77e215b 100644 --- a/drivers/net/wireless/ath/wil6210/cfg80211.c +++ b/drivers/net/wireless/ath/wil6210/cfg80211.c @@ -1735,9 +1735,12 @@ static int wil_cfg80211_suspend(struct wiphy *wiphy, wil_dbg_pm(wil, "suspending\n"); - wil_p2p_stop_discovery(wil); - + mutex_lock(&wil->mutex); + mutex_lock(&wil->p2p_wdev_mutex); + wil_p2p_stop_radio_operations(wil); wil_abort_scan(wil, true); + mutex_unlock(&wil->p2p_wdev_mutex); + mutex_unlock(&wil->mutex); out: return rc; From patchwork Tue Apr 21 12:40:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 227368 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E5F4C54FD0 for ; Tue, 21 Apr 2020 12:41:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3DFBA2075E for ; Tue, 21 Apr 2020 12:41:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="cfm5bh5+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728944AbgDUMlV (ORCPT ); Tue, 21 Apr 2020 08:41:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728479AbgDUMlP (ORCPT ); Tue, 21 Apr 2020 08:41:15 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7C92C061A10 for ; Tue, 21 Apr 2020 05:41:14 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id k13so15102976wrw.7 for ; Tue, 21 Apr 2020 05:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Da4R2mObgWasMS/Jsu1LIg5EJg09QgEbjMnbzzaCLcM=; b=cfm5bh5+WTSPytGHjGPUJ0xIeaYazUaXDTjT1h0f4ojkeM2CfDrTn2hu2KumLmL3R+ YRqg8c8qmM4OWjylPCQ/+mDklMAn61t6mqsxpKKWXrc3J04Wrflek065b+HwjGXcjhJm k+SPpH5RTrdmQyFJDS5FoVUQpAnn2RAhHu8ZfuNTEiGxOR/qzBzYmbgSx6krlpiYHO8F 01WJU4NJv5qbFkbvmPo8FtOLEtVfum5ITW20u+7tsKJZcKysb9JFm6Xhf2nnzZVGmI1S tP4WeVJ9iD/lpsrFmMCzqGsGfMsMUn8Nqsl7ITYV1uFw0qWPIHEgfnsuL6/OXlnHcSdb pdpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Da4R2mObgWasMS/Jsu1LIg5EJg09QgEbjMnbzzaCLcM=; b=gOaLQR1Fs7it1zded7/mUW0w67vkP7N+u1R8Kv2QDpfpWEzSxqZKKTXH46NxVQ7GbK r0kf0d+LBmMpd1SQ8UkZDjlPg440j3ENuiMBL7jr7Estg6bnllnb8ggmh1aBRKEZ3z0A 6aTLgQHNNjxzF7lJbLZRu307x8Uo584DICJ7k0ZnZk6B3P8XFLwyYsahr9xcXOn0hwy0 ElUKVHxkA5IaCCdA6yCO8dA3EZXifNcM9gf58kaGDwzgT5694IEZ0aS5VmBLemS7kw7q QMPInJJW8+PyYfEiLHxrst+i5WMt1OEjl/daR0GXJXj6QPjebCleRMPx+bri2wHAgpC/ 6VcA== X-Gm-Message-State: AGi0PuZmRuTTbeXw33uBRjzdGrAkBWik5PId2Aeo+1T4crsVYR262REg Uiw/nUtShpjIaiv42r+KzwI3fAAaOPE= X-Google-Smtp-Source: APiQypLqVRssaGuoiTTAv7EZP41lJzzzOapQ16xuZM77Oco3TNym+1iFlig4NjM5UQxklR2fgjyNWA== X-Received: by 2002:a05:6000:128d:: with SMTP id f13mr24895347wrx.241.1587472873368; Tue, 21 Apr 2020 05:41:13 -0700 (PDT) Received: from localhost.localdomain ([2.31.163.63]) by smtp.gmail.com with ESMTPSA id u3sm3408232wrt.93.2020.04.21.05.41.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 05:41:12 -0700 (PDT) From: Lee Jones To: stable@vger.kernel.org Cc: Chris Lew , Bjorn Andersson , Andy Gross , Lee Jones Subject: [PATCH 4.14 22/24] soc: qcom: smem: Use le32_to_cpu for comparison Date: Tue, 21 Apr 2020 13:40:15 +0100 Message-Id: <20200421124017.272694-23-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200421124017.272694-1-lee.jones@linaro.org> References: <20200421124017.272694-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: Chris Lew [ Upstream commit a216000f0140f415cec96129f777b5234c9d142f ] Endianness can vary in the system, add le32_to_cpu when comparing partition sizes from smem. Signed-off-by: Chris Lew Acked-by: Bjorn Andersson Signed-off-by: Andy Gross Signed-off-by: Lee Jones --- drivers/soc/qcom/smem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c index 18ec52f2078aa..89dd50fa404f7 100644 --- a/drivers/soc/qcom/smem.c +++ b/drivers/soc/qcom/smem.c @@ -646,7 +646,7 @@ static int qcom_smem_enumerate_partitions(struct qcom_smem *smem, return -EINVAL; } - if (header->size != entry->size) { + if (le32_to_cpu(header->size) != le32_to_cpu(entry->size)) { dev_err(smem->dev, "Partition %d has invalid size\n", i); return -EINVAL;