From patchwork Mon May 22 14:59:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 13250728 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9B4CFC77B73 for ; Mon, 22 May 2023 15:00:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=h+NQrukIXJLy8ILFXjWvrUQbyjGgqBLawzTSGKHeHYE=; b=hA1D/1AfKqyTtx /uzNTin83efis54XKy3MjSNVSurDZl5sG5UpdjNYy8t+uw6PlZGlhjQ2RvaXZKM0kibzvYCmlmzzx +NjEuFUdl8rGqYGqm0GfKDYljMtBdFqEjJqgcyt2YFgKMUhIq89dUBmyxR9rW9iS9/vNuvkAv7ViB gKUHR4kKel6Ozoo5ivIXr95xsX3epSyuCaycdwZ/5roDEA8OHquer+heiZby845cVgjGxQGR8DdFr SWCmeZEQuxIQfw1ZnohsoODFQBU83ayM+WRdGVEcAhDguVOAXrAyXEztAhgeJ2i9KseonGr4u8KKc qjug8dRupEuV/nzkOBjw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q171K-006vOC-2o; Mon, 22 May 2023 15:00:22 +0000 Received: from mail-dm6nam11on20629.outbound.protection.outlook.com ([2a01:111:f400:7eaa::629] helo=NAM11-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q1715-006vFz-2Z for linux-arm-kernel@lists.infradead.org; Mon, 22 May 2023 15:00:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J/gikopee53XcwMYA3MYtO2laOjKUiSGLw1KeCxVXHaJrUp977mmN+gOsCCiU9C4fbIxqLgLJp6IitgvXqpCBDQcHzkvXd9ZEVYbJVyUrCQHJVPUHTYYjc7hgWX/gs9eZfR756prFz16wRB05x2WcYT4WNefcmkBZF2K9SUGshCVmegxgGw64yoNHk+LhUSk5bDZPdoILMFDoNGsyUcIHGigDTK7xkLBqT/g0B8mSiGWZaeHyZD5Bnz9PH6zchurULjvObL2q5zRM7SzdHtFBrL1lwZN0MzE1DzmFUUNBoOeQ4fD4QCVt55EMANvS1eRYQu0BNe9LZNukjAM9sFHkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ydAb1yU6hNZ3Rl+t8PAUQ74+pAfq9e0yNJ5JoGRMUok=; b=S3UYWZRwuRSmEXPGV68qxc5pqILFTxtinQ9RmSAC4pD6aLsRIg6ltQTq85WdNm0yNb+XdVIKJtZWBgC3IV+t4Qxay4rVEWXka7bP9fVwtiPZUwiu2pcbxSGwl8z2CsQnVDl5bdtALBViWNbcr1o6pmgVMy42Lmd98Jst/YLlslfbfXkTBgyj//RbhQGy0/cddhpKU32oRYjSsMT+EMGTBH1oHAwPPoI5UttvTq+CCcVAWngTS27ufTRWNXwqjAVcyZ7l9qxi3p4rbwSIZRAJSYlKfnH+CMajo3HMsH7PxyjbeQoCTRizZOdLq0NaFYXjvb9fcST+7hBp7sy5gToH3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ydAb1yU6hNZ3Rl+t8PAUQ74+pAfq9e0yNJ5JoGRMUok=; b=FOW1J2NNMRY9CTA9UDjoVG6wE6tSDzOcTmlrR8kMYX1x99MazIp7ZOJaCKeDDQ6bqsg9I9qwM79agNj9LxEaZjq511XM3tj1c99KffVSrsaXWBmXne5nSO4kXTnSLXEbeYEAQKwsDCsc9tR/yNyWavbGLuNs3QI1HQcYprLLKYo= Received: from DM6PR03CA0030.namprd03.prod.outlook.com (2603:10b6:5:40::43) by SJ2PR12MB7822.namprd12.prod.outlook.com (2603:10b6:a03:4ca::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28; Mon, 22 May 2023 15:00:02 +0000 Received: from DM6NAM11FT089.eop-nam11.prod.protection.outlook.com (2603:10b6:5:40:cafe::56) by DM6PR03CA0030.outlook.office365.com (2603:10b6:5:40::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28 via Frontend Transport; Mon, 22 May 2023 15:00:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT089.mail.protection.outlook.com (10.13.173.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6411.28 via Frontend Transport; Mon, 22 May 2023 15:00:02 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 22 May 2023 09:59:59 -0500 From: Michal Simek To: , , , CC: Amit Kumar Mahapatra , Ashok Reddy Soma , Conor Dooley , "Krzysztof Kozlowski" , Laurent Pinchart , Parth Gajjar , "Rob Herring" , Vishal Sagar , , Subject: [PATCH v2 1/6] arm64: zynqmp: Describe TI phy as ethernet-phy-id Date: Mon, 22 May 2023 16:59:48 +0200 Message-ID: X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=9210; i=michal.simek@amd.com; h=from:subject:message-id; bh=ooOFZq7YpwQIOB8aQx8w/uikgHqfOBfWzAkbMGmFRAs=; b=owGbwMvMwCR4yjP1tKYXjyLjabUkhpTs5tiyacGf/de+3PEhyUmmecmWfQum2hw515Q3P5fL7 L30BzHVjlgWBkEmBlkxRRZpmytn9lbOmCJ88bAczBxWJpAhDFycAjAROxmG+aU6935JP0x/uXHF +vc2uy6vDXru9p9hfupRFv40z1Cue8L8jExdq4WbVJvuAwA= X-Developer-Key: i=michal.simek@amd.com; a=openpgp; fpr=67350C9BF5CCEE9B5364356A377C7F21FE3D1F91 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT089:EE_|SJ2PR12MB7822:EE_ X-MS-Office365-Filtering-Correlation-Id: f99d787e-309e-46b9-cee5-08db5ad53839 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QCUCX4p1qePh+rftDEedoQHKm9AcD2ExGiDaUyc8KMvlU8cBsDh5xP7gIeUSNWEbSgT+laGFDabZYPIKgRCGy2/fV/ORcBVRtkJESVKHKYSkNQABGsc+LtjaPgNtbY/x0LZAB8fJiPtTZkQVtegWyTZsydSr8CJlWuUNEGYkb0YGvPGtijivtEm7SZnJWgUGzp70xWlMhhm+Ey2vLr2w22ZityW0rtHDtuS3UXfGHfCn0FLwSJQSpD2auU112B4pKh5AhQtKzhtXjP2xClKFOrSl2EK09ZKu8I2zolMFYjO3uRT13is9dEbM/6NvppKiKit6IQzlhLq5xoy1+RyzuXOgcfeLhzaZ+F/WnwQaLVBOvVtNOWOG0lwgzx1m79yHRKv5DFiKHBYNuqrkUFct2X6rKjY5ymkCidjBJ/W34E+fNqBQkPZ8IALhoooOSDka9zPw2vd4EbjVEHVUrujWEXPV/T+7UHp1eD0jw9QmsxU4z/lbtFYsgUPZjJPSOaZUyI1wVstnZTJnUYQpLetksmosUunLEjFEG7KIrCL9HMv5PBSUAIDCduiKlstWrdKYfDX/IIvuc471chiq7nMc4pPeNEDE1V2iz+DWTPr9Tbzx1Symona1P7Y9z1xBrECQsFiWvJkUpg0qt7ZcIiAE/mSwJLatvPeSgLqblYX1+ulfHt5AXANyTHF0+U8HGvCWbzuppDNZoHCi3jRmOd0EwlUD1rz8Ao6SV2LC/EXY0pJ35+ctQZbz/GZl3zRbUnqW4W90kDUM5I8tP1L9JvnhWxmuChYwpNpB7Xh+HrKxnxE= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(376002)(39860400002)(136003)(346002)(396003)(451199021)(46966006)(36840700001)(40470700004)(478600001)(82740400003)(356005)(81166007)(82310400005)(4326008)(70586007)(70206006)(110136005)(54906003)(6666004)(36860700001)(83380400001)(47076005)(316002)(41300700001)(336012)(426003)(40460700003)(2616005)(40480700001)(86362001)(8936002)(5660300002)(8676002)(36756003)(16526019)(7416002)(186003)(44832011)(2906002)(26005)(2101003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 15:00:02.0122 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f99d787e-309e-46b9-cee5-08db5ad53839 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT089.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7822 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230522_080007_890745_601EA3DA X-CRM114-Status: GOOD ( 16.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org TI DP83867 is using strapping based on MIO pins. Tristate setup can influence PHY address. That's why switch description with ethernet-phy-id compatible string which enable calling reset. PHY itself setups phy address after power up or reset. Phy reset is done via gpio. Signed-off-by: Michal Simek --- Changes in v2: - fix typo in commit message Checkpatch is reporting issue warning: DT compatible string "ethernet-phy-id2000.a231" appears un-documented but it should be fully aligned with Documentation/devicetree/bindings/net/ethernet-phy.yaml c&p more details from v1 version: Phy has some pins which is using for strapping for phy address after phy reset or power on. Pretty much it is resistor array which based on datasheet is decoded to certain phy address. And because some phy pins are also used as data pin for RGMII they are connected via MIO pins on a silicon. That's why IO block output setting really matter here because it changes resistor array and it moves phy address. That's why there is a need to do proper IO pin setup and after it call phy reset to get it to address which was decided by PCB designer. --- .../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 23 +++++++++++------ .../boot/dts/xilinx/zynqmp-zcu102-revB.dts | 25 +++++++++++-------- .../boot/dts/xilinx/zynqmp-zcu104-revA.dts | 22 ++++++++++------ .../boot/dts/xilinx/zynqmp-zcu104-revC.dts | 22 ++++++++++------ .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 22 ++++++++++------ .../boot/dts/xilinx/zynqmp-zcu111-revA.dts | 22 ++++++++++------ 6 files changed, 90 insertions(+), 46 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts index 230ef94d5dcb..f36353a51863 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts @@ -2,7 +2,8 @@ /* * dts file for Xilinx ZynqMP ZCU102 RevA * - * (C) Copyright 2015 - 2021, Xilinx, Inc. + * (C) Copyright 2015 - 2022, Xilinx, Inc. + * (C) Copyright 2022 - 2023, Advanced Micro Devices, Inc. * * Michal Simek */ @@ -200,13 +201,19 @@ &gem3 { phy-mode = "rgmii-id"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gem3_default>; - phy0: ethernet-phy@21 { - reg = <21>; - ti,rx-internal-delay = <0x8>; - ti,tx-internal-delay = <0xa>; - ti,fifo-depth = <0x1>; - ti,dp83867-rxctrl-strap-quirk; - /* reset-gpios = <&tca6416_u97 6 GPIO_ACTIVE_LOW>; */ + mdio: mdio { + #address-cells = <1>; + #size-cells = <0>; + phy0: ethernet-phy@21 { + #phy-cells = <1>; + compatible = "ethernet-phy-id2000.a231"; + reg = <21>; + ti,rx-internal-delay = <0x8>; + ti,tx-internal-delay = <0xa>; + ti,fifo-depth = <0x1>; + ti,dp83867-rxctrl-strap-quirk; + reset-gpios = <&tca6416_u97 6 GPIO_ACTIVE_LOW>; + }; }; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts index 63419deb5b33..3c28130909bc 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts @@ -2,7 +2,8 @@ /* * dts file for Xilinx ZynqMP ZCU102 RevB * - * (C) Copyright 2016 - 2021, Xilinx, Inc. + * (C) Copyright 2016 - 2022, Xilinx, Inc. + * (C) Copyright 2022 - 2023, Advanced Micro Devices, Inc. * * Michal Simek */ @@ -16,16 +17,20 @@ / { &gem3 { phy-handle = <&phyc>; - phyc: ethernet-phy@c { - reg = <0xc>; - ti,rx-internal-delay = <0x8>; - ti,tx-internal-delay = <0xa>; - ti,fifo-depth = <0x1>; - ti,dp83867-rxctrl-strap-quirk; - /* reset-gpios = <&tca6416_u97 6 GPIO_ACTIVE_LOW>; */ + mdio: mdio { + phyc: ethernet-phy@c { + #phy-cells = <0x1>; + compatible = "ethernet-phy-id2000.a231"; + reg = <0xc>; + ti,rx-internal-delay = <0x8>; + ti,tx-internal-delay = <0xa>; + ti,fifo-depth = <0x1>; + ti,dp83867-rxctrl-strap-quirk; + reset-gpios = <&tca6416_u97 6 GPIO_ACTIVE_LOW>; + }; + /* Cleanup from RevA */ + /delete-node/ ethernet-phy@21; }; - /* Cleanup from RevA */ - /delete-node/ ethernet-phy@21; }; /* Fix collision with u61 */ diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts index d178a4f898c9..3fd47725c2c8 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts @@ -2,7 +2,8 @@ /* * dts file for Xilinx ZynqMP ZCU104 * - * (C) Copyright 2017 - 2021, Xilinx, Inc. + * (C) Copyright 2017 - 2022, Xilinx, Inc. + * (C) Copyright 2022 - 2023, Advanced Micro Devices, Inc. * * Michal Simek */ @@ -109,12 +110,19 @@ &gem3 { phy-mode = "rgmii-id"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gem3_default>; - phy0: ethernet-phy@c { - reg = <0xc>; - ti,rx-internal-delay = <0x8>; - ti,tx-internal-delay = <0xa>; - ti,fifo-depth = <0x1>; - ti,dp83867-rxctrl-strap-quirk; + mdio: mdio { + #address-cells = <1>; + #size-cells = <0>; + phy0: ethernet-phy@c { + #phy-cells = <1>; + compatible = "ethernet-phy-id2000.a231"; + reg = <0xc>; + ti,rx-internal-delay = <0x8>; + ti,tx-internal-delay = <0xa>; + ti,fifo-depth = <0x1>; + ti,dp83867-rxctrl-strap-quirk; + reset-gpios = <&tca6416_u97 6 GPIO_ACTIVE_LOW>; + }; }; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts index 38b11594c074..4f6429caecff 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts @@ -2,7 +2,8 @@ /* * dts file for Xilinx ZynqMP ZCU104 * - * (C) Copyright 2017 - 2021, Xilinx, Inc. + * (C) Copyright 2017 - 2022, Xilinx, Inc. + * (C) Copyright 2022 - 2023, Advanced Micro Devices, Inc. * * Michal Simek */ @@ -114,12 +115,19 @@ &gem3 { phy-mode = "rgmii-id"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gem3_default>; - phy0: ethernet-phy@c { - reg = <0xc>; - ti,rx-internal-delay = <0x8>; - ti,tx-internal-delay = <0xa>; - ti,fifo-depth = <0x1>; - ti,dp83867-rxctrl-strap-quirk; + mdio: mdio { + #address-cells = <1>; + #size-cells = <0>; + phy0: ethernet-phy@c { + #phy-cells = <1>; + compatible = "ethernet-phy-id2000.a231"; + reg = <0xc>; + ti,rx-internal-delay = <0x8>; + ti,tx-internal-delay = <0xa>; + ti,fifo-depth = <0x1>; + ti,dp83867-rxctrl-strap-quirk; + reset-gpios = <&tca6416_u97 6 GPIO_ACTIVE_LOW>; + }; }; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts index 8af0879806cf..8c3fa3fe28d5 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts @@ -2,7 +2,8 @@ /* * dts file for Xilinx ZynqMP ZCU106 * - * (C) Copyright 2016 - 2021, Xilinx, Inc. + * (C) Copyright 2016 - 2022, Xilinx, Inc. + * (C) Copyright 2022 - 2023, Advanced Micro Devices, Inc. * * Michal Simek */ @@ -212,12 +213,19 @@ &gem3 { phy-mode = "rgmii-id"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gem3_default>; - phy0: ethernet-phy@c { - reg = <0xc>; - ti,rx-internal-delay = <0x8>; - ti,tx-internal-delay = <0xa>; - ti,fifo-depth = <0x1>; - ti,dp83867-rxctrl-strap-quirk; + mdio: mdio { + #address-cells = <1>; + #size-cells = <0>; + phy0: ethernet-phy@c { + #phy-cells = <1>; + reg = <0xc>; + compatible = "ethernet-phy-id2000.a231"; + ti,rx-internal-delay = <0x8>; + ti,tx-internal-delay = <0xa>; + ti,fifo-depth = <0x1>; + ti,dp83867-rxctrl-strap-quirk; + reset-gpios = <&tca6416_u97 6 GPIO_ACTIVE_LOW>; + }; }; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts index f76687914e30..0d9b6081dff6 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts @@ -2,7 +2,8 @@ /* * dts file for Xilinx ZynqMP ZCU111 * - * (C) Copyright 2017 - 2021, Xilinx, Inc. + * (C) Copyright 2017 - 2022, Xilinx, Inc. + * (C) Copyright 2022 - 2023, Advanced Micro Devices, Inc. * * Michal Simek */ @@ -172,12 +173,19 @@ &gem3 { phy-mode = "rgmii-id"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gem3_default>; - phy0: ethernet-phy@c { - reg = <0xc>; - ti,rx-internal-delay = <0x8>; - ti,tx-internal-delay = <0xa>; - ti,fifo-depth = <0x1>; - ti,dp83867-rxctrl-strap-quirk; + mdio: mdio { + #address-cells = <1>; + #size-cells = <0>; + phy0: ethernet-phy@c { + #phy-cells = <1>; + compatible = "ethernet-phy-id2000.a231"; + reg = <0xc>; + ti,rx-internal-delay = <0x8>; + ti,tx-internal-delay = <0xa>; + ti,fifo-depth = <0x1>; + ti,dp83867-rxctrl-strap-quirk; + reset-gpios = <&tca6416_u22 6 GPIO_ACTIVE_LOW>; + }; }; }; From patchwork Mon May 22 14:59:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 13250729 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0FAF6C7EE23 for ; Mon, 22 May 2023 15:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=33uOCKh4iSYd69Jvx/fcObfN0O/+QPSe1b+eI95KGlM=; b=Zww99y/F1tf74K +ItkCL6o+DCPQAHr5KMLby8LJE0YJBx5eOnt7Bz2IMb6ZWlk9xqMLBpxgGyz0b0KHSQ93KykWrRad XgzJHMKhekzE0LD4rgI1z1Uhqx7uNIFbiXSa9D/9zvtf5sANYNSbevhlR44LtR9nM3zVgoT8a62ir 3zo+K2pu8/TMN1zON8rStkQwNTJ0qpXgDZd37cFMi+XlT7NKlWZ9xtDDhXnBvU8LmTplN+BGcui77 SuUqxI+MffOZHyNPXJH881jY0a592497hq15yv2QWjJ/XKqtMa+/iIghkQkmkj4rKckSX6xaZzx4i SqQR5CKkwdKna703yHtQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q171i-006vYZ-1M; Mon, 22 May 2023 15:00:46 +0000 Received: from mail-bn7nam10on20608.outbound.protection.outlook.com ([2a01:111:f400:7e8a::608] helo=NAM10-BN7-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q171b-006vVB-0J for linux-arm-kernel@lists.infradead.org; Mon, 22 May 2023 15:00:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YR4EduzzCXd+3c3E4dVx6jvoPfg0nz070CWRYAjYqI1mJf7+ptaCjZC3E9wl5C7T0/S9+iFXW0dherTIt0TpmhRltCEsZ7LKfPWBEm4wtDRYl1R1cFvqW5cL2u3dah5Z2bfY5n21GIHOlZgFXTyqIBun7xC4vH3u3wORcDQbxFYC2VTPd403Y/dTsAJ7qqeruJxrT9JsBbYm3pkxJo3Uykw8IgGJgBgbm/vRS6k1MuoFQihu1rrgH6dIVzF6nIxNbXjgeL/VmAd7nOzOkfXYNv6J4vlAEb7dPPwenaEcgmf6KuKcpyJKs0uWqpUToFTfAgUUqJjZ3TvrIrkraGq2SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=H5xxkIE+0PsjxjPeqIke+kwynWeRhOGsor6pn9SPPKc=; b=ciTh4wuqWIkXUPsvsW9Iu9CIYIrsgiWrbsa2g4vOnSZ/eONaNhSl2sVb0K+Pr5SFziD1qZFa+6brTUuRhN1scBkMRbZs0IUH559aKE6SyJlv4eCwJ/VPcL2dG2l7yM9rllIoU2/J8x5BkrCV/GAwjltbY6iimjIkOTJCvjZKEzh328mA0Dq8HanWUwCnGyQF6Smk6ApYfq34YPY1OeRPhfVWdc09Pjm2T1oUEWFboYeuWFUKUip5bta+ZJis4JjTxuHKPe064nic0XtHqpbHJLMb6sZn0unR6/RVxUtw8+1B9fqrIkK+J82IwPlB34vJ1vLqDvDP6aYUvtWDfkO9gg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H5xxkIE+0PsjxjPeqIke+kwynWeRhOGsor6pn9SPPKc=; b=mCSyR5o+CIPDCWaQoaOnGiMudMuf6ek8oQow6egSmdGrJJ77WH3LZMxx/oO6EQiUyCuNb4gFxkxa25yu935ab8qmIfYodHtgb+tYfppqvjebzowhjYCEj99whSR/0ESMETCJ3zKRuSGfJpMmj9bsQNnLtnT5Subixs+ZViOgWT0= Received: from DM6PR01CA0013.prod.exchangelabs.com (2603:10b6:5:296::18) by PH8PR12MB7135.namprd12.prod.outlook.com (2603:10b6:510:22c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28; Mon, 22 May 2023 15:00:33 +0000 Received: from DM6NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:5:296:cafe::6d) by DM6PR01CA0013.outlook.office365.com (2603:10b6:5:296::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28 via Frontend Transport; Mon, 22 May 2023 15:00:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT022.mail.protection.outlook.com (10.13.172.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6411.28 via Frontend Transport; Mon, 22 May 2023 15:00:33 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 22 May 2023 10:00:04 -0500 From: Michal Simek To: , , , CC: Ashok Reddy Soma , Amit Kumar Mahapatra , Andrew Davis , Conor Dooley , Geert Uytterhoeven , Krzysztof Kozlowski , Laurent Pinchart , Parth Gajjar , Piyush Mehta , Rob Herring , Vishal Sagar , , Subject: [PATCH v2 2/6] arm64: zynqmp: Fix usb node drive strength and slew rate Date: Mon, 22 May 2023 16:59:49 +0200 Message-ID: <379071f44ceb27a0e32d74e13221640922d989d1.1684767562.git.michal.simek@amd.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=11776; i=michal.simek@amd.com; h=from:subject:message-id; bh=pjfGwPXePTSmdNFAJcJP1UsFe4kDeFZQq1LM3U0sbro=; b=owGbwMvMwCR4yjP1tKYXjyLjabUkhpTs5riEPfovQoO2Z/1iabH6dtJilsefOQlMq9fej374M ryJMWh2RywLgyATg6yYIou0zZUzeytnTBG+eFgOZg4rE8gQBi5OAZjIrESG2eyhC15oXo2/IROk 9V3KmjFT8eENA4YFLedkdqo77JbTPTdnVpH0Q+vw+vkWAA== X-Developer-Key: i=michal.simek@amd.com; a=openpgp; fpr=67350C9BF5CCEE9B5364356A377C7F21FE3D1F91 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT022:EE_|PH8PR12MB7135:EE_ X-MS-Office365-Filtering-Correlation-Id: d8f3adb9-957a-4990-f6b4-08db5ad54ac2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /nqTgQZmbe0ieHHC0YjtxH6O89QH8Wtrlz4QiQC7S+XW90DnLXt5tB0QDnjyqS/eV7BJrtRtmVgRFgNPApFMsg4f1wuDsp4TKOoXOxj4ZbKdpWlwtYU3h10Z8H695lfTsrX93lyciB07uBZoqqrdfVpMfCLDKNKKmnqXtjOxBKA4pt07VJslJin6yjMuXOqYgclIPPFaX0GOlyPt4VmP0GKglNOng2auZP+fvtfQyS3PSj7NwsjyBLlFGgqdKV26Rm9J/zmfaJ8uAvgKPmsQ9EfWnc3Si/3oVRDwc/NQ8UHqSzJS6kzovJf/9NX3krlupQVq8TJuC6xSmIWd+LM/T1fsdOEi6mhtcwtNarUYay8uAbWsFiGwDwRKZH8PyYGDPg05gMxlvCkVEc7DsVJ57KTrZzXuyfdoaKumjpFa3PeE9mhkx/RMCh07h0hz8DGcdZqXkcSoe7+pW4QUHWJ/6dwobVkvb9IDt0sOKJFy1jo54N8/HxqK2aqkrwTqi1ykDpSIq1E+1DoIIzt5XwgJ29wL5PJcZ44v3o4HR9sfAf8nb6i9pkLrcslH32GTIwZzxL2GrVg3ly9QXQqn8zDCH7By+Tt2Dy3T6oqraQZT3OHtInOJsnK+SxkgltYbUNYuHyhQkLPHU6K/nZlFbGzINHLol1n7HMmT/IGaUaOcHuCNJl/2fjS3dJgU/lhdqbL+HxMeCT0mFXOKOSYb2vG2psKDpKgXrCg2Meh7VA3YodRsGUvyLAzHGbmdNvikXXCy6c4pj6/A0A9XTrQkDjExgjpK9BVsJRNg2c3WntRxRro= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(39860400002)(136003)(376002)(396003)(346002)(451199021)(40470700004)(36840700001)(46966006)(8676002)(8936002)(7416002)(44832011)(5660300002)(83380400001)(47076005)(36860700001)(186003)(16526019)(2616005)(356005)(26005)(86362001)(336012)(426003)(81166007)(82740400003)(40460700003)(82310400005)(41300700001)(6666004)(40480700001)(478600001)(4326008)(36756003)(70586007)(70206006)(110136005)(316002)(54906003)(2906002)(30864003)(2101003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 15:00:33.1100 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d8f3adb9-957a-4990-f6b4-08db5ad54ac2 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7135 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230522_080039_207128_FB24377A X-CRM114-Status: GOOD ( 15.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Ashok Reddy Soma As per design, all input/rx pins should have fast slew rate and 12mA drive strength. Rest all pins should be slow slew rate and 4mA drive strength. Fix usb nodes as per this and remove setting of slow slew rate for all the usb group pins. Signed-off-by: Ashok Reddy Soma Signed-off-by: Michal Simek --- (no changes since v1) c&p more explanation from v1 version. In design tools all inputs pins are setup like described by default. That's why it could suggest that there is no need to describe default configuration in DT. But all MIOs can be used as GPIOs where pinctrl can change their default values to something else. That's why setting up default values is to be safe even for input pins. I don't know HW details to that extend but that values can also change input behavior that's why having default is not a bad idea. --- .../arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 8 ++++++-- .../arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 8 ++++++-- .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 8 ++++++-- .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 8 ++++++-- arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 13 ++++++++++--- arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 5 ++++- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 6 ++++-- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 6 ++++-- arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 5 ++++- arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 5 ++++- 10 files changed, 54 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso b/arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso index 669fe6084f3f..603839c82599 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso +++ b/arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso @@ -2,7 +2,8 @@ /* * dts file for KV260 revA Carrier Card * - * (C) Copyright 2020 - 2021, Xilinx, Inc. + * (C) Copyright 2020 - 2022, Xilinx, Inc. + * (C) Copyright 2022 - 2023, Advanced Micro Devices, Inc. * * SD level shifter: * "A" - A01 board un-modified (NXP) @@ -265,19 +266,22 @@ mux { pinctrl_usb0_default: usb0-default { conf { groups = "usb0_0_grp"; - slew-rate = ; power-source = ; }; conf-rx { pins = "MIO52", "MIO53", "MIO55"; bias-high-impedance; + drive-strength = <12>; + slew-rate = ; }; conf-tx { pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", "MIO60", "MIO61", "MIO62", "MIO63"; bias-disable; + drive-strength = <4>; + slew-rate = ; }; mux { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso b/arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso index 7886a19139ee..a91d09e7da4b 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso +++ b/arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso @@ -2,7 +2,8 @@ /* * dts file for KV260 revA Carrier Card * - * (C) Copyright 2020 - 2021, Xilinx, Inc. + * (C) Copyright 2020 - 2022, Xilinx, Inc. + * (C) Copyright 2022 - 2023, Advanced Micro Devices, Inc. * * Michal Simek */ @@ -248,19 +249,22 @@ mux { pinctrl_usb0_default: usb0-default { conf { groups = "usb0_0_grp"; - slew-rate = ; power-source = ; }; conf-rx { pins = "MIO52", "MIO53", "MIO55"; bias-high-impedance; + drive-strength = <12>; + slew-rate = ; }; conf-tx { pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", "MIO60", "MIO61", "MIO62", "MIO63"; bias-disable; + drive-strength = <4>; + slew-rate = ; }; mux { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts index 1a7995ee62ce..af3331c133ad 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts @@ -2,7 +2,8 @@ /* * dts file for Xilinx ZynqMP zc1751-xm015-dc1 * - * (C) Copyright 2015 - 2021, Xilinx, Inc. + * (C) Copyright 2015 - 2022, Xilinx, Inc. + * (C) Copyright 2022 - 2023, Advanced Micro Devices, Inc. * * Michal Simek */ @@ -187,19 +188,22 @@ mux { conf { groups = "usb0_0_grp"; - slew-rate = ; power-source = ; }; conf-rx { pins = "MIO52", "MIO53", "MIO55"; bias-high-impedance; + drive-strength = <12>; + slew-rate = ; }; conf-tx { pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", "MIO60", "MIO61", "MIO62", "MIO63"; bias-disable; + drive-strength = <4>; + slew-rate = ; }; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts index 869b733a0634..6503f4985f8d 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts @@ -2,7 +2,8 @@ /* * dts file for Xilinx ZynqMP zc1751-xm016-dc2 * - * (C) Copyright 2015 - 2021, Xilinx, Inc. + * (C) Copyright 2015 - 2022, Xilinx, Inc. + * (C) Copyright 2022 - 2023, Advanced Micro Devices, Inc. * * Michal Simek */ @@ -281,19 +282,22 @@ mux { conf { groups = "usb1_0_grp"; - slew-rate = ; power-source = ; }; conf-rx { pins = "MIO64", "MIO65", "MIO67"; bias-high-impedance; + drive-strength = <12>; + slew-rate = ; }; conf-tx { pins = "MIO66", "MIO68", "MIO69", "MIO70", "MIO71", "MIO72", "MIO73", "MIO74", "MIO75"; bias-disable; + drive-strength = <4>; + slew-rate = ; }; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts index 544801814bd5..44d1f351bb75 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts @@ -2,7 +2,8 @@ /* * dts file for Xilinx ZynqMP ZCU100 revC * - * (C) Copyright 2016 - 2021, Xilinx, Inc. + * (C) Copyright 2016 - 2022, Xilinx, Inc. + * (C) Copyright 2022 - 2023, Advanced Micro Devices, Inc. * * Michal Simek * Nathalie Chan King Choy @@ -432,19 +433,22 @@ mux { conf { groups = "usb0_0_grp"; - slew-rate = ; power-source = ; }; conf-rx { pins = "MIO52", "MIO53", "MIO55"; bias-high-impedance; + drive-strength = <12>; + slew-rate = ; }; conf-tx { pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", "MIO60", "MIO61", "MIO62", "MIO63"; bias-disable; + drive-strength = <4>; + slew-rate = ; }; }; @@ -456,19 +460,22 @@ mux { conf { groups = "usb1_0_grp"; - slew-rate = ; power-source = ; }; conf-rx { pins = "MIO64", "MIO65", "MIO67"; bias-high-impedance; + drive-strength = <12>; + slew-rate = ; }; conf-tx { pins = "MIO66", "MIO68", "MIO69", "MIO70", "MIO71", "MIO72", "MIO73", "MIO74", "MIO75"; bias-disable; + drive-strength = <4>; + slew-rate = ; }; }; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts index f36353a51863..a074d8e2b86d 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts @@ -783,19 +783,22 @@ mux { conf { groups = "usb0_0_grp"; - slew-rate = ; power-source = ; }; conf-rx { pins = "MIO52", "MIO53", "MIO55"; bias-high-impedance; + drive-strength = <12>; + slew-rate = ; }; conf-tx { pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", "MIO60", "MIO61", "MIO62", "MIO63"; bias-disable; + drive-strength = <4>; + slew-rate = ; }; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts index 3fd47725c2c8..91c9b77f6b1f 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts @@ -410,20 +410,22 @@ mux { conf { groups = "usb0_0_grp"; - slew-rate = ; power-source = ; - drive-strength = <12>; }; conf-rx { pins = "MIO52", "MIO53", "MIO55"; bias-high-impedance; + drive-strength = <12>; + slew-rate = ; }; conf-tx { pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", "MIO60", "MIO61", "MIO62", "MIO63"; bias-disable; + drive-strength = <4>; + slew-rate = ; }; }; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts index 4f6429caecff..954044d9899f 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts @@ -422,20 +422,22 @@ mux { conf { groups = "usb0_0_grp"; - slew-rate = ; power-source = ; - drive-strength = <12>; }; conf-rx { pins = "MIO52", "MIO53", "MIO55"; bias-high-impedance; + drive-strength = <12>; + slew-rate = ; }; conf-tx { pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", "MIO60", "MIO61", "MIO62", "MIO63"; bias-disable; + drive-strength = <4>; + slew-rate = ; }; }; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts index 8c3fa3fe28d5..ab5e34b43642 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts @@ -794,19 +794,22 @@ mux { conf { groups = "usb0_0_grp"; - slew-rate = ; power-source = ; }; conf-rx { pins = "MIO52", "MIO53", "MIO55"; bias-high-impedance; + drive-strength = <12>; + slew-rate = ; }; conf-tx { pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", "MIO60", "MIO61", "MIO62", "MIO63"; bias-disable; + drive-strength = <4>; + slew-rate = ; }; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts index 0d9b6081dff6..f31365a14f73 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts @@ -660,19 +660,22 @@ mux { conf { groups = "usb0_0_grp"; - slew-rate = ; power-source = ; }; conf-rx { pins = "MIO52", "MIO53", "MIO55"; bias-high-impedance; + drive-strength = <12>; + slew-rate = ; }; conf-tx { pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", "MIO60", "MIO61", "MIO62", "MIO63"; bias-disable; + drive-strength = <4>; + slew-rate = ; }; }; From patchwork Mon May 22 14:59:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 13250730 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 46939C7EE2D for ; Mon, 22 May 2023 15:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MHmvpfN60dKDsNU5CEY2xt/MagpEb4jMn3DYzOxyQ00=; b=vsq135uS6JYlb8 XxZ69UN9qqUXyQWQJvW2pHPh+zGSSpg0leuK2NscZXIRQfIyy/4QGogDdXEMtd8ZydmfBjCX6JEts hCYWYcTKr/+U5VW6rJGCg5uGe0vuomaWJqrWC0PlhPD6w7bqMvfh5YQikRjMsZDVRH1fRal4zNSVO bS3BUGJLgIECLAdEguAXFzjjeTGAl9yDYbBkRpDm76wjBi12Wq8189CWlZr4wGPvqHf2uY9zM4xDJ ZlsBEvKofUZZ9osyoGWoKrtLfPTiZNzWs0Hg07UilrXCckyV5K8B/G9QlUhKxO9EmkhsYI4vBMPDy JfDeFQPAMEUv2sDouliQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q171i-006vZ2-38; Mon, 22 May 2023 15:00:46 +0000 Received: from mail-mw2nam12on20618.outbound.protection.outlook.com ([2a01:111:f400:fe5a::618] helo=NAM12-MW2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q171e-006vWP-1C for linux-arm-kernel@lists.infradead.org; Mon, 22 May 2023 15:00:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d8gYYKSixPE1iYmdl3RFTFO40yJObEFgY+vEpkby5qwMs87MZr9/fLhZoDkImhFpt5jFHOuAEJ1zMqr6YwBMwvuy0WI00KJ1g5itMw6xBTGMhdZZDN8pmwHULjG/N4q9oYnlN+IrRRqrBbJSBlugGK1+VxJHsygrBokBpKZJECdtvgzc031a+gkgf9QrhVI3Rjhd4LrNm4n1tQ8PfoDJCU9ycWSebXpLcy97GMRBHjP5CE976yDSAQVCt7oRhIXhNGyM8jGoAYY5sIjl+V3vlZ9geGC398p2Ruu3t6Mx7BGwEm5jPArO5e3HQD7P2l+EMmqJLWuC165F5PvSmA1t3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HKaDwKWgGj34kfV7+Xy4ofeKe4phzNS1X5wo8c80Ag4=; b=MudnKY4L8WPyCcE5sx3tQdEVsqqZMf5dmkRAURTrTbkfpKNpH3rlNXdSIRqPNNMpe2wpbuP3SMb3AICVvVeAu2SoLMkVFasSZOFjAul4kdL/f8uUj26KB6YyQ99qb3Szrr/viTltP76miwFoqFNlY37gwF2Z45JxfWI6GcZyiT55gXhzuEGXLw3NiyokTfEFB4swMzvEblbTPCGg/kA2MG9QKE9PbmrR+UzNOyKcF6tP2mzeQ4WGVMTYagpHQc4nczsPUsc8fZVARKRnZEEqAxDphBixKAQOSFhCIUsQvN+m1kLNJTAz1OlDoi03UmCVyq8tqfXZZDD21Kh0v8Xm2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HKaDwKWgGj34kfV7+Xy4ofeKe4phzNS1X5wo8c80Ag4=; b=Xi4fag9hCpdCtZLXAfY70/1f/QLcumc77rSMR89VXsDo6yCNgOW1TvTlU/aCBOehErnXaLIBVLGWCgrjGGXTeWgTfs/segKgMk3i3yOeZesgIl2Ost/+rWYcWxbbqVpQaDg4YcJUhhb+fTexPFZc1tkyZi1tM4WtMqmyJY52qM0= Received: from DM6PR01CA0022.prod.exchangelabs.com (2603:10b6:5:296::27) by PH7PR12MB7794.namprd12.prod.outlook.com (2603:10b6:510:276::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.25; Mon, 22 May 2023 15:00:37 +0000 Received: from DM6NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:5:296:cafe::3e) by DM6PR01CA0022.outlook.office365.com (2603:10b6:5:296::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28 via Frontend Transport; Mon, 22 May 2023 15:00:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT022.mail.protection.outlook.com (10.13.172.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6411.28 via Frontend Transport; Mon, 22 May 2023 15:00:37 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 22 May 2023 10:00:29 -0500 From: Michal Simek To: , , , CC: Amit Kumar Mahapatra , Ashok Reddy Soma , Conor Dooley , "Krzysztof Kozlowski" , Laurent Pinchart , Parth Gajjar , "Rob Herring" , Srinivas Neeli , Vishal Sagar , , Subject: [PATCH v2 3/6] arm64: zynqmp: Set qspi tx-buswidth to 4 Date: Mon, 22 May 2023 16:59:50 +0200 Message-ID: <1f1b0028106d83aa06e0777e91862a07df100fa1.1684767562.git.michal.simek@amd.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=7340; i=michal.simek@amd.com; h=from:subject:message-id; bh=Gl+tyTMoFNKlU3UiJWQaU4vwmFqPHKaLGnnaY76ai98=; b=owGbwMvMwCR4yjP1tKYXjyLjabUkhpTs5rj5jhabvv30DDy29aHh04Dgy7ysuRe4c2eXLz2+7 YImR1RjRywLgyATg6yYIou0zZUzeytnTBG+eFgOZg4rE8gQBi5OAZjIC2uG+Y5ngnYqnfgQMVk3 UrncUL2lfsvKNwwLpjst+tG9SSJ1was7bcufP+t3Zr3ZDgA= X-Developer-Key: i=michal.simek@amd.com; a=openpgp; fpr=67350C9BF5CCEE9B5364356A377C7F21FE3D1F91 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT022:EE_|PH7PR12MB7794:EE_ X-MS-Office365-Filtering-Correlation-Id: 79c799cc-27f3-4ab5-691d-08db5ad54d6a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PnUbs3+f+T2KgaQlrhZS95pc6jCCuAl8XckWr8+aaZ24HdaarJIH16lH9kCarykdaslZCL65JGe7M9CCALA021d7tI9/18Gnz7N/2LRrEAtEtsk2T2e/ud8eQebdUJM2lT9ma7tL2HOER5BzlTUbxrzx1bjrxdUkMnCezzafOijXh/Vtmev2q4nTY1EEOqSxWc9keRRVOt0PWds+wFiaR9gz2UPklPEJmWw/GFAkkDZYeIZx98qxSVIbgOjiPuDMVp9UBHPG+PtKMjJ6kRwchqy4pbAqXn4blJlWNC8XrOgnme+WC23f+SXmJ14a88QFPtZK/7oZMNuXZyfuyx2lvn9ZuKDWXBfXrTMxWHzQj5x/DhQ96bUE7IXuU9gdGed5PyT9asDrV/g13VtSLknDIUqKU3XCYHWW2+AoWBB4kJ6tWmy5lQsgxI0Emp3b87sEQsqctbpkVbidGY8roUAWhAPwe9TTHo2ZgclNzudUrpyP10DaHrJrNmKLai5OGKv0dZ4cOrZog32e62iBkEhiDiP7r80/iWxG6ihPeU8bdTvbHksVokAbiYdih5pM9a0gLbC9MZlX5pbneRV8e2YkKROiuyH6jTgA9Az5dxaHQ4f6vOgc7jL4YLM6TbnbvmOpO7mEeQHJraOfGO0unCmBw78CmqDt9pHRq1x8A7tQu8XaD0nVlXxr1WXadNDeWekJxs5FvGBAv5Obavs2DD7vtbxsztjtk03AobYAmdy52FjidnFx2J/1SCVPIKJln43oZ+IWjNgkMmb8M/q86+5Q3OxS7N6ZGB8taKzHYE1Y8qg= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(396003)(136003)(346002)(376002)(39860400002)(451199021)(46966006)(36840700001)(40470700004)(8676002)(8936002)(47076005)(5660300002)(7416002)(44832011)(83380400001)(36860700001)(82310400005)(16526019)(186003)(336012)(26005)(426003)(2616005)(81166007)(86362001)(356005)(82740400003)(40460700003)(41300700001)(40480700001)(70206006)(6666004)(478600001)(70586007)(4326008)(316002)(110136005)(36756003)(54906003)(2906002)(36900700001)(2101003);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 15:00:37.5629 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 79c799cc-27f3-4ab5-691d-08db5ad54d6a X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7794 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230522_080042_414633_C870AE0B X-CRM114-Status: GOOD ( 14.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Amit Kumar Mahapatra All ZynqMP boards are setting up tx-buswidth to 1. Due to this the framework only issues 1-1-1 write commands to the GQSPI driver. But the GQSPI controller is capable of handling 1-4-4 write commands, so updated the tx-buswidth to 4. Using all 4 lines will increase the tx data transfer rate, as now the tx data will be transferred on four lines instead on single line. Signed-off-by: Amit Kumar Mahapatra Signed-off-by: Michal Simek --- Changes in v2: - Update commit message to skip spi-nor part - reported by Laurent arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts index c1ab1ab690df..84e18fdce775 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts @@ -124,7 +124,7 @@ spi_flash: flash@0 { /* MT25QU512A */ #address-cells = <1>; #size-cells = <1>; reg = <0>; - spi-tx-bus-width = <1>; + spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; spi-max-frequency = <40000000>; /* 40MHz */ partition@0 { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts index 48d6a7202406..04079d1704f1 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts @@ -44,7 +44,7 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; reg = <0x0>; - spi-tx-bus-width = <1>; + spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; spi-max-frequency = <108000000>; /* Based on DC1 spec */ }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts index e80484f9b137..3dec57cf18be 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts @@ -45,7 +45,7 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; reg = <0x0>; - spi-tx-bus-width = <1>; + spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts index af3331c133ad..d9d1de5f313c 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts @@ -355,7 +355,7 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; reg = <0x0>; - spi-tx-bus-width = <1>; + spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; spi-max-frequency = <108000000>; /* Based on DC1 spec */ }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts index 05be71eab722..6636e76545a5 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts @@ -173,7 +173,7 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; reg = <0x0>; - spi-tx-bus-width = <1>; + spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; /* also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts index a074d8e2b86d..8767f147cbe3 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts @@ -957,7 +957,7 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; reg = <0x0>; - spi-tx-bus-width = <1>; + spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts index 91c9b77f6b1f..e185709c0d84 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts @@ -444,7 +444,7 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; reg = <0x0>; - spi-tx-bus-width = <1>; + spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; spi-max-frequency = <108000000>; /* Based on DC1 spec */ }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts index 954044d9899f..7fceebd1815c 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts @@ -456,7 +456,7 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; reg = <0x0>; - spi-tx-bus-width = <1>; + spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; spi-max-frequency = <108000000>; /* Based on DC1 spec */ }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts index ab5e34b43642..27b2416cb6d8 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts @@ -964,7 +964,7 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; reg = <0x0>; - spi-tx-bus-width = <1>; + spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts index f31365a14f73..6224365826d8 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts @@ -794,7 +794,7 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; reg = <0x0>; - spi-tx-bus-width = <1>; + spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts index e615286b8eff..c406017b0348 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts @@ -47,7 +47,7 @@ &qspi { flash@0 { compatible = "m25p80", "jedec,spi-nor"; reg = <0x0>; - spi-tx-bus-width = <1>; + spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; spi-max-frequency = <108000000>; }; From patchwork Mon May 22 14:59:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 13250731 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CA198C77B73 for ; Mon, 22 May 2023 15:01:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dFExo+dzCP8dTJHx8jrAfM/g+/Oafgu+giKhUb7XDbE=; b=c6BNaslq/roXZl R0Nuj+K6iqKZoBVOgvHqPQagBc0b19va7Dt2MEOMzBW6P2TTNuy/m1ZVT6PBN8OAowaToiGj/uBg4 oL9kEx5g7JNnNZPI3tE8fUa0eVjEr43muRJSrPgNZSBup++IM70By9A7tdPGndmmoGWJ++ZgU2TXj n+57iivK5BuxsFnM2CtZwvcbkxhaNvF4py40UUU86et079yu+4+C7xNeMBVd6kO5KonJsKD1zkuXz btQVWyRSplM/HPB9jL36LeDDmMuq85Nui86AkyA45GG5bT2FOFGjxtg94NDFZ6HJmnd99UIrMXSFV G1OkleMcrHMjidnpiyTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q171t-006ve6-2M; Mon, 22 May 2023 15:00:57 +0000 Received: from mail-bn8nam04on20602.outbound.protection.outlook.com ([2a01:111:f400:7e8d::602] helo=NAM04-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q171l-006vZf-0g for linux-arm-kernel@lists.infradead.org; Mon, 22 May 2023 15:00:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zd+NcGYhp2qkrx0f6H0aM4ZT91dMmOysNC0HqPclFWxprQ8tZs5ev3QzP3r7JQaIM3gc84L7OmK/0urExG92K0/Iuh+/ihqHV00In1Y9E2BVhtnLpWJ5h3DsNbXobOkZF2oRaJoKBknfVxE1AtltJ+ca7e53QKXWKDqAfMDroG2OwHnlMM/d7BRbq1BW5ejoUJa+Wv4tPF2PcH8/qyI/7Sm8BZmsE4sfe+DSYsku+/hoiJioRC69++9VKpcwK23kibD5a8qcUfhRvV7C5g2c7vY++Op/Yr/75jSLfdr57uUUJUuhOIXhIkBQNeuDa8PKkLnAPerIPYZffKY6tAdPCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eVNuQUM1uYFgBjPmCO/OTEjRstWFNXfcrZIEj34aSiI=; b=fvX2EyTfldBJUifOZTzEwiCK5+iTkkLxC6mdhOW+hP3QLBECi09n+9u1PrgbgkqCErFSDtnIz0yOYMx4ik/Y8APJ15NtZbfN/+h9V/uJD2j9EUoFlDjESjMbwKFzt3oCbxUT7zem8DIuCz7bByUoFf+xuDrs4sCz7nQ5mYeifp1bhifH0xFHUYX+sqT0bb+XoIIDYesZ3/36u71PRJ90ytk+v7mXqIy4wGtw3ibULEVUmm7+cm9l2Ri77ZoTHD4i6D4vr0FeFH7yiooIbS1rdeQq7RRUdVT3Pe41w/iiehXnITSWpDVqj1SGAKfnZIdRAQH9dnH6V0DtBxV51MKaHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eVNuQUM1uYFgBjPmCO/OTEjRstWFNXfcrZIEj34aSiI=; b=YCYBeVif5qvqE4UOoF+v1ZE7nMWHvixdawajH+m4hWD72Y4zXQRlNbVJ8x27LtiPBvRP9MgBFgYKwPUY+8xSB6AYH4fnnFcOG45VjX8zJJJImY7WSJquYtHIeBKfPEchFm3j8DjOU0tYIvWebGVFN5wn79JngIRw2vvT20U9aes= Received: from DM6PR03CA0008.namprd03.prod.outlook.com (2603:10b6:5:40::21) by PH7PR12MB5735.namprd12.prod.outlook.com (2603:10b6:510:1e2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28; Mon, 22 May 2023 15:00:40 +0000 Received: from DM6NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:5:40:cafe::97) by DM6PR03CA0008.outlook.office365.com (2603:10b6:5:40::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28 via Frontend Transport; Mon, 22 May 2023 15:00:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT059.mail.protection.outlook.com (10.13.172.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6411.28 via Frontend Transport; Mon, 22 May 2023 15:00:38 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 22 May 2023 10:00:33 -0500 From: Michal Simek To: , , , CC: Radhey Shyam Pandey , Conor Dooley , Harini Katakam , "Krzysztof Kozlowski" , Laurent Pinchart , Piyush Mehta , Rob Herring , Robert Hancock , Sai Krishna Potthuri , Tanmay Shah , , Subject: [PATCH v2 4/6] arm64: zynqmp: Add L2 cache nodes Date: Mon, 22 May 2023 16:59:51 +0200 Message-ID: X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1616; i=michal.simek@amd.com; h=from:subject:message-id; bh=aRFjcOFIfT3sjxmmYR0+S2JqA8kTwZQdZ9ysjky5aFM=; b=owGbwMvMwCR4yjP1tKYXjyLjabUkhpTs5rhjqXtu/2U4vdo9fN+E+h9rDe6vUo389Gv37sSJ2 TZd2oXGHbEsDIJMDLJiiizSNlfO7K2cMUX44mE5mDmsTCBDGLg4BWAiVSEM8/N8rO6HdF4LMn+l 5MOx7aDsTLa30gzzfZ5F19Z/O5N+h4dDU3PWfP2fpje2AQA= X-Developer-Key: i=michal.simek@amd.com; a=openpgp; fpr=67350C9BF5CCEE9B5364356A377C7F21FE3D1F91 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT059:EE_|PH7PR12MB5735:EE_ X-MS-Office365-Filtering-Correlation-Id: 02c2c5ee-cdf1-4cc3-31f5-08db5ad54def X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lhKPIgnuqHeRTVzWdiTQ/bEYwo6++EIEuhpa2dRfnZL8evQfXNgNe33NyvfLeJOg9e9l/e6hDBcbeFoDkJrv5MsicGlQxutqtd3EX1hwzLRWF24K9Fs2rm2Ngcbr6GZb6uRIbvC0AePPcvYcb4sfSq6a5ldoOjGrLVRphjPhY+6QvQrsxpftAYkfO0dXtxbIWetnYIheY0+0im2IFsDcbOsKDKpYZAYD9LI5iaMQC/u+oghqlcXMzrsCu5YBhoHW5B7tE2Bv7TznRg2Prl1VWq8bw3FJlBcYAmOfG3js+p0MzM5tp/sKrSjgJ0fNbYzr+YUebiuTkmeTw1SIbAQvmHFpf62XNyimMnSHR0o/O9Qv/EhepPARip9h2/P3gzai/YjGzfN/Dv/GYW1SVD+PTyhvuIjwtLKHrug+UNx1eWBxBcD3sOgtuUAcwim6xC07kYsX1yhAGkJgnYj2AwxbkQlES4dR5i1Nz9m5lksdbEaJyE3E33/sIEM53XeIlinBTX0+SkLb9RXCuxYZP1JEMx0SS04o9NkY2hiFAgRnn2JXYbn/2lgDs3a1CXVVqQULFHxFlm5P7KdXUAM2MAG6oczpztIYjZCoboNr6/q6E0ZitXnI1K+hplLghZZEeVd7VwIiayk5uMppU2tkig37Uv5GH1hXdIi8PlWT2He0AEq0w7x1WVTl8CjOEEBNNRIwBmioSPkrYg5O5Fu2/nkXgm8td7XUWzTv02xaK5EKiCjXz2P2V1iDzgJuQL4FOCt07c75OutiSpUF40VWfbVdeFxs1J0s4rHbryPWfnLMkU8= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:ErrorRetry;CAT:NONE;SFS:(13230028)(4636009)(346002)(39860400002)(376002)(396003)(136003)(451199021)(40470700004)(46966006)(36840700001)(70586007)(70206006)(4326008)(86362001)(2906002)(7416002)(40460700003)(36756003)(44832011)(5660300002)(8936002)(8676002)(41300700001)(316002)(40480700001)(478600001)(54906003)(110136005)(82740400003)(83380400001)(81166007)(356005)(6666004)(26005)(186003)(16526019)(426003)(2616005)(336012)(36860700001)(82310400005)(47076005)(36900700001)(2101003);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 15:00:38.4331 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 02c2c5ee-cdf1-4cc3-31f5-08db5ad54def X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5735 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230522_080049_254141_0D472C15 X-CRM114-Status: GOOD ( 12.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Radhey Shyam Pandey Describe SoC L2 cache hierarchy. Signed-off-by: Radhey Shyam Pandey Signed-off-by: Michal Simek --- Changes in v2: - Update commit message to remove Linux part - reported by Laurent Linux kernel throws "cacheinfo: Unable to detect cache hierarchy for CPU 0" warning when booting on zu+ Soc. To fix it add the L2 cache node and let each CPU point to it. --- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index a961bb6f31ff..02bd75900238 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -33,6 +33,7 @@ cpu0: cpu@0 { operating-points-v2 = <&cpu_opp_table>; reg = <0x0>; cpu-idle-states = <&CPU_SLEEP_0>; + next-level-cache = <&L2>; }; cpu1: cpu@1 { @@ -42,6 +43,7 @@ cpu1: cpu@1 { reg = <0x1>; operating-points-v2 = <&cpu_opp_table>; cpu-idle-states = <&CPU_SLEEP_0>; + next-level-cache = <&L2>; }; cpu2: cpu@2 { @@ -51,6 +53,7 @@ cpu2: cpu@2 { reg = <0x2>; operating-points-v2 = <&cpu_opp_table>; cpu-idle-states = <&CPU_SLEEP_0>; + next-level-cache = <&L2>; }; cpu3: cpu@3 { @@ -60,6 +63,12 @@ cpu3: cpu@3 { reg = <0x3>; operating-points-v2 = <&cpu_opp_table>; cpu-idle-states = <&CPU_SLEEP_0>; + next-level-cache = <&L2>; + }; + + L2: l2-cache { + compatible = "cache"; + cache-level = <2>; }; idle-states { From patchwork Mon May 22 14:59:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 13250732 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 79895C7EE26 for ; Mon, 22 May 2023 15:01:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=epbS1/kTN2eiQU/6hH4sFPAlwB8exXQf9yYgJiAXKR0=; b=HRJOmpiIUdZcCu Ebrzjf2GxadB/WFvTd+7s7fcLrT1SUneoQwiKBsqL6Cvn9+aV8q7GmBHzlFPG07d1a96ow6iOw3tw umwWs5P1IbQ6S4X7/bo11aTsvWuUSlFJzDdfqsHYM35nxG2H+6P7o/m7RCTqvZH7/bPvHrK9Ty31V 0+GxmfNYcThjsD3mPeKBm9BAHW32bmeCIekYWuJ0Wmao+18l8cC1TrguLeE6+Mcy+f1YFek9TzFz7 MVXO8hltry7dOrGcpw7kCmhIV1DKEOdXjml2uiAbq2SLAcJEyufxfAIsZyBihRwJXyJgZrDzETkwB B2UUdoiQNoPjg1miLWog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q1725-006vji-0W; Mon, 22 May 2023 15:01:09 +0000 Received: from mail-dm6nam12on20626.outbound.protection.outlook.com ([2a01:111:f400:fe59::626] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q1720-006vgV-2b for linux-arm-kernel@lists.infradead.org; Mon, 22 May 2023 15:01:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PetQ4kj1QCPpOaEP9P38lD/ZsiejDpQAAfWgULEcMl76xXlLx9zZ/rICHd+VRE4DfyS7oWc6SpvQFAi2KEBg7B9uSu/VThFwU1Ob0fl0EY6pCpnThG5wDH2cv0HpKcju3Qo2/A/BoTszYde/A+WAiIhJJN/wgghL8hMHex+2fhTbagHlAXGGXJmd1xgBwMDWsY6sR2wZbDnOrHU4nD14i4vt43lAJHr9twrBqgkegjfYh58wUQH6wZhxvsqhvqpdrPdAOBSB6yn7s/SI3kIRgCUHCM7fs+sHWjzLavDmrGlNSrtxOSlUBRDeP5uOK0qewFowREHudNOnHAel5mWWrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=54LbxK74auC0Q3JumSFGOfyyOoGlcKDpIjKf20bFWcg=; b=PQqfzoww2FsQQXh3IylIzq3xDmVbDUOHOA0bEj2Sk/4J2nbkRckhL7SfEZyijxwPQU00D/8RN711NmeUJzyu8CsVsUU1IgQ6KqWRtwg2mly40fF+wKPmX3dzlq+Q5b0AKu+f2S/waiTis1JJh8uJI/dLGt5u0Kh6SD+7hTabTbrQehVsqtNNJmVLkTjSjyTl5csufgDkiJ5lBGXa7Z4UlInH3FznEMBU+MEQrCkLX4SEtF6g+3G+0F+kJ1Z+k9dp+kr/IAxhorlchVYQV21pEoWQmKpLKfDfYyq5UQSM9XhfFtN9dH031B6WsdlfZSXSDSAqezKYiNXRcTgGmAuizw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=54LbxK74auC0Q3JumSFGOfyyOoGlcKDpIjKf20bFWcg=; b=VW8R9v+BUST+3A3uAlBX1dkzhOLQFw9U5gdFOEcFj8nwT5tfqDHT3RuKR40WKnXMeX9VX67Q75IsIA8BqqNAgqpEWRYkAyzUSTwe4R8mESl8hs+EimicfrFy4ilTnfQ/k9lmaWi0wHGdANJtcNPi6t6NugRS2q5X4n/97JTczsU= Received: from MW4PR03CA0333.namprd03.prod.outlook.com (2603:10b6:303:dc::8) by IA1PR12MB7565.namprd12.prod.outlook.com (2603:10b6:208:42f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28; Mon, 22 May 2023 15:01:00 +0000 Received: from CO1NAM11FT041.eop-nam11.prod.protection.outlook.com (2603:10b6:303:dc:cafe::50) by MW4PR03CA0333.outlook.office365.com (2603:10b6:303:dc::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28 via Frontend Transport; Mon, 22 May 2023 15:00:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT041.mail.protection.outlook.com (10.13.174.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6411.28 via Frontend Transport; Mon, 22 May 2023 15:00:59 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 22 May 2023 10:00:37 -0500 From: Michal Simek To: , , , CC: Radhey Shyam Pandey , Conor Dooley , Harini Katakam , "Krzysztof Kozlowski" , Laurent Pinchart , Michael Grzeschik , Rob Herring , "Robert Hancock" , Tanmay Shah , , Subject: [PATCH v2 5/6] arm64: zynqmp: Add pmu interrupt-affinity Date: Mon, 22 May 2023 16:59:52 +0200 Message-ID: X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1057; i=michal.simek@amd.com; h=from:subject:message-id; bh=9Rv4kfaaoFDqsRH/cym30oBfA0Mc6YevG6DaHOmICuo=; b=owGbwMvMwCR4yjP1tKYXjyLjabUkhpTs5ngOsYoHm3JOX83qsdbt/2/zzDfY18vwXzPD7PmHX h5vmiHTEcvCIMjEICumyCJtc+XM3soZU4QvHpaDmcPKBDKEgYtTACbilMWwYDrjyz0d1lmXXMt9 Y8+yhmc7rdmawTC/uud4+RXmKckB085dyKx7qy2f8/wzAA== X-Developer-Key: i=michal.simek@amd.com; a=openpgp; fpr=67350C9BF5CCEE9B5364356A377C7F21FE3D1F91 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT041:EE_|IA1PR12MB7565:EE_ X-MS-Office365-Filtering-Correlation-Id: ac45c5df-6c5d-462a-a692-08db5ad55aaf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BVnq5g3Y1ZSx3ydVETHRMoo8pIzMD3S+6UckTGy3C1KgUpruq30RpOZoFDLtcWJY1JaQNI3c8OXBFRZsKZt1UX3UMQne8Rv30lQx8V1c73kqQVkXMeVm5OcSTCHc/FKah6rbNlU1+rtDXTiDt+lqZnrCY1heWttJtfH04wBVkFRYKYDIMAzFe9uMjhB+t2FdbeX6ctIwEBT/GC6tvwTLiogWSZMda5eC6AYCyxgUruIICYFQXFkhIMB/Hg7IWpYIU1sooaeVnZXJmcIB1CenW8Oq8Uvma4f64AXbfDRn6C2ErkMl0X7sbMQuu+5uyVL/7TxGOC6/idipTAr28RgWagKnXrOY4CwBtj8cHQ33rPaikD/k3yaAlko08AQY7WhFZRXTU+1eUz9kkwqSu40c6jE6MF/t6bmk8wSZRNUcLjxIA+L3044CHDU+c1ReMj7xntrnoUI2alt4n0SrMVkujdtybw24B6k4Jp+rkDUoMlymA0Ynnm5l3/hqewmLw6Mnm+JQpkTbnOSPNolRN9k1WosnxG9IFGRpvZb7t87c3KxGb9HAaW2vjqdaPum1IFswJ2wdeDqV7qWVOvA/DCi0WKHawSSufSZKkeDNl0PHP+ijKqIBa9uzXuzXmXTn1/0vcrhpEftqgHsgzQpfozLVzRz2OYjwKfQRvKag7S84ZIvnWz51K1ODXBI49Qk91hhBwIl2BowItvqq3xIdN0nzjM35FJRZFArhPZzybJNBqqwufsKGAXwvR478WjkKu8N896jAjzeIQtssiqTfF4HI5oXf7Crf/23dCXuqb8g7RTk= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(39860400002)(376002)(346002)(136003)(396003)(451199021)(36840700001)(40470700004)(46966006)(2906002)(6666004)(82740400003)(356005)(81166007)(83380400001)(2616005)(426003)(336012)(47076005)(36860700001)(82310400005)(26005)(186003)(16526019)(7416002)(5660300002)(36756003)(44832011)(40460700003)(110136005)(54906003)(478600001)(40480700001)(8936002)(41300700001)(8676002)(70206006)(70586007)(316002)(86362001)(4326008)(2101003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 15:00:59.7489 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ac45c5df-6c5d-462a-a692-08db5ad55aaf X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT041.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7565 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230522_080105_396437_19EDD354 X-CRM114-Status: GOOD ( 12.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Radhey Shyam Pandey Based on dt-binding "This property should present when there is more than a single SPI" that's also case that's why explicitly specify interrupt affinity to avoid incorrect usage. Signed-off-by: Radhey Shyam Pandey Signed-off-by: Michal Simek --- Changes in v2: - Update commit message to remove OS content - reported by Laurent This avoids the following error upon linux boot: armv8-pmu pmu: hw perfevents: no interrupt-affinity property, guessing. --- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 02bd75900238..fc5e21bc647c 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -164,6 +164,10 @@ pmu { <0 144 4>, <0 145 4>, <0 146 4>; + interrupt-affinity = <&cpu0>, + <&cpu1>, + <&cpu2>, + <&cpu3>; }; psci { From patchwork Mon May 22 14:59:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 13250733 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5E74DC77B73 for ; Mon, 22 May 2023 15:01:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ks2GBOb5OCrf5OH7amhRPYK2Veml2WlEAlSWCD7xdhk=; b=UrZtqEBFOO90Qp Jvkx20QSKNSgBQb3fygvBCwnpxdLsfFn15PlQwC0YDGWKYVuz+ygVpfzFwbCGEs2Dp9iJz1vmEDcR Y67NLm5c6eITbchrnTrp14ohFlvrwsbrhSL9LDRvmv3eNmF1ZqzxJAM79F/HWo2Q5Qvj7t8+4usdN /v6AJ4vjaiOL6MACue3DR85IYYpzxeaEnJUI9mE4n5BZv34kH/XARksQIGx2OwcQ8OK1HSrTS3IH4 oDM6a0+K1XPF67HFDgZa5KNca1DldnSmoApBzU2EMx/SaUusJ4EESg64C0/3Xxw7oa7BBQPmyfzSv iyUBqnnMk6zJca2YjkxA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q172J-006vrz-2y; Mon, 22 May 2023 15:01:23 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q172I-006vqo-0Y for linux-arm-kernel@bombadil.infradead.org; Mon, 22 May 2023 15:01:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=MHVx9hiAS4QeT8dNB0+8kNSaa2YUmaI91h4i76spYJw=; b=OExw1Vk8gZbZiwjr5u0YFv8nFP MWbB/SfQii2TjWK7/Qgfwdc/ImYkLxEln0QcxDACUhiUEwq5QgbkPK5023bzkksh3WFFlv4OWh4mG Xo2oXV0IMOJDyW+8QjG70xLhHKLQ0ISMZp9+Ft+O+A5oy9oSMbPp/qyrzlehd6FyqFrOTbbJ8DsXh iYcmNEwcSq3rLBAjvvan6UGiZVH34W4o/KYBy9zJDL7UaSRyhY+8gX4MT9p6XzX9pkjqD4EDwn02/ AuSbVrMZYZ8rQLPMiqYy5qb3WSHUNCfAHc5Q8ZCRfGF1kZVoLqI7mKgxbljE20nJlDT7575yXg3tW ftu9Mo2Q==; Received: from mail-bn8nam12on20616.outbound.protection.outlook.com ([2a01:111:f400:fe5b::616] helo=NAM12-BN8-obe.outbound.protection.outlook.com) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q172E-0023Zk-2J for linux-arm-kernel@lists.infradead.org; Mon, 22 May 2023 15:01:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ERVaeSr+Kld2wEgZv4pBjYa6gxusTbfZ0kJ8syQNcqj83S4TtqvlL97OqooktrtrUq7Tc7O1qK5PPuzf9w2NmsKaLsiHjQvFxwMek1EBISkQKjgxsGsM047A1Vr/BGJigtZVP1OgmLjdte/L+Cwr0xhriKT4XEQBda4QYUslxEW7Agqgv+dSQwzM5vlmbcgIN4Y5RHBzCVjQlcRzVM6lG6TZ1yj7CldUPBSSVY39Hh2XMPuf5k6Th3xEyEVXvdS1q1bpaFaGqU24dtD+UYjzKNJMSTASVxvRHB4XHDegmr3w3wpF4pcHc4p0sVBtXVKS72bykQuqUXt+qko0L2ZFjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MHVx9hiAS4QeT8dNB0+8kNSaa2YUmaI91h4i76spYJw=; b=UXqkjEFhcpxgiaoE8vtMRlnWGHNwCUdwe0KID/vlofIm2CoOdKwvFRTJhvR4nis9mNjlXcfB68OWc58NKYIXXdMVRuCx4I93/aNcAgKxUCdx8q2gSYUwN1GRPy0GQnxu9Xfgcx3dGmfqBPlWoXJNYHzWnjzM+Bw5WzEtW8duFENNGV8/B56Q1nVaQYBtnGn4oO4O73SoLcG3NzBMHdIkWVlD3GxyJ5syIU0lutYYjuBMWsLLiwLO5cV9k6cnq0FAIF+1AYsuLkQLQT1+3+80LFgEoyzuqQ9/M5rr0C3e2m8qtjkukUmPR48lLsxmmOOKsZBsDdEpoBKa7H/dqrp8Kw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MHVx9hiAS4QeT8dNB0+8kNSaa2YUmaI91h4i76spYJw=; b=KVDBUcD78Y09BEasUBpMtSrIULMaHdMoT+7qzVESucEYPMsXO6+g3V1TCRH15J7NRAo47MHBBeUB4PZ8isfdNU+hS4GwygVcNZCAFDWi2yXdgZP7Ks2OYDAT3/vpaPZYtnz6YRQqqBlEqZjOmttG7cnl73XGJ1dm7lcEc66Mj5o= Received: from DS7PR03CA0285.namprd03.prod.outlook.com (2603:10b6:5:3ad::20) by CH2PR12MB4971.namprd12.prod.outlook.com (2603:10b6:610:6b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28; Mon, 22 May 2023 15:01:11 +0000 Received: from DM6NAM11FT088.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3ad:cafe::1f) by DS7PR03CA0285.outlook.office365.com (2603:10b6:5:3ad::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28 via Frontend Transport; Mon, 22 May 2023 15:01:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT088.mail.protection.outlook.com (10.13.172.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6411.28 via Frontend Transport; Mon, 22 May 2023 15:01:10 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 22 May 2023 10:00:56 -0500 From: Michal Simek To: , , , CC: Amit Kumar Mahapatra , Conor Dooley , Krzysztof Kozlowski , Parth Gajjar , "Rob Herring" , Srinivas Neeli , Vishal Sagar , , Subject: [PATCH v2 6/6] arm64: zynqmp: Used fixed-partitions for QSPI in k26 Date: Mon, 22 May 2023 16:59:53 +0200 Message-ID: <7368dc772d8dc29477a880ac2065e2ecb98cf3f5.1684767562.git.michal.simek@amd.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5127; i=michal.simek@amd.com; h=from:subject:message-id; bh=4BxoH5GEkO+P7RNlBSyEwz59lTNpi7uO/qUt2btiaRc=; b=owGbwMvMwCR4yjP1tKYXjyLjabUkhpTs5vi5QdfrP/5edJ/R+/SkD4b+ZVv16rPe9C9Z+VmvJ PX19q37OmJZGASZGGTFFFmkba6c2Vs5Y4rwxcNyMHNYmUCGMHBxCsBE9n5nmB+xKF5F9aBaXm9K brFsk7YPS1O9PMM8Ux2TiRlhL01u8r79uCNdd8enj5cLAA== X-Developer-Key: i=michal.simek@amd.com; a=openpgp; fpr=67350C9BF5CCEE9B5364356A377C7F21FE3D1F91 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT088:EE_|CH2PR12MB4971:EE_ X-MS-Office365-Filtering-Correlation-Id: 663ec5f3-2e28-468d-f983-08db5ad56156 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JT6NfnfGNx9qyPEGZGeIU+5p9PuiC2TV2uxRnFisCINRWEy4mLG1ecNI2VAHnPI/yepSsYlCaTcpfM6J/17JkkO2ZUbXDDfy/J93l4w8Qi7AXFEtuzPoG+6xxuk7hUDZ8e9xnNKIecIqNGfX+6X0GnvNkIEn0Tbg72aQR4voM2OPjOJeFilkWoYECVGgv+WlHpKUdF9lR1KaOjabiHSr0llFzRklDlV8wkypxsODUGjbkTen8QILg1hyP3gPw68v1y8s82wW5id2iuq8hv9rYoxF2gFScdws7LexB0Q9jfwbJxAICZ1PhyY/I4Bi8eCfol2nbbATp6aQZYt6W6+fzUUFkkOOQ7QyWlt8E7biNofb4pc89tALSlxhPhVMQskMGK871bKk+tP5Q5X5D8d9hJQyHGMZBVgmmz2nczxC91rNQjJC755/hfSTuG8aUtHEFDL9H6wOw2p9WxAuz/NwRguz4Eq6rDtbQRRR9ylEpMKj+89b0Y4x8+tSxr+e0E7mfSoCUfiveeGhAluS0yWRXuJRdYH1edkuPsZIx7iy8NBr0+RPFOaaF69tvBVgfHYJeMHW2DRbFZy+Varcks+QTAuWQF1VRrYF7zEa72PjP+5lzuNSpJ1ImMR7Lp7m9F2mZTG3d9nQ+VWzZCpDQY1Hb1sy+IH/IiXPTyzBnhIMkLAe/+Tn7lZa6qqAWTWAPIfCD+Byn8regxubvY1fPRytsc8kbml5dr3heNgM5CsYapBe/OB5myoOEZCGGoLDOBtMQDS7b8BeN8H4v0s8+m12HXr5haUorKh3fWsPxxm4VIU= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(39860400002)(396003)(136003)(346002)(376002)(451199021)(36840700001)(40470700004)(46966006)(81166007)(356005)(82740400003)(40480700001)(40460700003)(86362001)(82310400005)(36756003)(426003)(16526019)(44832011)(8936002)(8676002)(336012)(7416002)(47076005)(2616005)(2906002)(186003)(54906003)(478600001)(41300700001)(316002)(4326008)(110136005)(26005)(5660300002)(6666004)(70206006)(70586007)(83380400001)(36860700001)(36900700001)(2101003);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 15:01:10.9899 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 663ec5f3-2e28-468d-f983-08db5ad56156 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT088.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4971 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230522_160119_119657_6F8706A0 X-CRM114-Status: GOOD ( 13.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Using fixed partitions is recommended way how to describe QSPI. Also add label for qspi flash memory to be able to reference it in future. Signed-off-by: Michal Simek --- (no changes since v1) --- .../boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 169 +++++++++--------- 1 file changed, 88 insertions(+), 81 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts index 84e18fdce775..dfd1a18f5a10 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts @@ -127,87 +127,94 @@ spi_flash: flash@0 { /* MT25QU512A */ spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; spi-max-frequency = <40000000>; /* 40MHz */ - partition@0 { - label = "Image Selector"; - reg = <0x0 0x80000>; /* 512KB */ - read-only; - lock; - }; - partition@80000 { - label = "Image Selector Golden"; - reg = <0x80000 0x80000>; /* 512KB */ - read-only; - lock; - }; - partition@100000 { - label = "Persistent Register"; - reg = <0x100000 0x20000>; /* 128KB */ - }; - partition@120000 { - label = "Persistent Register Backup"; - reg = <0x120000 0x20000>; /* 128KB */ - }; - partition@140000 { - label = "Open_1"; - reg = <0x140000 0xC0000>; /* 768KB */ - }; - partition@200000 { - label = "Image A (FSBL, PMU, ATF, U-Boot)"; - reg = <0x200000 0xD00000>; /* 13MB */ - }; - partition@f00000 { - label = "ImgSel Image A Catch"; - reg = <0xF00000 0x80000>; /* 512KB */ - read-only; - lock; - }; - partition@f80000 { - label = "Image B (FSBL, PMU, ATF, U-Boot)"; - reg = <0xF80000 0xD00000>; /* 13MB */ - }; - partition@1c80000 { - label = "ImgSel Image B Catch"; - reg = <0x1C80000 0x80000>; /* 512KB */ - read-only; - lock; - }; - partition@1d00000 { - label = "Open_2"; - reg = <0x1D00000 0x100000>; /* 1MB */ - }; - partition@1e00000 { - label = "Recovery Image"; - reg = <0x1E00000 0x200000>; /* 2MB */ - read-only; - lock; - }; - partition@2000000 { - label = "Recovery Image Backup"; - reg = <0x2000000 0x200000>; /* 2MB */ - read-only; - lock; - }; - partition@2200000 { - label = "U-Boot storage variables"; - reg = <0x2200000 0x20000>; /* 128KB */ - }; - partition@2220000 { - label = "U-Boot storage variables backup"; - reg = <0x2220000 0x20000>; /* 128KB */ - }; - partition@2240000 { - label = "SHA256"; - reg = <0x2240000 0x40000>; /* 256B but 256KB sector */ - read-only; - lock; - }; - partition@2280000 { - label = "Secure OS Storage"; - reg = <0x2280000 0x20000>; /* 128KB */ - }; - partition@22A0000 { - label = "User"; - reg = <0x22A0000 0x1d60000>; /* 29.375 MB */ + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "Image Selector"; + reg = <0x0 0x80000>; /* 512KB */ + read-only; + lock; + }; + partition@80000 { + label = "Image Selector Golden"; + reg = <0x80000 0x80000>; /* 512KB */ + read-only; + lock; + }; + partition@100000 { + label = "Persistent Register"; + reg = <0x100000 0x20000>; /* 128KB */ + }; + partition@120000 { + label = "Persistent Register Backup"; + reg = <0x120000 0x20000>; /* 128KB */ + }; + partition@140000 { + label = "Open_1"; + reg = <0x140000 0xC0000>; /* 768KB */ + }; + partition@200000 { + label = "Image A (FSBL, PMU, ATF, U-Boot)"; + reg = <0x200000 0xD00000>; /* 13MB */ + }; + partition@f00000 { + label = "ImgSel Image A Catch"; + reg = <0xF00000 0x80000>; /* 512KB */ + read-only; + lock; + }; + partition@f80000 { + label = "Image B (FSBL, PMU, ATF, U-Boot)"; + reg = <0xF80000 0xD00000>; /* 13MB */ + }; + partition@1c80000 { + label = "ImgSel Image B Catch"; + reg = <0x1C80000 0x80000>; /* 512KB */ + read-only; + lock; + }; + partition@1d00000 { + label = "Open_2"; + reg = <0x1D00000 0x100000>; /* 1MB */ + }; + partition@1e00000 { + label = "Recovery Image"; + reg = <0x1E00000 0x200000>; /* 2MB */ + read-only; + lock; + }; + partition@2000000 { + label = "Recovery Image Backup"; + reg = <0x2000000 0x200000>; /* 2MB */ + read-only; + lock; + }; + partition@2200000 { + label = "U-Boot storage variables"; + reg = <0x2200000 0x20000>; /* 128KB */ + }; + partition@2220000 { + label = "U-Boot storage variables backup"; + reg = <0x2220000 0x20000>; /* 128KB */ + }; + partition@2240000 { + label = "SHA256"; + reg = <0x2240000 0x40000>; /* 256B but 256KB sector */ + read-only; + lock; + }; + partition@2280000 { + label = "Secure OS Storage"; + reg = <0x2280000 0x20000>; /* 128KB */ + }; + partition@22A0000 { + label = "User"; + reg = <0x22A0000 0x1d60000>; /* 29.375 MB */ + }; }; }; };