From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34387C38145 for ; Thu, 8 Sep 2022 17:04:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229876AbiIHRE3 (ORCPT ); Thu, 8 Sep 2022 13:04:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230337AbiIHRE2 (ORCPT ); Thu, 8 Sep 2022 13:04:28 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40794A4 for ; Thu, 8 Sep 2022 10:04:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id EF339B82194 for ; Thu, 8 Sep 2022 17:04:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F92EC433D6; Thu, 8 Sep 2022 17:04:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662656659; bh=JcuBKPh1hKaZAB63GPEkC7n4VhxRuvoQ7awizA5vekU=; h=Subject:To:Cc:From:Date:From; b=DvUTCEE4TSrAReIiMPk2yDINHJUnVq2iVtqhYC7pSYf/U+AiTyhsqie3uffCnKhLR yQgVx1zr7RjcoyJdgkjH0uwCoovT4BrkjftFK6OFlpf/sD2SLm3+Nc2RIM8CyvXZoz l5Sh1F1Cc1cbK/UO5dbrwJyquXKrdg6s/ZfY285U= Subject: FAILED: patch "[PATCH] soc: fsl: select FSL_GUTS driver for DPIO" failed to apply to 5.4-stable tree To: matt@traverse.com.au, arnd@arndb.de, ioana.ciornei@nxp.com Cc: From: Date: Thu, 08 Sep 2022 19:04:28 +0200 Message-ID: <166265666812228@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Possible dependencies: 9a472613f5bc ("soc: fsl: select FSL_GUTS driver for DPIO") 69651bd8d303 ("soc: fsl: dpio: add Net DIM integration") ed1d2143fee5 ("soc: fsl: dpio: add support for irq coalescing per software portal") 2cf0b6fe9bd3 ("soc: fsl: dpio: extract the QBMAN clock frequency from the attributes") 3b2abda7d28c ("soc: fsl: dpio: Replace QMAN array mode with ring mode enqueue") b46fe745e4f6 ("soc: fsl: dpio: QMAN performance improvement with function pointer indirection") 9d98809711ae ("soc: fsl: dpio: Adding QMAN multiple enqueue interface") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 9a472613f5bccf1b36837423495ae592a9c5182f Mon Sep 17 00:00:00 2001 From: Mathew McBride Date: Thu, 1 Sep 2022 05:21:49 +0000 Subject: [PATCH] soc: fsl: select FSL_GUTS driver for DPIO The soc/fsl/dpio driver will perform a soc_device_match() to determine the optimal cache settings for a given CPU core. If FSL_GUTS is not enabled, this search will fail and the driver will not configure cache stashing for the given DPIO, and a string of "unknown SoC" messages will appear: fsl_mc_dpio dpio.7: unknown SoC version fsl_mc_dpio dpio.6: unknown SoC version fsl_mc_dpio dpio.5: unknown SoC version Fixes: 51da14e96e9b ("soc: fsl: dpio: configure cache stashing destination") Signed-off-by: Mathew McBride Reviewed-by: Ioana Ciornei Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20220901052149.23873-2-matt@traverse.com.au' Signed-off-by: Arnd Bergmann diff --git a/drivers/soc/fsl/Kconfig b/drivers/soc/fsl/Kconfig index 07d52cafbb31..fcec6ed83d5e 100644 --- a/drivers/soc/fsl/Kconfig +++ b/drivers/soc/fsl/Kconfig @@ -24,6 +24,7 @@ config FSL_MC_DPIO tristate "QorIQ DPAA2 DPIO driver" depends on FSL_MC_BUS select SOC_BUS + select FSL_GUTS select DIMLIB help Driver for the DPAA2 DPIO object. A DPIO provides queue and