From patchwork Tue Nov 9 09:30:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1552835 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=Vt4PPXs3; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HpN582Tp3z9sPf for ; Tue, 9 Nov 2021 20:30:52 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mkNSk-00089A-NV; Tue, 09 Nov 2021 09:30:42 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mkNSh-000892-IB for kernel-team@lists.ubuntu.com; Tue, 09 Nov 2021 09:30:39 +0000 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 5FE453F1AB for ; Tue, 9 Nov 2021 09:30:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1636450239; bh=KRPdwpnH+hU8ouPL5xVKgr9J8+Z2HTXYX/SLYIZH1Nw=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=Vt4PPXs39w8SqeoYA2Nlb6xBpVhKAsXnDjm7vavtCLjtSGmn5UH8Y9divGEboC8V4 oEOsSxzbaDOcQrx/07+i7BN2pGqktgBkmviZeTF7TMF/dlesOCt2hNYEIJMzuNyPgV ajReSN8oJ5ZLOXN0NE7e3D4SvZd0NDLPIjMvRx6HDvqK6y9+ezdLF4SPt9YyEfCUtM vStQwuEpdjb3ntaVseRRAk0dlIumcNDpOa+ubM9jLAoJluS+vf6TsXCCPg40zVQ87k BBY8o86pLkr63Jadm0Rsy6j9LQj60k8gy0N88lLFE7bXPH+mY/WcyRit8V834xMDzv rqQqCFZUkSfiw== Received: by mail-ed1-f69.google.com with SMTP id q6-20020a056402518600b003e28d92bb85so17349097edd.7 for ; Tue, 09 Nov 2021 01:30:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=KRPdwpnH+hU8ouPL5xVKgr9J8+Z2HTXYX/SLYIZH1Nw=; b=sMJF5IOYtCgWYEJfXF7MtGWy554Jotk0x+KwX0o+vEfkTUZE7BhfD5GGtGEYRJQu7e AiVu/WP99WpE+iNcygKe+wJykE62FsfVnAktfMfjolXvm196PfIJhghfThEJ99lDZY8q BWIFO8SAVhUem7mBAvvQuvOX9C8AlyGJQzP9qBiTISRgRYkyBfV++aeucutMveuOTwTg RkSpLhmgMr3ffwSJ4zZq2X3Fc/DKvpjlSNzzECkEFg7/9ksSxqFto9qPgJ7KCIReYOiC DCOpFU4h0Z59nfv2Z1xEQt8KJeCnlZbqEWuZ7x3Y50mofvrbQqgLSGQfOC/FQveCbu7e SuSg== X-Gm-Message-State: AOAM532vDIIAtujSb5TGh/t6p5cJd/opW7ObVTnA0U0H+tg/MJHlGJIA 3rbC2cmrrZd8VTbuw2xr2HnWDqSFAx/DyFyFfXNEQP+6Gf47eSSDj5MTHWdP7ACg9pgJEWGgd50 f8YBQ6iSORxIrMtEUoc98VPFMTtc7UrJ9hbyIrNgNsQ== X-Received: by 2002:a17:907:68e:: with SMTP id wn14mr7865913ejb.258.1636450239126; Tue, 09 Nov 2021 01:30:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJyjRdEWtkSE0Vuqw286UUJEnCGhohaVnPccZwOAs214vwHXbHiMiick5BYNPzUaIcn6Q22czw== X-Received: by 2002:a17:907:68e:: with SMTP id wn14mr7865890ejb.258.1636450238954; Tue, 09 Nov 2021 01:30:38 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id cw5sm2934808ejc.74.2021.11.09.01.30.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 01:30:38 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][I/raspi][PATCH] UBUNTU: firmware: raspberrypi: Partially revert 'firmware: bcm2835: Support ARCH_BCM270x' Date: Tue, 9 Nov 2021 10:30:37 +0100 Message-Id: <20211109093037.1349515-1-juergh@canonical.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1950117 The upstream commit 09cbd1df7d26 ("firmware: raspberrypi: Fix a leak in 'rpi_firmware_get()'") releases a reference which was never taken in our kernel due to a downstream raspberrypi commit. This leads to a kernel crash but apparently only on Pi 3 and 2. Fix that by reverting part of the downstream commit which also happend recently in the downstream kernel but silently during a merge... Signed-off-by: Juerg Haefliger Acked-by: Stefan Bader Acked-by: Kleber Sacilotto de Souza --- drivers/firmware/raspberrypi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c index 7b554d33c18c..b277af60ac1f 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -438,7 +438,7 @@ static int rpi_firmware_remove(struct platform_device *pdev) */ struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node) { - struct platform_device *pdev = g_pdev; + struct platform_device *pdev = of_find_device_by_node(firmware_node); struct rpi_firmware *fw; if (!pdev)