From patchwork Mon Oct 4 12:52:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 515200 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp4356080wrs; Mon, 4 Oct 2021 06:34:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1nafeS8N02BJDxHLyMPK2k9xSRfrQGLAGynLLHf+HKk6IifWGFmH0FXjy9RSq/ebPiwj4 X-Received: by 2002:a63:e116:: with SMTP id z22mr10687382pgh.223.1633354482685; Mon, 04 Oct 2021 06:34:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633354482; cv=none; d=google.com; s=arc-20160816; b=UVkOYRuslt8I9maZ5jx9ivF8+L3LESMI14Lo/bQe9ByKdM2njZWrlJqyRRgB90N0kq yAGXlICRU44em1xKhFeKrTUE5WAWCOQ82416Yr2iRSwYMas0/vT3xZ5f/vSa7m0r3dUj TFBacbAw8OseI5Be1qmbN0cC0BbjsVaIQ4IyA/RRnyOTlzI3sXLhe1hQQC2pkfcsyHE/ rLVKFNwSPU8GqibtLjUzqkY4BpUAPVg6sB+LIbzNItNLw/fU9BjniUTV2/Wx2LD+/4BX yZpmHa8m8vaJAblw7Q4sCUMBm8UutsIEY2GVSU7gY1vb8lCjWJdGNM/tUcpRpHA/eo/j dvLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=aZA+6+l9MfywJnOd3X6N1lKKLFzI9clzTJOKl1lhiu8=; b=nlIKY25b1Uy1r44igXiyJfetThHiUN13N6b2Q19pbdLs8QdwRU4S+xxeSfAFDw1u0F +fmuPpJIDOEGQFfDAoGmordq/Ek8MlfpXx2Dpj/ka8mldn0cLr+nkZLMSCp+Bo9zefNy W1T4ajyhsTLovDw4XdvGu7fGKW7xHR+gvUR3migGOKKSn/1lxq5+0QThr4UlHdQSBXcF rl8mfje4LP8QN+D2hKSvuqFgX3LRjLxjL8jn+ItwlyGP0+lqLeI/8unSWlQuwhwnhsrz UVVdTA5aprJiD9Pw8IG4W27KGCA4CbDq9YzsfLld8fXh76oXQzErX4vvuwEwQv7nkxqu Sa6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1oyajh23; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t66si6784174pfd.319.2021.10.04.06.34.42; Mon, 04 Oct 2021 06:34:42 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1oyajh23; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237295AbhJDNfO (ORCPT + 11 others); Mon, 4 Oct 2021 09:35:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:47266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237834AbhJDNdN (ORCPT ); Mon, 4 Oct 2021 09:33:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4AEA563220; Mon, 4 Oct 2021 13:14:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633353296; bh=mwrT3A4MSX4FPKmDvIrXw0wCmLdpaT9k1vmICzOY6mE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1oyajh23fW5W/iOjlkJc7rS7PiT4Mi4tz8IOobBG+0+7yxpaqo6lKn2WMcxD4yDDY oimTwcAPO8uSfVhIT7QxXzQmDGZubRc3CH6XyoNtdeEwwWFgz9NCPHLhde5u2G27zi cjxwQnIsJT38BUhD9hRxHxl8HjBjtTkINawkpPfs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shawn Guo , Bjorn Andersson , Georgi Djakov , Sasha Levin Subject: [PATCH 5.14 073/172] interconnect: qcom: sdm660: Fix id of slv_cnoc_mnoc_cfg Date: Mon, 4 Oct 2021 14:52:03 +0200 Message-Id: <20211004125047.354025989@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211004125044.945314266@linuxfoundation.org> References: <20211004125044.945314266@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shawn Guo [ Upstream commit a06c2e5c048e5e07fac9daf3073bd0b6582913c7 ] The id of slv_cnoc_mnoc_cfg node is mistakenly coded as id of slv_blsp_1. It causes the following warning on slv_blsp_1 node adding. Correct the id of slv_cnoc_mnoc_cfg node. [ 1.948180] ------------[ cut here ]------------ [ 1.954122] WARNING: CPU: 2 PID: 7 at drivers/interconnect/core.c:962 icc_node_add+0xe4/0xf8 [ 1.958994] Modules linked in: [ 1.967399] CPU: 2 PID: 7 Comm: kworker/u16:0 Not tainted 5.14.0-rc6-next-20210818 #21 [ 1.970275] Hardware name: Xiaomi Redmi Note 7 (DT) [ 1.978169] Workqueue: events_unbound deferred_probe_work_func [ 1.982945] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 1.988849] pc : icc_node_add+0xe4/0xf8 [ 1.995699] lr : qnoc_probe+0x350/0x438 [ 1.999519] sp : ffff80001008bb10 [ 2.003337] x29: ffff80001008bb10 x28: 000000000000001a x27: ffffb83ddc61ee28 [ 2.006818] x26: ffff2fe341d44080 x25: ffff2fe340f3aa80 x24: ffffb83ddc98f0e8 [ 2.013938] x23: 0000000000000024 x22: ffff2fe3408b7400 x21: 0000000000000000 [ 2.021054] x20: ffff2fe3408b7410 x19: ffff2fe341d44080 x18: 0000000000000010 [ 2.028173] x17: ffff2fe3bdd0aac0 x16: 0000000000000281 x15: ffff2fe3400f5528 [ 2.035290] x14: 000000000000013f x13: ffff2fe3400f5528 x12: 00000000ffffffea [ 2.042410] x11: ffffb83ddc9109d0 x10: ffffb83ddc8f8990 x9 : ffffb83ddc8f89e8 [ 2.049527] x8 : 0000000000017fe8 x7 : c0000000ffffefff x6 : 0000000000000001 [ 2.056645] x5 : 0000000000057fa8 x4 : 0000000000000000 x3 : ffffb83ddc9903b0 [ 2.063764] x2 : 1a1f6fde34d45500 x1 : ffff2fe340f3a880 x0 : ffff2fe340f3a880 [ 2.070882] Call trace: [ 2.077989] icc_node_add+0xe4/0xf8 [ 2.080247] qnoc_probe+0x350/0x438 [ 2.083718] platform_probe+0x68/0xd8 [ 2.087191] really_probe+0xb8/0x300 [ 2.091011] __driver_probe_device+0x78/0xe0 [ 2.094659] driver_probe_device+0x80/0x110 [ 2.098911] __device_attach_driver+0x90/0xe0 [ 2.102818] bus_for_each_drv+0x78/0xc8 [ 2.107331] __device_attach+0xf0/0x150 [ 2.110977] device_initial_probe+0x14/0x20 [ 2.114796] bus_probe_device+0x9c/0xa8 [ 2.118963] deferred_probe_work_func+0x88/0xc0 [ 2.122784] process_one_work+0x1a4/0x338 [ 2.127296] worker_thread+0x1f8/0x420 [ 2.131464] kthread+0x150/0x160 [ 2.135107] ret_from_fork+0x10/0x20 [ 2.138495] ---[ end trace 5eea8768cb620e87 ]--- Signed-off-by: Shawn Guo Reviewed-by: Bjorn Andersson Fixes: f80a1d414328 ("interconnect: qcom: Add SDM660 interconnect provider driver") Link: https://lore.kernel.org/r/20210823014003.31391-1-shawn.guo@linaro.org Signed-off-by: Georgi Djakov Signed-off-by: Sasha Levin --- drivers/interconnect/qcom/sdm660.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.33.0 diff --git a/drivers/interconnect/qcom/sdm660.c b/drivers/interconnect/qcom/sdm660.c index 632dbdd21915..ac13046537e8 100644 --- a/drivers/interconnect/qcom/sdm660.c +++ b/drivers/interconnect/qcom/sdm660.c @@ -307,7 +307,7 @@ DEFINE_QNODE(slv_bimc_cfg, SDM660_SLAVE_BIMC_CFG, 4, -1, 56, true, -1, 0, -1, 0) DEFINE_QNODE(slv_prng, SDM660_SLAVE_PRNG, 4, -1, 44, true, -1, 0, -1, 0); DEFINE_QNODE(slv_spdm, SDM660_SLAVE_SPDM, 4, -1, 60, true, -1, 0, -1, 0); DEFINE_QNODE(slv_qdss_cfg, SDM660_SLAVE_QDSS_CFG, 4, -1, 63, true, -1, 0, -1, 0); -DEFINE_QNODE(slv_cnoc_mnoc_cfg, SDM660_SLAVE_BLSP_1, 4, -1, 66, true, -1, 0, -1, SDM660_MASTER_CNOC_MNOC_CFG); +DEFINE_QNODE(slv_cnoc_mnoc_cfg, SDM660_SLAVE_CNOC_MNOC_CFG, 4, -1, 66, true, -1, 0, -1, SDM660_MASTER_CNOC_MNOC_CFG); DEFINE_QNODE(slv_snoc_cfg, SDM660_SLAVE_SNOC_CFG, 4, -1, 70, true, -1, 0, -1, 0); DEFINE_QNODE(slv_qm_cfg, SDM660_SLAVE_QM_CFG, 4, -1, 212, true, -1, 0, -1, 0); DEFINE_QNODE(slv_clk_ctl, SDM660_SLAVE_CLK_CTL, 4, -1, 47, true, -1, 0, -1, 0); From patchwork Mon Oct 4 12:52:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 515201 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp4356088wrs; Mon, 4 Oct 2021 06:34:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxATwB0+jbnFCzUv5CO1KniHUbY1HH6vMnMZbB2iO+7Qd38qCwPbOA//fKcxJPOFfl3+D5A X-Received: by 2002:a17:903:3014:b0:13e:95d6:a6d8 with SMTP id o20-20020a170903301400b0013e95d6a6d8mr13198213pla.69.1633354483356; Mon, 04 Oct 2021 06:34:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633354483; cv=none; d=google.com; s=arc-20160816; b=PVYsWQj8ppsnYVi8bCGa9IzD/gfNAhnyFi+4vNqBBt+1kGA4v4xCRuHoUMMdWJDYTz kZJlnpaVzph5O4OkaLmIvOAgrz/GDKk8Cvft1/8hrDtQZI3wfRD+OkR4cFjtCTofiEb/ nJ479g0D7gq+NpfbVwkfMrdRgiWYlA+eK8CijI75cVa8S3GXNlXsI+YnAJaPgnua0CvT grDombfzUduwyyqASBTXPwGdqQ8H3H3jUpNNCOx4kVlJEB8adgeq/wyAxwAEXQ1EeVVT w1L1vbPQsvsOhk+odXVYpberLyM45JyTKESusHbAthlZtIHQV0QP+rH+a2yDS7iVe75e /9gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pf8iLua/m7c85OG6i31tFw6D6gH8beRZZZrifxZEhjM=; b=l2MsYLwYeBdyxHY1itBJL4x4bOyxivB/KoIh8YlE8VYSstVNI4Q6BUB0zv9pKuGsxi I/tSb5JubOPiM1J7G0e0nat7N4YBry829jXqylK89APcST6+iVsrKykZeWoCdDEO4ZVV yUsWzOItG9uja7LeYLmXrRr9KbQBbtZpx4P41SBeUMji6N+UyjrFxNTuXSL5K9arZFun XISHuRYGfghbrMbCzZWyRIhcFjfaXruWJPkAURa3YPkmTjpaljWyzMtn5ePrytCU+Y1o /XTM0nt1wbs4+jiIevfPXb1+1Re1guhzxf/NvrhPEi6uJANpwS8yq22PRvI5IPfKUFVa HrQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hcfEsYaN; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t66si6784174pfd.319.2021.10.04.06.34.42; Mon, 04 Oct 2021 06:34:43 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hcfEsYaN; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237652AbhJDNfQ (ORCPT + 11 others); Mon, 4 Oct 2021 09:35:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:47278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237852AbhJDNdO (ORCPT ); Mon, 4 Oct 2021 09:33:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 06A5763225; Mon, 4 Oct 2021 13:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633353299; bh=ulfYhLnRGR0H4Tuf9IAqTsHD++vvs7/IV7lUakyRJRg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hcfEsYaN9WWlQDNNmk1/me7XxmC1cQ6B3rbtRevytRYSo2IN9EOwAP683tDIjWdnN QYXmV9vQcKwMcyDI4ovGTF3nx5FU1m3D4noUYnE88IEQVmtlC5BnmCJz0uQyp1nu1i 9inaJSm1EzMqygfOYIMMS8F1O/02E/xWP1YZVN2w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shawn Guo , Dmitry Baryshkov , AngeloGioacchino Del Regno , Georgi Djakov , Sasha Levin Subject: [PATCH 5.14 074/172] interconnect: qcom: sdm660: Correct NOC_QOS_PRIORITY shift and mask Date: Mon, 4 Oct 2021 14:52:04 +0200 Message-Id: <20211004125047.384345284@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211004125044.945314266@linuxfoundation.org> References: <20211004125044.945314266@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shawn Guo [ Upstream commit 5833c9b8766298e73c11766f9585d4ea4fa785ff ] The NOC_QOS_PRIORITY shift and mask do not match what vendor kernel defines [1]. Correct them per vendor kernel. As the result of NOC_QOS_PRIORITY_P0_SHIFT being 0, the definition can be dropped and regmap_update_bits() call on P0 can be simplified a bit. [1] https://source.codeaurora.org/quic/la/kernel/msm-4.4/tree/drivers/soc/qcom/msm_bus/msm_bus_noc_adhoc.c?h=LA.UM.8.2.r1-04800-sdm660.0#n37 Fixes: f80a1d414328 ("interconnect: qcom: Add SDM660 interconnect provider driver") Signed-off-by: Shawn Guo Reviewed-by: Dmitry Baryshkov Reviewed-by: AngeloGioacchino Del Regno Link: https://lore.kernel.org/r/20210902054915.28689-1-shawn.guo@linaro.org Signed-off-by: Georgi Djakov Signed-off-by: Sasha Levin --- drivers/interconnect/qcom/sdm660.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.33.0 diff --git a/drivers/interconnect/qcom/sdm660.c b/drivers/interconnect/qcom/sdm660.c index ac13046537e8..99eef7e2d326 100644 --- a/drivers/interconnect/qcom/sdm660.c +++ b/drivers/interconnect/qcom/sdm660.c @@ -44,9 +44,9 @@ #define NOC_PERM_MODE_BYPASS (1 << NOC_QOS_MODE_BYPASS) #define NOC_QOS_PRIORITYn_ADDR(n) (0x8 + (n * 0x1000)) -#define NOC_QOS_PRIORITY_MASK 0xf +#define NOC_QOS_PRIORITY_P1_MASK 0xc +#define NOC_QOS_PRIORITY_P0_MASK 0x3 #define NOC_QOS_PRIORITY_P1_SHIFT 0x2 -#define NOC_QOS_PRIORITY_P0_SHIFT 0x3 #define NOC_QOS_MODEn_ADDR(n) (0xc + (n * 0x1000)) #define NOC_QOS_MODEn_MASK 0x3 @@ -624,13 +624,12 @@ static int qcom_icc_noc_set_qos_priority(struct regmap *rmap, /* Must be updated one at a time, P1 first, P0 last */ val = qos->areq_prio << NOC_QOS_PRIORITY_P1_SHIFT; rc = regmap_update_bits(rmap, NOC_QOS_PRIORITYn_ADDR(qos->qos_port), - NOC_QOS_PRIORITY_MASK, val); + NOC_QOS_PRIORITY_P1_MASK, val); if (rc) return rc; - val = qos->prio_level << NOC_QOS_PRIORITY_P0_SHIFT; return regmap_update_bits(rmap, NOC_QOS_PRIORITYn_ADDR(qos->qos_port), - NOC_QOS_PRIORITY_MASK, val); + NOC_QOS_PRIORITY_P0_MASK, qos->prio_level); } static int qcom_icc_set_noc_qos(struct icc_node *src, u64 max_bw) From patchwork Mon Oct 4 12:52:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 515202 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp4358644wrs; Mon, 4 Oct 2021 06:37:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2jZbW1PHMlZrZzC27I8TDHoI1MPlUnLnrNXytM6BLXmQJri2bZTSn2oVLUvqFhKIpmcul X-Received: by 2002:a17:903:1cc:b0:13e:3a0f:b2ae with SMTP id e12-20020a17090301cc00b0013e3a0fb2aemr23323041plh.3.1633354637295; Mon, 04 Oct 2021 06:37:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633354637; cv=none; d=google.com; s=arc-20160816; b=svHDgw24eNli7sSrN6MgeYrs66m1yAXABLkBsI9X9EMbWPXpqm2NvPYQwgLqUVVuY/ MR+gJyE5x7X8/rdaI0RTOsB0yOCsvUDnWye8aE2ZsldQWLP3z+TQPuJI9msndvJwqPmo V50PHCE9SYvTXTcG8SeurySf11icSICUOYBjKb6XzH0epZvj/KViUtGOlIIGZK8j8rst CgaiJQ9FxpryTPWIfHiwoOx3qPPWLyxDfLYzkwXycgCJKgpFoSB7ShJfg7lFw9LLHuDE OPc3ECHhZuNdAfULPZtSsGTN37VeRIGkP+yMpx0CzNEnCQhBc08njrBwr7PqqlXw5fHW TGEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OZeXfyvaNhyqVWAnVs7UGSFaoP87xmOHskwb4UUgmDU=; b=aGN/UE/4+FXMcyGVDf9Z+mfa9txb6SvuJQNlZN5CY0bzWS1yXXFtk3lSDTd3oRq6FW 3G0h75lKPAwR6xb37vK1zsKHsLCOecQ7eBawZI2fwJEb3dnKbimtnyQs8YG76fg7phGm nguJC1ciEg+0ZACvzZ23otDJsuslrmke1vYPGbevwIeMvzGe8MezQawRv7ZFAvcY908Y FT/VT4OXIypIYJ8CdXu88eOjJbXrM1BH3xym39dfho1l227mdcqjtb9WYbvDCU/IpyJl V/9C5k0kTWtNrDXcLYI4d6/bSBDb/AL3Z16zIBnCfnzax2FNP+QvY0HLlRFOj3l7Pg5q pqVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yILEQddT; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u7si3114569plm.457.2021.10.04.06.37.17; Mon, 04 Oct 2021 06:37:17 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yILEQddT; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238082AbhJDNjB (ORCPT + 11 others); Mon, 4 Oct 2021 09:39:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:48650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238148AbhJDNh2 (ORCPT ); Mon, 4 Oct 2021 09:37:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6EDD36121F; Mon, 4 Oct 2021 13:16:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633353415; bh=ZO6zA9c8Lzwvtuu4Dipo711ge+UklH1aYIsTPUIsBKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yILEQddT1Zq8HIn/fU9T8qzyJqkbNXzmam7uwU5BwuWFu0UzIZFUdvIOs4EbtfCyU zr6FNgL3YBvsBCaWXJX5YM3lmSOUu08PYX/s3Shm9gNBpOmuf2lC6Lv1cLqbRe/BDj gfie/25RqchV48pNr5QgJ6tVV1Oo9GJ8K+yxgsOg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrew Lunn , Marek Vasut , Arnd Bergmann , "David S. Miller" , Sasha Levin Subject: [PATCH 5.14 119/172] net: ks8851: fix link error Date: Mon, 4 Oct 2021 14:52:49 +0200 Message-Id: <20211004125048.824493986@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211004125044.945314266@linuxfoundation.org> References: <20211004125044.945314266@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 51bb08dd04a05035a64504faa47651d36b0f3125 ] An object file cannot be built for both loadable module and built-in use at the same time: arm-linux-gnueabi-ld: drivers/net/ethernet/micrel/ks8851_common.o: in function `ks8851_probe_common': ks8851_common.c:(.text+0xf80): undefined reference to `__this_module' Change the ks8851_common code to be a standalone module instead, and use Makefile logic to ensure this is built-in if at least one of its two users is. Fixes: 797047f875b5 ("net: ks8851: Implement Parallel bus operations") Link: https://lore.kernel.org/netdev/20210125121937.3900988-1-arnd@kernel.org/ Reviewed-by: Andrew Lunn Acked-by: Marek Vasut Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/micrel/Makefile | 6 ++---- drivers/net/ethernet/micrel/ks8851_common.c | 8 ++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) -- 2.33.0 diff --git a/drivers/net/ethernet/micrel/Makefile b/drivers/net/ethernet/micrel/Makefile index 5cc00d22c708..6ecc4eb30e74 100644 --- a/drivers/net/ethernet/micrel/Makefile +++ b/drivers/net/ethernet/micrel/Makefile @@ -4,8 +4,6 @@ # obj-$(CONFIG_KS8842) += ks8842.o -obj-$(CONFIG_KS8851) += ks8851.o -ks8851-objs = ks8851_common.o ks8851_spi.o -obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o -ks8851_mll-objs = ks8851_common.o ks8851_par.o +obj-$(CONFIG_KS8851) += ks8851_common.o ks8851_spi.o +obj-$(CONFIG_KS8851_MLL) += ks8851_common.o ks8851_par.o obj-$(CONFIG_KSZ884X_PCI) += ksz884x.o diff --git a/drivers/net/ethernet/micrel/ks8851_common.c b/drivers/net/ethernet/micrel/ks8851_common.c index 831518466de2..0f9c5457b93e 100644 --- a/drivers/net/ethernet/micrel/ks8851_common.c +++ b/drivers/net/ethernet/micrel/ks8851_common.c @@ -1057,6 +1057,7 @@ int ks8851_suspend(struct device *dev) return 0; } +EXPORT_SYMBOL_GPL(ks8851_suspend); int ks8851_resume(struct device *dev) { @@ -1070,6 +1071,7 @@ int ks8851_resume(struct device *dev) return 0; } +EXPORT_SYMBOL_GPL(ks8851_resume); #endif static int ks8851_register_mdiobus(struct ks8851_net *ks, struct device *dev) @@ -1243,6 +1245,7 @@ int ks8851_probe_common(struct net_device *netdev, struct device *dev, err_reg_io: return ret; } +EXPORT_SYMBOL_GPL(ks8851_probe_common); int ks8851_remove_common(struct device *dev) { @@ -1261,3 +1264,8 @@ int ks8851_remove_common(struct device *dev) return 0; } +EXPORT_SYMBOL_GPL(ks8851_remove_common); + +MODULE_DESCRIPTION("KS8851 Network driver"); +MODULE_AUTHOR("Ben Dooks "); +MODULE_LICENSE("GPL");