From patchwork Fri Nov 4 20:52:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Thomson X-Patchwork-Id: 1699876 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=fastmail.com.au header.i=@fastmail.com.au header.a=rsa-sha256 header.s=fm3 header.b=EO6eOBOk; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=e9E70KT7; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4N3tCw6dVFz23m0 for ; Sat, 5 Nov 2022 07:54:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229798AbiKDUyd (ORCPT ); Fri, 4 Nov 2022 16:54:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229823AbiKDUya (ORCPT ); Fri, 4 Nov 2022 16:54:30 -0400 Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43DA11838E; Fri, 4 Nov 2022 13:54:28 -0700 (PDT) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id AC3BF5C009A; Fri, 4 Nov 2022 16:54:27 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 04 Nov 2022 16:54:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com.au; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1667595267; x= 1667681667; bh=lJsdPrNmT8+mD6s1iPhVQ7qYCLCp7h1cNeMluNK4XT4=; b=E O6eOBOkVKmYCBEl3HdGVUheKJcMVNMqYzWzy5OoM9/f421xFhaEPsDGf/FfYoleT 7COY6kt4OFxYjJibQB4KLrvM8CZk/hO5E1L40EIk0cKqU2N8SZYf+dvX8a5dbScz JZlF1KyLASTAtMIXvMXk2eCS/gSF+F3SdICdbNJ4PxtdCstb3IPO3rKc8oaNoomM TBA8OUhDTIKZjN9Hbty1K4YAno1OA1/zbMpVxsFnwyxAvLHP0Sy54VMVZvaaa/Wn 4f+ICKW77WDO7dduPDsPWzr/5RpyDeI0bziRHhtiy3g/9Elx2vQIrnCx/iAytstM 0oppi6LGjUm3pmdj5zFVg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667595267; x=1667681667; bh=lJsdPrNmT8+mD 6s1iPhVQ7qYCLCp7h1cNeMluNK4XT4=; b=e9E70KT7Ua6gQif8RAr7lQ1yJk4Xh wmbs5nxg48WLha1z/Yg0E+DgebkVhvuwPm/WlXnLQUZYBuJAbtyBnlI+eV6JlL1d qjyN4X0IqNrRhMFvIbKP+z1zIRtzYWMLzOFMUG4wme0lm1wS9KntQWzwkor4zvgg sQNKb60tUEmBUaULO7sPqordbnWztqG/FPNedCUNIM/I0/ryBDYTH2CvKb5+9Z2K fuFLx+YYsF8Hquhl+bSvahrc1RMNzEIaJFJtgdoPEJOjOUlA2T55vkYJyf+ELMXl BEbRHaRPrjWKlnZooyP/2sb6AnsWECNzIZP1Q7hGD2BdfNkYTD6qvL4JA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvddugddufeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheplfhohhhn ucfvhhhomhhsohhnuceoghhithesjhhohhhnthhhohhmshhonhdrfhgrshhtmhgrihhlrd gtohhmrdgruheqnecuggftrfgrthhtvghrnhepffetgedttdefvddvhfeifedvvdeuveeg hedvieffudegudduudehudfhjeekhfevnecuffhomhgrihhnpehkvghrnhgvlhdrohhrgh enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgihht sehjohhhnhhthhhomhhsohhnrdhfrghsthhmrghilhdrtghomhdrrghu X-ME-Proxy: Feedback-ID: ic081425d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 4 Nov 2022 16:54:23 -0400 (EDT) From: John Thomson To: Sergio Paracuellos , Kishon Vijay Abraham I , Vinod Koul , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Bjorn Helgaas , Greg Kroah-Hartman , =?utf-8?b?QXLEsW7DpyDDnE5B?= =?utf-8?b?TA==?= Cc: linux-phy@lists.infradead.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, John Thomson Subject: [PATCH 1/2] phy: ralink: mt7621-pci: add sentinel to quirks table Date: Sat, 5 Nov 2022 06:52:41 +1000 Message-Id: <20221104205242.3440388-2-git@johnthomson.fastmail.com.au> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221104205242.3440388-1-git@johnthomson.fastmail.com.au> References: <20221104205242.3440388-1-git@johnthomson.fastmail.com.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org With mt7621 soc_dev_attr fixed to register the soc as a device, kernel will experience an oops in soc_device_match_attr This quirk test was introduced in the staging driver in commit 9445ccb3714c ("staging: mt7621-pci-phy: add quirks for 'E2' revision using 'soc_device_attribute'"). The staging driver was removed, and later re-added in commit d87da32372a0 ("phy: ralink: Add PHY driver for MT7621 PCIe PHY") for kernel 5.11 Link: https://lore.kernel.org/lkml/26ebbed1-0fe9-4af9-8466-65f841d0b382@app.fastmail.com Fixes: d87da32372a0 ("phy: ralink: Add PHY driver for MT7621 PCIe PHY") Signed-off-by: John Thomson Acked-by: Sergio Paracuellos --- drivers/phy/ralink/phy-mt7621-pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/phy/ralink/phy-mt7621-pci.c b/drivers/phy/ralink/phy-mt7621-pci.c index 5e6530f545b5..85888ab2d307 100644 --- a/drivers/phy/ralink/phy-mt7621-pci.c +++ b/drivers/phy/ralink/phy-mt7621-pci.c @@ -280,7 +280,8 @@ static struct phy *mt7621_pcie_phy_of_xlate(struct device *dev, } static const struct soc_device_attribute mt7621_pci_quirks_match[] = { - { .soc_id = "mt7621", .revision = "E2" } + { .soc_id = "mt7621", .revision = "E2" }, + { /* sentinel */ } }; static const struct regmap_config mt7621_pci_phy_regmap_config = { From patchwork Fri Nov 4 20:52:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Thomson X-Patchwork-Id: 1699878 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=fastmail.com.au header.i=@fastmail.com.au header.a=rsa-sha256 header.s=fm3 header.b=L2f4gb2o; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=WNmqNv+a; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4N3tD43PM2z23lK for ; Sat, 5 Nov 2022 07:54:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230040AbiKDUyl (ORCPT ); Fri, 4 Nov 2022 16:54:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229679AbiKDUyd (ORCPT ); Fri, 4 Nov 2022 16:54:33 -0400 Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C26A349B51; Fri, 4 Nov 2022 13:54:32 -0700 (PDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 218235C0084; Fri, 4 Nov 2022 16:54:32 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 04 Nov 2022 16:54:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com.au; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1667595272; x= 1667681672; bh=0tAgYqAZ0GRyXkSILb2k0x36R1r8N/5tLN/RnkJr5rU=; b=L 2f4gb2oC4O/VvGuAYuuOHLmH8l28Hn9R97GVgq+71qIr6yM0Px5S7kAJZxnc8Gg7 yLLio6qc+UQqme0nRewruSuSR4/DJiEsgVMy0AlCEmmbvK3sKJRmCP8p0HYwpmZ4 iEpEW2M7vLrD0l9f6HxvwkHICGYRk/jhOpgplm0U0FvXlaWONjuKQ4VayLg5tiTl N/YliTqxVnOCGUF+ucP0S6Z7h75WfNiz9Xu4tDzI8XILWsVs5LQZsscbnV9tx1o9 UUFGONw9MvXrncYo6fXaI2sDgT8Evg1FkDvRWPcnhCUOf3+jF3NxniPFrNh6w0Wl yJ0tHDSYH+Zg8xELaWp2w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667595272; x=1667681672; bh=0tAgYqAZ0GRyX kSILb2k0x36R1r8N/5tLN/RnkJr5rU=; b=WNmqNv+arquC2jp0bIIQ+4kgvLkJ6 oQv2fpGoF4uG53d4zgQFUkKnDjmCUuFdpkEc4pZTqziBRHKDx65zSarlqNzHetr0 9jCcQi1FN1vuM0L5fZO2dxJUotqsvqKwW29e+/b6+cim1xN8B4QgfW5zEDgKEP2Y oALaijUyLsu4DsNhelL3ohRNoPC8yFvN/ZFhJq0rxay6qox07D37qV1pNo1m8i4s 9Z0NHEtePc4IxvAqWMB8iJsqmrKnF8lC2ZgHMMDMXivllnB39lDFhETVAItlpVru 06Pdtpls67h/ffHwMpH0qip2JZ9DisHTTf7mCqgLeOeSHxigwQd8Y79Uw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvddugddugedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheplfhohhhn ucfvhhhomhhsohhnuceoghhithesjhhohhhnthhhohhmshhonhdrfhgrshhtmhgrihhlrd gtohhmrdgruheqnecuggftrfgrthhtvghrnhepffetgedttdefvddvhfeifedvvdeuveeg hedvieffudegudduudehudfhjeekhfevnecuffhomhgrihhnpehkvghrnhgvlhdrohhrgh enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgihht sehjohhhnhhthhhomhhsohhnrdhfrghsthhmrghilhdrtghomhdrrghu X-ME-Proxy: Feedback-ID: ic081425d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 4 Nov 2022 16:54:27 -0400 (EDT) From: John Thomson To: Sergio Paracuellos , Kishon Vijay Abraham I , Vinod Koul , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Bjorn Helgaas , Greg Kroah-Hartman , =?utf-8?b?QXLEsW7DpyDDnE5B?= =?utf-8?b?TA==?= Cc: linux-phy@lists.infradead.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, John Thomson Subject: [PATCH 2/2] PCI: mt7621: add sentinel to quirks table Date: Sat, 5 Nov 2022 06:52:42 +1000 Message-Id: <20221104205242.3440388-3-git@johnthomson.fastmail.com.au> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221104205242.3440388-1-git@johnthomson.fastmail.com.au> References: <20221104205242.3440388-1-git@johnthomson.fastmail.com.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org With mt7621 soc_dev_attr fixed to register the soc as a device, kernel will experience an oops in soc_device_match_attr This quirk test was introduced in the staging driver in commit b483b4e4d3f6 ("staging: mt7621-pci: add quirks for 'E2' revision using 'soc_device_attribute'"), and the staging driver was moved in commit 2bdd5238e756 ("PCI: mt7621: Add MediaTek MT7621 PCIe host controller driver") for the 5.16 kernel Link: https://lore.kernel.org/lkml/26ebbed1-0fe9-4af9-8466-65f841d0b382@app.fastmail.com Fixes: b483b4e4d3f6 ("staging: mt7621-pci: add quirks for 'E2' revision using 'soc_device_attribute'") Signed-off-by: John Thomson Acked-by: Sergio Paracuellos --- drivers/pci/controller/pcie-mt7621.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-mt7621.c b/drivers/pci/controller/pcie-mt7621.c index 4bd1abf26008..ee7aad09d627 100644 --- a/drivers/pci/controller/pcie-mt7621.c +++ b/drivers/pci/controller/pcie-mt7621.c @@ -466,7 +466,8 @@ static int mt7621_pcie_register_host(struct pci_host_bridge *host) } static const struct soc_device_attribute mt7621_pcie_quirks_match[] = { - { .soc_id = "mt7621", .revision = "E2" } + { .soc_id = "mt7621", .revision = "E2" }, + { /* sentinel */ } }; static int mt7621_pcie_probe(struct platform_device *pdev)