From patchwork Wed Nov 4 15:52:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1394180 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=VhJWhkSh; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CRB8x0Y4lz9sRR for ; Thu, 5 Nov 2020 02:56:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730839AbgKDP43 (ORCPT ); Wed, 4 Nov 2020 10:56:29 -0500 Received: from mail-db8eur05on2122.outbound.protection.outlook.com ([40.107.20.122]:47808 "EHLO EUR05-DB8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730832AbgKDPwp (ORCPT ); Wed, 4 Nov 2020 10:52:45 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L9uEGzn/7h0cZ02XL61l/0Shu8GY8eDeVIfT50tLzIZGCv3tDSYQ8eO7wCrwW4PnRRKFujEZPaB2SJ/pJoe2z/MZE/ZQ5u7vKcdAhvd8xNc2FGq2Nz+dgyXrdYZJkeRS5gwvl82885MuIt1g1rKN0Q447P8O+xCr8DUZd9Ayeil/6o5KhrpNPGAxGazNb7wwKwehEcbpMTWC+NIDPULhlUOerTDPV13wum4LWtRWFNXqDsla/qAMCASVdNX8l0mEqNSno++bEMuN5G2jIsE55RM/mKxmlQh/uKwcF0rrjKiAtfusm9K5sk2Slcwkbs7NIHayqumuaiiuxVUFWqPrNA== 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-SenderADCheck; bh=J+AHlxDp/2rLfOqNx3TEGg5cFQmh1rhD6yRpxO8B3gA=; b=FjpEXdkubsFhO9rlSJuE7pOr6nz5rqBgvEgE5H4jm85FPeYMs+iSn7z13BfrTWoaq6RtJAxt/XYSVvIs5+C0/i2850rnL1LliYVdrILO0JWmQ3gfhNV27/rz1LsjjM/wxfndSoi4iRbutX1/Ylo5tGn3XYS+GB3GDljoSdEyJLdSLEmwDBl+ick8KKbAa+racG9b+eHF7MnJ0y6E9tmYegvbu/+1MOgSTrusX3QojMcOYKEpezr7z3XLtDFFgNLRnRQBhzXDs8IMfiLzM1vN16WI0brVpxqhT3eFGZTV8BAdtOGnU7Wzocl23vlNQa/Aiofq4YDDhnkkkvKTR4JB8A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=voleatech.de; dmarc=pass action=none header.from=voleatech.de; dkim=pass header.d=voleatech.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=voleatech.de; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=J+AHlxDp/2rLfOqNx3TEGg5cFQmh1rhD6yRpxO8B3gA=; b=VhJWhkShZepR2IseFvRQbpw/9bj5Bp/YNVpKfoHdieGWEx364SoHr2l6ej+dBoeucDWKCVHxfdUg6Zb8IVaWTMiHD14/Kgv27hiM7MzU6/rhwNX6IILm7hJ9OAQGRP8cv882N2ZkQqtjGYF3IeoaFDLhnoR5bzWszElaRuVTDig= Authentication-Results: kernel.dk; dkim=none (message not signed) header.d=none;kernel.dk; dmarc=none action=none header.from=voleatech.de; Received: from AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) by AM8PR05MB7522.eurprd05.prod.outlook.com (2603:10a6:20b:1c4::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.27; Wed, 4 Nov 2020 15:52:41 +0000 Received: from AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4]) by AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4%7]) with mapi id 15.20.3499.032; Wed, 4 Nov 2020 15:52:41 +0000 From: sven.auhagen@voleatech.de To: axboe@kernel.dk, hdegoede@redhat.com, robh+dt@kernel.org, tglx@linutronix.de, maz@kernel.org, gregory.clement@bootlin.com Cc: linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, jason@lakedaemon.net, andrew@lunn.ch, rjw@rjwysocki.net, viresh.kumar@linaro.org, antoine.tenart@bootlin.com, maxime.chevallier@bootlin.com, thomas.petazzoni@bootlin.com, miquel.raynal@bootlin.com Subject: [PATCH v2 1/9] ata: ahci: mvebu: Rename a platform data flag Date: Wed, 4 Nov 2020 16:52:29 +0100 Message-Id: <20201104155237.77772-2-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201104155237.77772-1-sven.auhagen@voleatech.de> References: <20201104155237.77772-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (109.193.235.168) by AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Wed, 4 Nov 2020 15:52:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 91b3b023-144b-4096-9bdd-08d880d9a980 X-MS-TrafficTypeDiagnostic: AM8PR05MB7522: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zpqf3EGaW54+CPUExLD0MpTz2ZqNNkqk64JBlFpopnqWpKC7bEl/TvtJ1shTrhSxeTjJueGWcjlv5clDr7O1mLQY2Ra9uIuRSLwyUDZCzVPNQl7xvHgCphXPaYEdLDJxiKY/9Da9e2iyzqOHWbSrcNSjUH1CfwyxHEkoS6V2leWuLbjpPKqmnq9zLxOPw+8JqsfWN8+iyGnMtiRTYVCpXX7ymNi5UkFdxymsx6YgffhUS2xFVYNPNQjITTRpD4cvTiGkpXJy56nxFzLEpYxPNaZlVbd6t1WCE4yhbcq/itP5AD+6rGwR8vdXOQoyByOJ7uOvZOXZeWW87V9E1DnHjMXn9OFc2l8pZVHxrDy/OzgCGqkrjAH2WbbBTbtzDUzl X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8PR05MB7251.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(396003)(376002)(346002)(136003)(39830400003)(26005)(8676002)(36756003)(956004)(83380400001)(2616005)(86362001)(186003)(69590400008)(16526019)(1076003)(4326008)(66476007)(66556008)(52116002)(2906002)(6506007)(6666004)(316002)(8936002)(5660300002)(9686003)(478600001)(6512007)(7416002)(66946007)(6486002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: pPNywJ3yC8nrOwVCJo105ZkCE8HdJ03VkSt/hUlZ3wJ2gLFeLl6Y68trMmZ4BzfNvvHfB8uHUhU+/l0tSONvJUILewzqdNzQZRjfmG5ovlqPm2hleS4s0oX+2u2dbi6wIEyRJ/cTIWbe3skOM+SRxRcdKcdHzhdjf/jRdak6VhXXkeoNrCLXIRrQB4xqDug4abMH3XpOgT7wwCjQcC7c2dORw3Huuw02FCx8CyELGyTGNHnB077rTD8ZIn5OLrsUJJMbWJVBnjcfHIUWRamiV9M613xteJi/FK/JNlSzBg1KngCzQuyO8NFsTjTaigQRrfNrge1fGG3Xp/KJBsXGquOO+PlzpPRAXv4cZbf99P/3EPJK816JffwcZMxTrNeMA+k/fSbTUJJvGInFPzRyk9z2+xhTlIETb9nK/MYhUhM2QIUSBY/NmzDqxjz30A+Tps7qcJoijPwqPnVSDDHjOVA4nltdQD+a2Xl/WCmJ7zrueML9UP2pYpd9krmEIqkk8T2Sb4Wor8gFJA15xtprlzgj2NIamofVRzebzLGzNXCvZzh2xrwr+PYeactXUYzHL+oN3t6hZ8A9sxzMGwn/OwLNMN63Va6N/7awvbvko9qRuWGIhhW1dg183XdMhks5UXwE9l6hi/d6txHbl0Nq4Q== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 91b3b023-144b-4096-9bdd-08d880d9a980 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2020 15:52:41.4151 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b82a99f6-7981-4a72-9534-4d35298f847b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3CxfhG7TRDTZU0FpCBCekYoLxhvdIGmXbjsDQX7Edm34fLhEb2PQgDdoyxKEG8adLJkTGxA51/vXVy+qffPoxqcKuAEGbKKv4UEx5snkJmY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR05MB7522 Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Miquel Raynal Before adding more entries in the platform data structure, rename the flags entry to be more precise and name it host_flags. Reviewed-by: Hans de Goede Signed-off-by: Sven Auhagen Signed-off-by: Miquel Raynal --- drivers/ata/ahci_mvebu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c index 3ad46d26d9d5..563cc4c64d96 100644 --- a/drivers/ata/ahci_mvebu.c +++ b/drivers/ata/ahci_mvebu.c @@ -30,7 +30,7 @@ struct ahci_mvebu_plat_data { int (*plat_config)(struct ahci_host_priv *hpriv); - unsigned int flags; + unsigned int host_flags; }; static void ahci_mvebu_mbus_config(struct ahci_host_priv *hpriv, @@ -196,7 +196,7 @@ static int ahci_mvebu_probe(struct platform_device *pdev) if (IS_ERR(hpriv)) return PTR_ERR(hpriv); - hpriv->flags |= pdata->flags; + hpriv->flags |= pdata->host_flags; hpriv->plat_data = (void *)pdata; rc = ahci_platform_enable_resources(hpriv); @@ -227,7 +227,7 @@ static const struct ahci_mvebu_plat_data ahci_mvebu_armada_380_plat_data = { static const struct ahci_mvebu_plat_data ahci_mvebu_armada_3700_plat_data = { .plat_config = ahci_mvebu_armada_3700_config, - .flags = AHCI_HFLAG_SUSPEND_PHYS | AHCI_HFLAG_IGN_NOTSUPP_POWER_ON, + .host_flags = AHCI_HFLAG_SUSPEND_PHYS | AHCI_HFLAG_IGN_NOTSUPP_POWER_ON, }; static const struct of_device_id ahci_mvebu_of_match[] = { From patchwork Wed Nov 4 15:52:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1394146 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=N/8dwyMq; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CRB4g1tqNz9sVN for ; Thu, 5 Nov 2020 02:52:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730976AbgKDPwt (ORCPT ); Wed, 4 Nov 2020 10:52:49 -0500 Received: from mail-db8eur05on2122.outbound.protection.outlook.com ([40.107.20.122]:47808 "EHLO EUR05-DB8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730948AbgKDPws (ORCPT ); Wed, 4 Nov 2020 10:52:48 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XnrtbvusQpGFsQRyyiZXPUpVJq6KqL8DBBAlNxIiQ+/P21L6GyLIIJt3+2dqaRG87Ttfh0wIaIQYc4VtQ6hBnzvl8aYQ55/A11ORC83HCk2xiBx7zl5mEYSgV/NEeUfNRr2shb1ldzbWPiMluUYYCLxCkIINHTjh3jjQdpWxW409dfgco0wJYbre3kag57VR45T3dYBiHbQjyZ4TMaC7L0NqpKyEt9Ve3XucVpfAoUf4tN/BditgyF/JxuUFrNXgBmy1TL1jUl4l6ryWvwol5s0S2SfpOwSQDW9eoo4FjQD9OU1rMF+0mlnyT/8j/E2fDQvcpLORm/8Ni8aHUq8DZw== 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-SenderADCheck; bh=mj1Yu68StHzQhJMmJfnXSW8cIOerkdvHJ9nucUCe4tc=; b=UJZEE9bg5xwdLAVI2ZVCW4YXqIQtHLTvGn36bU3OTWz4yymJQMi9dzojKaRjF+bSeWcbzDk/J34y211ragWLJcpQE1L1rEUuthotUe/AScmEYBhXMM9VzlAyrZhVZd5Z0Ss0Cqd2ptfF5N2dHoyvHXf0Suj8p7i4TYRbpVYgSDwDCrrGtXrEcGZeRZY7i6wPVcKUWsqCejKdTLlk481IC6gQDjV8/yVohgWKhqNgB+8I+EeTpornpdrConk5KeB7vawywNaBCyEp6YXtOFgzOyYGuRGGvv5seQNsl2kYn9GAKIf2Z0vxkuv+vyyraAvuinIHt8RHT6CCwjwaF2npVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=voleatech.de; dmarc=pass action=none header.from=voleatech.de; dkim=pass header.d=voleatech.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=voleatech.de; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mj1Yu68StHzQhJMmJfnXSW8cIOerkdvHJ9nucUCe4tc=; b=N/8dwyMqwXrMZJG9hxO7WbhaINQ9+n0d0r0pW9JBVDwIFfk6smCBuI8tAQxaccObcHo7YYSu+iO2aDaXkyNVG+A6u/GochcQbkZyOqYJirPADS3ygNXAmOqzv6qhn4JECGdRA0YuPS7OA9S6JuqH26tw0mR1s+zpXGlcFLelO48= Authentication-Results: kernel.dk; dkim=none (message not signed) header.d=none;kernel.dk; dmarc=none action=none header.from=voleatech.de; Received: from AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) by AM8PR05MB7522.eurprd05.prod.outlook.com (2603:10a6:20b:1c4::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.27; Wed, 4 Nov 2020 15:52:42 +0000 Received: from AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4]) by AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4%7]) with mapi id 15.20.3499.032; Wed, 4 Nov 2020 15:52:42 +0000 From: sven.auhagen@voleatech.de To: axboe@kernel.dk, hdegoede@redhat.com, robh+dt@kernel.org, tglx@linutronix.de, maz@kernel.org, gregory.clement@bootlin.com Cc: linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, jason@lakedaemon.net, andrew@lunn.ch, rjw@rjwysocki.net, viresh.kumar@linaro.org, antoine.tenart@bootlin.com, maxime.chevallier@bootlin.com, thomas.petazzoni@bootlin.com, miquel.raynal@bootlin.com Subject: [PATCH v2 2/9] ata: ahci: mvebu: Support A8k compatible Date: Wed, 4 Nov 2020 16:52:30 +0100 Message-Id: <20201104155237.77772-3-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201104155237.77772-1-sven.auhagen@voleatech.de> References: <20201104155237.77772-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (109.193.235.168) by AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Wed, 4 Nov 2020 15:52:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a84d3b52-653f-4176-eae2-08d880d9a9f9 X-MS-TrafficTypeDiagnostic: AM8PR05MB7522: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nXNjcrtctgz+dhyNTYo4PzACXQbdBWDgki1JjIsqMVwimqTwh3jvTsDqXcY9T+EjjGJJXG7hrRShQWXVI3KcYypjrbIVneARu3TpZCyQ0eAQQehv7GQlRSg+ss12+C+W+pcTQTJ8kuvuYdfQNvJBclVZSy1wsege6uAGtEt6bfmz3kSHvow/5Z+6Bo1fTTvbfUcOia2GcAM/XFynMe2gXFADbs9A5SXe88+y0tb/7oKUBVevKGLbBDBJk9eJrtWDmiu8lhWylfkcUtlDhI4rOhN1oJNvTJY/2GKhbonS6TSnj7UTQsC/YTQ57j0b5LKt5aPoMuOuGhyBsA7lZI5N46I35Wq4KUFzvzc4mMvS7S/n1d92ZoKtfc7yUVAlP/Nz X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8PR05MB7251.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(396003)(376002)(346002)(136003)(39830400003)(26005)(8676002)(36756003)(956004)(83380400001)(2616005)(86362001)(186003)(69590400008)(16526019)(1076003)(4326008)(66476007)(66556008)(52116002)(2906002)(6506007)(6666004)(316002)(8936002)(5660300002)(9686003)(478600001)(6512007)(7416002)(66946007)(6486002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: qMSnk/K+a/3BAVoTmwr1oh+i0iOA+zLbisavU8HeenbPBkLxG34cdpSIkAbdb7YlDA1mqAL+PfdMOQ8cuyAuCopTnE4MPSMGwCfApKJprAlR2y7LfqqhanGSwjw4TezKYk2OOp18KtUjMhP4McvIpXTor5uSEmvHbG1cjwU0WuBSdoYGhDFFZWHcL8sIG65NObcjpvdmUyz1OxxYSxu2UXv9zyTAZgFS3vrP3D03w7l2aIltOXRzv02qP/mJFmGdJjVgIuxFEU33Wo6QmenZQW2GQEINOnTIq+Rjz7lerONQRpQH5iflV2E6niVZvfudz0r4fuCnBOhFXxF0oNCIdP2ZwAcCK/8QQMH+e/XE5AOdJSC6tnas83v7B8qHkS8hN2vykulVmIb7nSuSJuYOrrh7Y2aIA0fP+jyvngrS7L/OdbOJeDtV9Zoju+On6d0NWLayqQQNglAAzXvZsuOIoERzDtTIQxmc03B7LcQ+oCMc95yyvsELEYhECuwmONC5K5Fw3ekBKHEyGUI6of+zVkKMykuv9uAyZfoAeNYkPasuTO0QOQQT6fsHRr4pCYf7fskDS8m/11TslwfXLp+NFOQgl8CPwwYFouq+8TMPoX61KDRamtSLjugLgZq7X1eumVbVIy/GPrbPp2kb/rBGBA== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: a84d3b52-653f-4176-eae2-08d880d9a9f9 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2020 15:52:42.2639 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b82a99f6-7981-4a72-9534-4d35298f847b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gbyBPo+iXnh/NQvZUknEwCOu/10DQy91bKX8jOkIpUeWUMkrxL6unMfQjA3YKjHP7YGh90jems4Q9Pz2LtdgY9eogiv1IVHB1wu+7rslwLk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR05MB7522 Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Miquel Raynal The ahci_platform.c driver was historically the one bound to the A8k AHCI compatible string, but before adding a quirk for this compatible, it is probably cleaner to put all Marvell EBU code in one place: the ahci_mvebu.c driver. Reviewed-by: Hans de Goede Signed-off-by: Sven Auhagen Signed-off-by: Miquel Raynal --- drivers/ata/ahci_mvebu.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c index 563cc4c64d96..ed82381dc4a7 100644 --- a/drivers/ata/ahci_mvebu.c +++ b/drivers/ata/ahci_mvebu.c @@ -96,6 +96,11 @@ static int ahci_mvebu_armada_3700_config(struct ahci_host_priv *hpriv) return 0; } +static int ahci_mvebu_armada_8k_config(struct ahci_host_priv *hpriv) +{ + return 0; +} + /** * ahci_mvebu_stop_engine * @@ -230,6 +235,10 @@ static const struct ahci_mvebu_plat_data ahci_mvebu_armada_3700_plat_data = { .host_flags = AHCI_HFLAG_SUSPEND_PHYS | AHCI_HFLAG_IGN_NOTSUPP_POWER_ON, }; +static const struct ahci_mvebu_plat_data ahci_mvebu_armada_8k_plat_data = { + .plat_config = ahci_mvebu_armada_8k_config, +}; + static const struct of_device_id ahci_mvebu_of_match[] = { { .compatible = "marvell,armada-380-ahci", @@ -239,6 +248,10 @@ static const struct of_device_id ahci_mvebu_of_match[] = { .compatible = "marvell,armada-3700-ahci", .data = &ahci_mvebu_armada_3700_plat_data, }, + { + .compatible = "marvell,armada-8k-ahci", + .data = &ahci_mvebu_armada_8k_plat_data, + }, { }, }; MODULE_DEVICE_TABLE(of, ahci_mvebu_of_match); From patchwork Wed Nov 4 15:52:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1394176 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=SdBhv5wT; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CRB8g2KDsz9sRR for ; Thu, 5 Nov 2020 02:56:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730525AbgKDP4R (ORCPT ); Wed, 4 Nov 2020 10:56:17 -0500 Received: from mail-db8eur05on2122.outbound.protection.outlook.com ([40.107.20.122]:47808 "EHLO EUR05-DB8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730972AbgKDPwv (ORCPT ); Wed, 4 Nov 2020 10:52:51 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O8m82ojk4T2qbgtzrNlpwOZMVqbJq9vOaDEdUPuj1m0lvXCncRXaQ0YL0ZsSW6PgN0WQ1hheRPH+RZ18yARkcGR5S75WHwRUx0fpUaQmtsnxVt0WdjDYrU3iS2tsDyiahGW88CZaxuFJoteIF9jvMHaj+0G6E+mBmuTio1yfu/QmcnV4glzduFvjGpS6qU9wW3XgoY9byzwHVYZrJBLI6ZuhbcakhBXV/WJE3kY6pHEcmjNi03fmrKVKKLdGtHQhurxM+VkybCGFc4AHOl8qwoh7/NRiyFSm9XEWDfU9peklL9KM/tPk+W/+LTjPsqosTI3psR10xv7zOwB0Qjw51w== 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-SenderADCheck; bh=wGh8gm4fxG7CPEVbuaNZ529cl9J5n29Ky6yFdYxE6JI=; b=EEWnHyHvGz1Z0pD5QrB3hRlQpYqtPEYQ4G3JAv/EsVN0e+vPlDqVKcrcp1X/2U3SGGYPdq1MGFlL9DOeENmNwLMJACMFo2kC97bFOsp//9pTVlICeiKbbKYAj+Mm9OjL13vDMuk665bLbBMQkZkPqDrbVyvafiRFwJ6+SxVFBCMBqJAhSrJJzYtCvZjP7ZxPg4DnUEEZ6xVvEIIEtBnqUZ8fbNb2zFAi1+U8YrQ6A7EPQfrB/46zVpAL7WfQ/TgW3BvfRZPoquxcqT4r8qSzcXVFEIsrYb+mFcuKURfMqv+8gk5nCgf7zeNS9tz86/sH2VGrkBSQ4oI3YRTwtNdgbQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=voleatech.de; dmarc=pass action=none header.from=voleatech.de; dkim=pass header.d=voleatech.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=voleatech.de; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wGh8gm4fxG7CPEVbuaNZ529cl9J5n29Ky6yFdYxE6JI=; b=SdBhv5wTiEGKMt+xFj5+Z8RJsLSrLAS90T5YKiImIWTLcuRRcQVFeNkDD6FjpfRPIcRofizRZUzoRnErmMhsKo7V1P/lekBrSELdCzEhffW8iAyJkBPrNQZbyOTgQutGHzIQ8vBpA0UwaNz0c9QHa3pVg2CRl9/AG4yIucXxGek= Authentication-Results: kernel.dk; dkim=none (message not signed) header.d=none;kernel.dk; dmarc=none action=none header.from=voleatech.de; Received: from AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) by AM8PR05MB7522.eurprd05.prod.outlook.com (2603:10a6:20b:1c4::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.27; Wed, 4 Nov 2020 15:52:43 +0000 Received: from AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4]) by AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4%7]) with mapi id 15.20.3499.032; Wed, 4 Nov 2020 15:52:43 +0000 From: sven.auhagen@voleatech.de To: axboe@kernel.dk, hdegoede@redhat.com, robh+dt@kernel.org, tglx@linutronix.de, maz@kernel.org, gregory.clement@bootlin.com Cc: linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, jason@lakedaemon.net, andrew@lunn.ch, rjw@rjwysocki.net, viresh.kumar@linaro.org, antoine.tenart@bootlin.com, maxime.chevallier@bootlin.com, thomas.petazzoni@bootlin.com, miquel.raynal@bootlin.com Subject: [PATCH v2 3/9] ata: ahci: custom irq init for host init Date: Wed, 4 Nov 2020 16:52:31 +0100 Message-Id: <20201104155237.77772-4-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201104155237.77772-1-sven.auhagen@voleatech.de> References: <20201104155237.77772-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (109.193.235.168) by AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Wed, 4 Nov 2020 15:52:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8035cf02-f4b0-43f0-bf36-08d880d9aa80 X-MS-TrafficTypeDiagnostic: AM8PR05MB7522: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: agSk88d3ncHcPqM15aGwdqetfa8bm1UrFdIpuCCSHSoKcy9VJJzLMJxFtkaFtOVLui2Cs6vO3l2mBdLR1ydEVGzc1JJKuQP5ZNfgEnHywmyayFmHuXO0nllFUtXVdG6nqKlJQ4UPLkRdmifUILY435LK413a3n4IrhX0fv2UasVDTPniqQoWigPiLNYTdNrpfeFN/Y9kTeIZMM7P/sZcpVcPe0GO6qVX25oPZPqH9gkF3DMBvVu1NurwIACTd3L6Qo/YO1qjKhRgJNPVPZqpCLlyrtHpQHNWFbgTfZjVnzivMDWxzGLy/Y4ZvTFiOBcv58g0CXNR/c8sKMIig6/aF4PG6NbyP4naazucMaAjG+QeCeKluF668jhNZayTJ9i0 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8PR05MB7251.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(396003)(376002)(346002)(136003)(39830400003)(26005)(8676002)(36756003)(956004)(83380400001)(2616005)(86362001)(186003)(69590400008)(16526019)(1076003)(4326008)(66476007)(66556008)(52116002)(2906002)(6506007)(6666004)(316002)(8936002)(5660300002)(9686003)(478600001)(6512007)(7416002)(66946007)(6486002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: EVs8g/cjZOlpRSnUX5qBClmf/bb3q9K4oA5Pz88We3sdBqLhzdl70wGayltiPD/dacKIij11IdGmA0Eofkw8JgXh8lKiU1aCZTwM+aPS++MacU/6+EEDdgk8Iiuho13UW8OcmP9gOaa3EZ9XVPLX30btNOnLvEiRba3kI8EC32VVffT+5CjP243U1REaP56GniKl992AKcKmWo2/YgvNqeR/c759BtsC3YN1sDf+xJ7sZJXdsPdEChW7Y5zpCc+g+OqXgfM+KDl20uywEUiReIYj97hNZXRaggvqO5KhQ/wVymDU9K0ATyWO4eeNnKLl6H1sgYsKvcevpRZIKNBe4cYkCMCENc7ib0m/tz5+6Ni4JhFud5cKtFckyIKKKKpdRQu6ij0DHLna1kDn9/8OPtMnCFfxoL+Saq83agrrIsbbU5o8qU63Mjgdru6K1uBQU1clUJ9dQeChCYmtcL+GxMuZ/Y+jLqqZZBzFiWLoImMhZtt9J/mV07SbXlz4g23mgnYFp3wpPue7BdQkxfHIcT0+kqUX//k+GoQ2IXO9CzFrMTuGnis9EqdkYPSserJwshk/wWg6+GceP7xqCwCAXssVj8HrrTgBn2Z1N1aM5u+wsuyGbDdwrLJiXko2QaA4SQYbkdEKEdc8ph28Hgf6eQ== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 8035cf02-f4b0-43f0-bf36-08d880d9aa80 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2020 15:52:43.0992 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b82a99f6-7981-4a72-9534-4d35298f847b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dfC8YBeqOernBWwy8I8X9wMAxsyr6SFXJZFPR1qSGcFykNPEwBPzRot9xPnMSevjqi/rD0Vqfip+sTxsI9SwMFoj2pbSstT/lS5TjVhu4no= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR05MB7522 Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Sven Auhagen Disable the platform irq init in ahci init platform host if it was initiated by a custom function. To check for it I am using the AHCI_HFLAG_MULTI_MSI flag. Suggested-by: Hans de Goede Signed-off-by: Sven Auhagen Reviewed-by: Hans de Goede --- drivers/ata/libahci_platform.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c index de638dafce21..f6f2a111d226 100644 --- a/drivers/ata/libahci_platform.c +++ b/drivers/ata/libahci_platform.c @@ -581,14 +581,16 @@ int ahci_platform_init_host(struct platform_device *pdev, struct ata_host *host; int i, irq, n_ports, rc; - irq = platform_get_irq(pdev, 0); - if (irq <= 0) { - if (irq != -EPROBE_DEFER) - dev_err(dev, "no irq\n"); - return irq; - } + if (!(hpriv->flags & AHCI_HFLAG_MULTI_MSI)) { + irq = platform_get_irq(pdev, 0); + if (irq <= 0) { + if (irq != -EPROBE_DEFER) + dev_err(dev, "no irq\n"); + return irq; + } - hpriv->irq = irq; + hpriv->irq = irq; + } /* prepare host */ pi.private_data = (void *)(unsigned long)hpriv->flags; From patchwork Wed Nov 4 15:52:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1394174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=NshuNQiG; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CRB8Y0p9jz9sRR for ; Thu, 5 Nov 2020 02:56:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730395AbgKDP4L (ORCPT ); Wed, 4 Nov 2020 10:56:11 -0500 Received: from mail-eopbgr10117.outbound.protection.outlook.com ([40.107.1.117]:28320 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730975AbgKDPwy (ORCPT ); Wed, 4 Nov 2020 10:52:54 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qwwn+iKCdIadtIrbUzWUBHCk4GRAsB2b24giNsJu21FgzADI3x0wTGB86YCoE6AFHB/LlTeBoSP/oYz1GW20wqdXd0DgqJBJMW3VCjMeU5asL5saxowgQAgQv8l5RLHHRSijazqgR9jZDD4X1RkOfNek22h5b44+C1P93FcnfUXCrFt0RlYcfDV8EkskKD/ztgR8CEV05L4waCbqCbbxwJb0OMMkI+mlbqOP2AcgodPd/9P26RHy6zDt1kA3GkO9VU6299Ar0oBRklLnqhAM4EF/PwH469NXaS5NkAOoLOdEfI1WbzFXtRip09pcKahtK0uemzQEx6amF9ewDvoJkw== 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-SenderADCheck; bh=+/3aCpme5/jOiY35WdC6yZmN76DTALab744ujxwEEUk=; b=JMER1w/EdUYxSzYXHu/RwRocGV4uWmWAPaeZDx/ITauOefMHVX/Wqpm0BTULk/utKr5l6QU4hfi1gdmXDTUkB3/FlahnNMzBAGFLJo8iZI23XCj4t5dq5badS4WKgKwf5cx1JtQOJ7WHgD8TZuLRYgaDFKNSrITTbJfU5PI7sr8KVxDKMUjw91NKosTq+ZQbRR6RP8rg63oBR5YDiaWW0HHqeAB60+h/MVL+WVf41xLUqz6AZTEPtso747pg/koGZHbupSsdIATanEYLvTykEvli4/ly3gjRuL9ObHmDbYDppa+g6NCaF0O9Ch+GRWXcEw803rqN6Dkvayuj31A6NQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=voleatech.de; dmarc=pass action=none header.from=voleatech.de; dkim=pass header.d=voleatech.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=voleatech.de; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+/3aCpme5/jOiY35WdC6yZmN76DTALab744ujxwEEUk=; b=NshuNQiGGbIFhka1nWtPSLciYdU3iTbrexlNxWSGB5zHD6enG2lsmo5HY/PprSw6alY9qwjvFujBh0c0V0NMZQW/HEVnS4fcwvjnPnuHiMXPnpeyRFnWaZ2eEJt12fLaC9S33gnZX3EyOBJ2GLJlTyVPP5q/pWXgVd+g933xW3Y= Authentication-Results: kernel.dk; dkim=none (message not signed) header.d=none;kernel.dk; dmarc=none action=none header.from=voleatech.de; Received: from AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) by AM0PR05MB5075.eurprd05.prod.outlook.com (2603:10a6:208:d0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.29; Wed, 4 Nov 2020 15:52:44 +0000 Received: from AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4]) by AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4%7]) with mapi id 15.20.3499.032; Wed, 4 Nov 2020 15:52:44 +0000 From: sven.auhagen@voleatech.de To: axboe@kernel.dk, hdegoede@redhat.com, robh+dt@kernel.org, tglx@linutronix.de, maz@kernel.org, gregory.clement@bootlin.com Cc: linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, jason@lakedaemon.net, andrew@lunn.ch, rjw@rjwysocki.net, viresh.kumar@linaro.org, antoine.tenart@bootlin.com, maxime.chevallier@bootlin.com, thomas.petazzoni@bootlin.com, miquel.raynal@bootlin.com Subject: [PATCH v2 4/9] ata: ahci: add ack callback to multi irq handler Date: Wed, 4 Nov 2020 16:52:32 +0100 Message-Id: <20201104155237.77772-5-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201104155237.77772-1-sven.auhagen@voleatech.de> References: <20201104155237.77772-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (109.193.235.168) by AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Wed, 4 Nov 2020 15:52:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ccbed9be-2453-45ee-1208-08d880d9ab0b X-MS-TrafficTypeDiagnostic: AM0PR05MB5075: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eOrwWKI0+0M8Q/c5JsVeendS4jMa26u08jVZHb8tfaTho/tzS6sRUs7yWFQljCjRGG77QIf5tMdvWw/bJc9Uc9oP45/uQr82HruqK/XZgiVQjeLhzsHnezyrzJCWBd0GpXR6pvmIvZM7rLRkh1f0gmSPMfNtDQXWRzRltAEv6kWKlcP94Lsd5WF5ojw7XO8dFu9052Z3skwzhjR7idk6iOSvgVvDoUK/ZwslfdWZ35qOg5apZHgXYle8/1gYqezlh0gM0EoYguNQQ7Q8m+DeEnXCJSvfxxsi1HV24wDxT8Py4vD01dcE8DYFzqkMZpyo66jmNY7dI23oIsma2Dqxp2Pz10wFe5+GBlbbR6b7utEp2yIjilNJn3jgnu6kzJri X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8PR05MB7251.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39830400003)(346002)(376002)(136003)(396003)(366004)(8676002)(956004)(2906002)(52116002)(6666004)(316002)(4326008)(2616005)(5660300002)(8936002)(1076003)(6486002)(478600001)(66476007)(66556008)(6512007)(83380400001)(9686003)(66946007)(86362001)(186003)(36756003)(7416002)(16526019)(26005)(69590400008)(6506007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: v7u1a3W3RGIvQW/gXvRs3tA8GPpbaCYGC/LRhePGItkaZE6YN+s66dq6zxl8AuFHYM/Pv3brH4wSFbp2oFToFl4+TcA64yK69uqBS3tJgQQz3P8xGKWxF6V+HSQK9VLrtrLKy4pbRA3DRU9eFYDK6dBKfJMpegA0fqRO+Ex+uaX0Byzd053p7f2xxQfHgqOq6abn97bdeugRWXgjCnQdTvXOxZ5EgjQK+HPLcey16eRvyLk18YrDvm/nIlIo8r506Kcs7y0KpuoJu4LimDjaUPuF7DJvBuajIHPZqDYNpeOA7Z5inFB/ZCKqK8LBRIU6He1DOCEYOmhzNbTHyDKBsRzxVWGXi12tChlStu+QBxm79mlbvLm6zSndKHKSY78lG4pfKS3hJQPC1KjnWyD+C5uVdk+3E/rmiz77O1BNKt2c3nYnne1EBWorW/xZSl6Cz8wtTUi4QooICSQULxZjUWuoAvlr+W5urk9AbRlCVwWkCnPnuuerIqyD1ye91YtRFnRO7q2pChEfKlQTwV+Z11gHc9dKXIN9mc4+6iawyF/SdfUIZkzteljxFUusidX0SGDbHcXW1n/Cs68O0BJHrreS08CNpbjkoIEwkpPqzE9igROvOmZBOXo4s/bzOXKsS10jz4RPl+tPIkt3oQ8h8A== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: ccbed9be-2453-45ee-1208-08d880d9ab0b X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2020 15:52:43.9863 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b82a99f6-7981-4a72-9534-4d35298f847b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: em8+jt/aqsoaxOK1j614FfxGLJesvV+jiSORWz02+AoX0jlW3BH3OZZDSTh5RSrhGeg+SHTpIkDs59RLxX6Bj8MRDr9B7ZGGRIfCvZ76Zqo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5075 Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Sven Auhagen In order to support custom actions at the end of the irq handler a multi_irq_host_ack callback is added to the struct ahci_host_priv. Suggested-by: Hans de Goede Signed-off-by: Sven Auhagen Reviewed-by: Hans de Goede --- drivers/ata/ahci.h | 2 ++ drivers/ata/libahci.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 98b8baa47dc5..d8109e06794c 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -371,6 +371,8 @@ struct ahci_host_priv { /* only required for per-port MSI(-X) support */ int (*get_irq_vector)(struct ata_host *host, int port); + + int (*multi_irq_host_ack)(int irq, struct ata_port *ap); }; extern int ahci_ignore_sss; diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index ea5bf5f4cbed..cf9839135a57 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -1897,6 +1897,7 @@ static void ahci_port_intr(struct ata_port *ap) static irqreturn_t ahci_multi_irqs_intr_hard(int irq, void *dev_instance) { struct ata_port *ap = dev_instance; + struct ahci_host_priv *hpriv = ap->host->private_data; void __iomem *port_mmio = ahci_port_base(ap); u32 status; @@ -1909,6 +1910,9 @@ static irqreturn_t ahci_multi_irqs_intr_hard(int irq, void *dev_instance) ahci_handle_port_interrupt(ap, port_mmio, status); spin_unlock(ap->lock); + if (hpriv->multi_irq_host_ack) + hpriv->multi_irq_host_ack(irq, ap); + VPRINTK("EXIT\n"); return IRQ_HANDLED; From patchwork Wed Nov 4 15:52:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1394151 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=JUq5h1Zl; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CRB566630z9sVS for ; Thu, 5 Nov 2020 02:53:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731107AbgKDPxK (ORCPT ); Wed, 4 Nov 2020 10:53:10 -0500 Received: from mail-eopbgr10117.outbound.protection.outlook.com ([40.107.1.117]:28320 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731022AbgKDPw6 (ORCPT ); Wed, 4 Nov 2020 10:52:58 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FVtDe0Krd0KWT59YT9i8yDdxxewZawmdhbLuGPSnckVb481CHDGXxibE5AZ5nGcy6/aiso7sUORYGOR9prnR9/ZMcOU5g5o1Xx7/66mAcfNm5A6VPqMv0ge7uSvuFv00RGOphcn0996CMit+HuXZ+VpoSGyOdJiCGTFY/lCoBbcnDYWpPMEA9MhcetwxFb+wOCQG6ysT/Sp406Ujo33i8zmQffWxHn24f0coktoMwnk+xy5DCLhKp13/saRXLSGhF6XDwp+UTBaPLves69Byn+Kx+pwPwI6ZQiKwZ25i1GTLg3dv1KiAl8zo9kp0biK48BJlRiqIhJsPdZ7jKU+aGg== 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-SenderADCheck; bh=9CR56C2X115IWni2GuD3IcfSIEkIEHaMqH0RVZGOsPw=; b=WRqUZKaCHb0qGHTEKNkfaEdOOLzJh+KUGnGiukMyjyEvklsgFYNVtusEJJrtZ3EK2bBK0lFvONmhK7S6jsAEQJc0yrmVzvGxOMCmAWfua4wcNSNx5c0OxlGyjICBpmjsmEGUqqGuvKXH+D4zCm7KXvxiS2l4XaV+/hChzc3IKp0eTEPTSCQRhFDYoR3wgjx5NQN5IkrLXgXTCT/vemVxe7cxVpvFaGc1Fsdo4BJoZaBBrLOUGR4Jc+LyF1m1nZcSCEvj3BKgCuowfpjTga/af24A+SkP0FR2pEVlj3ait1W4D+Iko4JPEmR81u22PXbnbZd8vMXxhw1w9LpaB8+7qA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=voleatech.de; dmarc=pass action=none header.from=voleatech.de; dkim=pass header.d=voleatech.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=voleatech.de; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9CR56C2X115IWni2GuD3IcfSIEkIEHaMqH0RVZGOsPw=; b=JUq5h1Zlodk5rRvqPBbhRUJDsfWEJ0g8FY+WCaAbT8ykoujVJT621tUP5GtfEJo5EThOeLpDKshImKMA+oIgUJqRuk90cj/RHcII0hQjCcB4qzGyQ/cSLajYpDmLGBptpB5gTztHw+LG8oX4fqwfQ2sOub8oQoREM+uA0F02qiM= Authentication-Results: kernel.dk; dkim=none (message not signed) header.d=none;kernel.dk; dmarc=none action=none header.from=voleatech.de; Received: from AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) by AM0PR05MB5075.eurprd05.prod.outlook.com (2603:10a6:208:d0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.29; Wed, 4 Nov 2020 15:52:45 +0000 Received: from AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4]) by AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4%7]) with mapi id 15.20.3499.032; Wed, 4 Nov 2020 15:52:45 +0000 From: sven.auhagen@voleatech.de To: axboe@kernel.dk, hdegoede@redhat.com, robh+dt@kernel.org, tglx@linutronix.de, maz@kernel.org, gregory.clement@bootlin.com Cc: linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, jason@lakedaemon.net, andrew@lunn.ch, rjw@rjwysocki.net, viresh.kumar@linaro.org, antoine.tenart@bootlin.com, maxime.chevallier@bootlin.com, thomas.petazzoni@bootlin.com, miquel.raynal@bootlin.com Subject: [PATCH v2 5/9] ata: ahci: mvebu: Add support for A8k legacy DT bindings Date: Wed, 4 Nov 2020 16:52:33 +0100 Message-Id: <20201104155237.77772-6-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201104155237.77772-1-sven.auhagen@voleatech.de> References: <20201104155237.77772-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (109.193.235.168) by AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Wed, 4 Nov 2020 15:52:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 85b17d03-8b85-474b-13b1-08d880d9ab90 X-MS-TrafficTypeDiagnostic: AM0PR05MB5075: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:972; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hhdDkQsalEfve1z2bs+cluwJ7J5Qdcr8l5NQLWSOgAXSgK2dadzuvSXqG0cBuvi/grFRaP07JHXpEQliQgF6Oc/DUAnEJe0axWHN+xBWa8NnK0EXiSH8NqbhazrBve/yEF7aO7k7L9E9mlY0CSNA2Zo93c2SONLY0cXdxDRAJDhdCyfzdFlbivVrc0t99Hc54YVrD4XEXUeWoq3SFbJmkjtytxabcE5K/pcf4QtH8ohC1PuHshP+HLFxQKyfwLjobDJkXP/6O/MhfpM0XXXJJGSNEajWkhIa9HvGLCUjfsc6aQEiWatZmN6qryt+kuIzTLllXcHAHUJKkfEyWYrvwx4LAcD6oBNAjo6olzP/TqWo5i5JSs8Mj+Er2bEmuE6m X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8PR05MB7251.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39830400003)(346002)(376002)(136003)(396003)(366004)(8676002)(956004)(2906002)(52116002)(6666004)(316002)(4326008)(2616005)(5660300002)(8936002)(1076003)(6486002)(478600001)(66476007)(66556008)(6512007)(83380400001)(9686003)(66946007)(86362001)(186003)(36756003)(7416002)(16526019)(26005)(69590400008)(6506007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: i0HrvPwj1gVYLEIJPpVO9og/8ECochnbyUBfUzxhkcmFJe0vxx12H7VXRTN0z1O5qqOaz/qIx0Y1Dd8ZDNKxow1OPVT+OBNs+5pb/oLbV9OyRR78uUtByP2j4EK1vu5BObCnDyoPT1+VSlfiJyFA+9pUw3IhykEmNF4KyBCFiHQz96eudwh2hWz9bt7e/KMocmXL5WNtKsMRLAA1HIPGP3F/tQ9QFW3Uf5GYH3wZrV8XhbRRR27AqyBPOcxvUkgcQeWvcvD7H18Tag2lGqcv71/gbz0/xoMYK2019+TAqLr3PI0XY/hyhAFQ1leJQpPdeg5qsG77wUrOjwTqwNolw4Y/8Hc8RijL5CLufSe2PA6VlZixDqIpdmM54Agev08o2Bf7CLw38trt4e5+xTqYm/pPYQRCM0WCwsQSRThnuD00XsAX3TwaJBd5S2h8dLpBBTC8QJiqOITsp8ieyImpJMe8KLvlT1ecThqHQ3cgh1nPWcwtL7AefBZEGWfDMiF/1Ch6O+trxJvNyJQn0Et8Oxy2n5HPM9g17vk25WMLZdVGX7ZW35VcZ6PA9mFChbBoMqnbilxjwKNrvymnbyDnbsZY8ZWUGu/lBZfwac1H7GMfhKKkwraMrpPS9Sjx0QTMZNHFuFyLQv0JXDnWL2c9Rg== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 85b17d03-8b85-474b-13b1-08d880d9ab90 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2020 15:52:44.9401 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b82a99f6-7981-4a72-9534-4d35298f847b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: TCFY8yA4gkr2Nnm9aAC7HPCvAVRRTqGus6qE9O+fk3K/KtvL3ZbRyBn8JtctCmBmwsp6vM5CIt7rGP/ZPRI3jOTvFXcQkQaCMmoUlD7weOI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5075 Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Sven Auhagen The CP110 SATA unit has 2 ports, and a dedicated ICU entry per port. In the past, the AHCI SATA driver only supported one interrupt per SATA unit. To solve this conflict, the 2 SATA wired interrupts in the South-Bridge got configured as 1 GIC interrupt in the North-Bridge, regardless of the number of SATA ports actually enabled/in use, and the DT bindings only referenced the interrupt of one port. Since then, this limitation has been addressed and this patch ensures backward compatibility with old DTs not describing SATA ports correctly directly from the AHCI MVEBU driver. This way, we will be able to drop the hack from the ICU driver. IOW, when the A8k compatible string is used and there is no sub-nodes in the DT, we fake the creation and mapping of the second (missing) interrupt. Signed-off-by: Sven Auhagen Signed-off-by: Miquel Raynal Reviewed-by: Hans de Goede --- drivers/ata/ahci_mvebu.c | 126 ++++++++++++++++++++++++++++++--- drivers/ata/libahci_platform.c | 3 + include/linux/ahci_platform.h | 1 + 3 files changed, 120 insertions(+), 10 deletions(-) diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c index ed82381dc4a7..22447b1bb23f 100644 --- a/drivers/ata/ahci_mvebu.c +++ b/drivers/ata/ahci_mvebu.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include "ahci.h" @@ -28,9 +29,15 @@ #define AHCI_WINDOW_BASE(win) (0x64 + ((win) << 4)) #define AHCI_WINDOW_SIZE(win) (0x68 + ((win) << 4)) +#define ICU_SATA0_ICU_ID 109 +#define ICU_SATA1_ICU_ID 107 + struct ahci_mvebu_plat_data { - int (*plat_config)(struct ahci_host_priv *hpriv); + int (*plat_config)(struct platform_device *pdev, + struct ahci_host_priv *hpriv); unsigned int host_flags; + unsigned int resource_flags; + unsigned int port_irq[2]; }; static void ahci_mvebu_mbus_config(struct ahci_host_priv *hpriv, @@ -67,7 +74,8 @@ static void ahci_mvebu_regret_option(struct ahci_host_priv *hpriv) writel(0x80, hpriv->mmio + AHCI_VENDOR_SPECIFIC_0_DATA); } -static int ahci_mvebu_armada_380_config(struct ahci_host_priv *hpriv) +static int ahci_mvebu_armada_380_config(struct platform_device *pdev, + struct ahci_host_priv *hpriv) { const struct mbus_dram_target_info *dram; int rc = 0; @@ -83,7 +91,8 @@ static int ahci_mvebu_armada_380_config(struct ahci_host_priv *hpriv) return rc; } -static int ahci_mvebu_armada_3700_config(struct ahci_host_priv *hpriv) +static int ahci_mvebu_armada_3700_config(struct platform_device *pdev, + struct ahci_host_priv *hpriv) { u32 reg; @@ -96,8 +105,94 @@ static int ahci_mvebu_armada_3700_config(struct ahci_host_priv *hpriv) return 0; } -static int ahci_mvebu_armada_8k_config(struct ahci_host_priv *hpriv) +static int multi_irq_host_ack_armada8k(int irq, struct ata_port *ap) { + struct ahci_host_priv *hpriv = ap->host->private_data; + void __iomem *mmio = hpriv->mmio; + + writel(BIT(ap->port_no), mmio + HOST_IRQ_STAT); + + return 0; +} + +static int ahci_get_per_port_irq_armada8k(struct ata_host *host, int port) +{ + struct ahci_host_priv *hpriv = host->private_data; + struct ahci_mvebu_plat_data *pdata = hpriv->plat_data; + + return pdata->port_irq[port]; +} + +static int ahci_mvebu_armada_8k_irq_backwards(struct ahci_host_priv *hpriv, + struct device *dev) +{ + struct device_node *np = of_irq_find_parent(dev->of_node); + struct ahci_mvebu_plat_data *pdata = hpriv->plat_data; + struct irq_data *irqd = irq_get_irq_data(pdata->port_irq[0]); + int host_irq = irqd ? irqd_to_hwirq(irqd) : 0; + int missing_irq = (host_irq == ICU_SATA1_ICU_ID) ? + ICU_SATA0_ICU_ID : ICU_SATA1_ICU_ID; + struct irq_fwspec fwspec = { + .fwnode = of_node_to_fwnode(np), + .param_count = 2, + .param = {missing_irq, IRQ_TYPE_LEVEL_HIGH}, + }; + int irq; + + pdata->port_irq[1] = irq_create_fwspec_mapping(&fwspec); + hpriv->mask_port_map = GENMASK(1, 0); + + if (missing_irq == ICU_SATA0_ICU_ID) { + irq = pdata->port_irq[0]; + pdata->port_irq[0] = pdata->port_irq[1]; + pdata->port_irq[1] = irq; + } + + return 0; +} + +static int ahci_mvebu_armada_8k_config(struct platform_device *pdev, + struct ahci_host_priv *hpriv) +{ + struct ahci_mvebu_plat_data *pdata = hpriv->plat_data; + struct device *dev = &pdev->dev; + struct device_node *child; + int port_irq, child_nodes, port = 0; + + /* Get IRQs per port */ + child_nodes = of_get_child_count(dev->of_node); + if (child_nodes) { + for_each_child_of_node(dev->of_node, child) { + + port_irq = of_irq_get(child, 0); + if (!port_irq) + port_irq = -EINVAL; + + if (port_irq < 0) + goto compat; + + pdata->port_irq[port] = port_irq; + port++; + } + + goto out; + } + +compat: + /* Backwards Compatibility Check */ + port_irq = platform_get_irq(pdev, 0); + if (port_irq > 0) { + pdata->port_irq[0] = port_irq; + ahci_mvebu_armada_8k_irq_backwards(hpriv, dev); + } else { + dev_err(dev, "no irq\n"); + return port_irq; + } + +out: + hpriv->flags |= AHCI_HFLAG_MULTI_MSI; + hpriv->get_irq_vector = ahci_get_per_port_irq_armada8k; + return 0; } @@ -167,7 +262,7 @@ static int ahci_mvebu_resume(struct platform_device *pdev) struct ahci_host_priv *hpriv = host->private_data; const struct ahci_mvebu_plat_data *pdata = hpriv->plat_data; - pdata->plat_config(hpriv); + pdata->plat_config(pdev, hpriv); return ahci_platform_resume_host(&pdev->dev); } @@ -189,15 +284,22 @@ static struct scsi_host_template ahci_platform_sht = { static int ahci_mvebu_probe(struct platform_device *pdev) { - const struct ahci_mvebu_plat_data *pdata; + const struct ahci_mvebu_plat_data *pdata_plat; + struct ahci_mvebu_plat_data *pdata; struct ahci_host_priv *hpriv; int rc; - pdata = of_device_get_match_data(&pdev->dev); - if (!pdata) + pdata_plat = of_device_get_match_data(&pdev->dev); + if (!pdata_plat) return -EINVAL; - hpriv = ahci_platform_get_resources(pdev, 0); + pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return -ENOMEM; + + memcpy(pdata, pdata_plat, sizeof(*pdata)); + + hpriv = ahci_platform_get_resources(pdev, pdata->resource_flags); if (IS_ERR(hpriv)) return PTR_ERR(hpriv); @@ -210,10 +312,13 @@ static int ahci_mvebu_probe(struct platform_device *pdev) hpriv->stop_engine = ahci_mvebu_stop_engine; - rc = pdata->plat_config(hpriv); + rc = pdata->plat_config(pdev, hpriv); if (rc) goto disable_resources; + if (pdata->resource_flags & AHCI_PLATFORM_ARMADA8K_QUIRK) + hpriv->multi_irq_host_ack = multi_irq_host_ack_armada8k; + rc = ahci_platform_init_host(pdev, hpriv, &ahci_mvebu_port_info, &ahci_platform_sht); if (rc) @@ -237,6 +342,7 @@ static const struct ahci_mvebu_plat_data ahci_mvebu_armada_3700_plat_data = { static const struct ahci_mvebu_plat_data ahci_mvebu_armada_8k_plat_data = { .plat_config = ahci_mvebu_armada_8k_config, + .resource_flags = AHCI_PLATFORM_ARMADA8K_QUIRK, }; static const struct of_device_id ahci_mvebu_of_match[] = { diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c index f6f2a111d226..a5d06565a5c7 100644 --- a/drivers/ata/libahci_platform.c +++ b/drivers/ata/libahci_platform.c @@ -464,6 +464,9 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev, if (!child_nodes) hpriv->nports = 1; + if (!child_nodes && flags & AHCI_PLATFORM_ARMADA8K_QUIRK) + hpriv->nports = 2; + hpriv->phys = devm_kcalloc(dev, hpriv->nports, sizeof(*hpriv->phys), GFP_KERNEL); if (!hpriv->phys) { rc = -ENOMEM; diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h index 49e5383d4222..99ff30b6c37c 100644 --- a/include/linux/ahci_platform.h +++ b/include/linux/ahci_platform.h @@ -42,5 +42,6 @@ int ahci_platform_suspend(struct device *dev); int ahci_platform_resume(struct device *dev); #define AHCI_PLATFORM_GET_RESETS 0x01 +#define AHCI_PLATFORM_ARMADA8K_QUIRK 0x02 #endif /* _AHCI_PLATFORM_H */ From patchwork Wed Nov 4 15:52:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1394173 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=Ma7uoukC; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CRB8N6qgCz9sVK for ; Thu, 5 Nov 2020 02:56:04 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730826AbgKDP4E (ORCPT ); Wed, 4 Nov 2020 10:56:04 -0500 Received: from mail-eopbgr10117.outbound.protection.outlook.com ([40.107.1.117]:28320 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731059AbgKDPxE (ORCPT ); Wed, 4 Nov 2020 10:53:04 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=POxjzpZ+jVpBoa97U75xtrBKaGePfzF/P+/4uYQLgE82B2gdC+Hd9LjGrRe3YCLGPNqHJBiFxSVwnWsOeT97jnGlreAo+lsp0JyAFi6AcBccfr036qDqLZ9/QBPAqpyJq9g1yhjQXjKF53GapzE53TAj5M41aszJg3zEdWpEDcZ0Z/nQkPMVtkC7AH6/F+OAfCQmCoNcZZ9NWvZ1Qzcwy/BQB51jFZWN2rlSNRA844LZTgRSv0EfKxnHE0Mh1YyW/ISmaiOyLgFFdb1tg7vuVJR3o0A17pr42eup++Y3FQXL1FgQiGpuAfrAriqFKrKoOQXp33FDLKFSFLkQsZPhLw== 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-SenderADCheck; bh=tASzEdDMG8gJV427A0F/Ybc3XjatDlkF3KHobqVVyOk=; b=H8rWkft6nF4t4EQlmOUZm5CpDIY69rpdwHA2SWMHsQZmFAwX0fFtcqA1B5N3szmMs3r6qJWKe4Lm6UNhdl8dTzKHcFm9gyNP6Xc4kn7xE44o1QKNuDDpgkAnkHVdCQk5k9g31IGmrI7lO96f/5NWBTZrw1YbU3R92gg6OiheBIreGeetPaSxTT8IfDsUvTyOUPh63wpneTY9gu6be/HGlB/G3qeKsAat1P0L1bXelLdYEZb/AOz/hHPUL4FEJiXkvQsxjC+1r1/pnoitJ0d1gQUIX/g1f1HA8me66/9rjNDCo3xSAoMcPB2WwFhHtrT81gYpQUP666S5PYgiDbiZ5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=voleatech.de; dmarc=pass action=none header.from=voleatech.de; dkim=pass header.d=voleatech.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=voleatech.de; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tASzEdDMG8gJV427A0F/Ybc3XjatDlkF3KHobqVVyOk=; b=Ma7uoukChosXVHt911PijlUDNz1rjDQQExcIy84HBwfgRDuaI0iNi7nty1VaMiPcSyW+eu+dJG6HYgQTuKQWD1QuGszwNsygL9+w3jUHCq99TNbSFY1v+V/867r/mVKfBHkxO3alZtnBLUb0A3RNmzsF8Vhx/+i+lVc52lo/Aio= Authentication-Results: kernel.dk; dkim=none (message not signed) header.d=none;kernel.dk; dmarc=none action=none header.from=voleatech.de; Received: from AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) by AM0PR05MB5075.eurprd05.prod.outlook.com (2603:10a6:208:d0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.29; Wed, 4 Nov 2020 15:52:45 +0000 Received: from AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4]) by AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4%7]) with mapi id 15.20.3499.032; Wed, 4 Nov 2020 15:52:45 +0000 From: sven.auhagen@voleatech.de To: axboe@kernel.dk, hdegoede@redhat.com, robh+dt@kernel.org, tglx@linutronix.de, maz@kernel.org, gregory.clement@bootlin.com Cc: linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, jason@lakedaemon.net, andrew@lunn.ch, rjw@rjwysocki.net, viresh.kumar@linaro.org, antoine.tenart@bootlin.com, maxime.chevallier@bootlin.com, thomas.petazzoni@bootlin.com, miquel.raynal@bootlin.com Subject: [PATCH v2 6/9] irqchip/irq-mvebu-icu: Remove the double SATA ports interrupt hack Date: Wed, 4 Nov 2020 16:52:34 +0100 Message-Id: <20201104155237.77772-7-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201104155237.77772-1-sven.auhagen@voleatech.de> References: <20201104155237.77772-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (109.193.235.168) by AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Wed, 4 Nov 2020 15:52:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d2169717-f5d4-4ef7-329e-08d880d9ac18 X-MS-TrafficTypeDiagnostic: AM0PR05MB5075: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w2Tr9RKjzzt044nWMXDG9oeQIDJb7f3SbYdfNZPAGc6hAEJAoutD6oXx8zPG7QED7Dq9qOrPGc+Dr5mElEwcYA9Kiw8t5I5tpOXiYgGjw41F7evX44Ci5VSPU8IzRSIrVyTdgbwidVxfwKbQzWJbPu3SUbn3DeUCRiwnNWFNcIA4nwIvFpz4rrRHKLPRY6HVsrQSfL3YD6a6KLaLYjRp0XJrVAp0C9QyvUTASvy5y+W7J842JkJ9nxqYpVkCBZZ1xNOROcafWE144QRUHRA3M6t6fiLrWV3zxAuY9xuNi5SnF16EH+lBNQenonQe1+SC5tYyoTNdNGU0SqJSH7IyrCq15CLXUoSxVi1HhdH0PFMyPEErl6BhOYE/7okjj7PS X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8PR05MB7251.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39830400003)(346002)(376002)(136003)(396003)(366004)(8676002)(956004)(2906002)(52116002)(6666004)(316002)(4326008)(2616005)(5660300002)(8936002)(1076003)(6486002)(478600001)(66476007)(66556008)(6512007)(83380400001)(9686003)(66946007)(86362001)(186003)(36756003)(7416002)(16526019)(26005)(69590400008)(6506007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: HsbAa804Qus4qTbV0hqrQ9fkwfZMoynZ5i3P6CRyuW6RW7Mt42Dq3Q1GQXfyPhXyJIh0tTkd2xBpySwz5CcV582PeYenSupSjazMibzK99oD2eck4zud8dwB1m4tIYqM39K3XUwK4tfPMyP+Pns2bgKGYLSqxjLUPR25SnCN1ysrgzPYngHbOWB5UM/UJZg4tO6O1syYsRjkbY58r75ijj4eHZDn3V5FCJyLVa/0USy3a/aUK4Ns+D/70VvzIZQT23jd8Eylbje9poDaFsdWMgzlNUmizM2B0oa3hvxl8DSuoXkozQTNqEwbIIJj4dzm69Ghett3kkfGOCjHT5pr6RJryLI4oe1SaOaAWxys5/wRGui1FfG5P54bh/cxgi29TKGPJ7V+Yc9uf5/HjrhvTrISnJRG6CiGEYdMJm+eyOqCOQcqHHgsq9YvTVLp6gXDtFvImue5s7am5M1rlhEU4irS27BvD2iOyZlFHuzUdD81BqdVZunIJ4Awxv2gAMsMm7ESwsBu0X7YmedUs8zqrJnIhezY+7BnkXjqdmvGKWd5zqK1OBngb1k+bQMpbYzCJsEnVrFXOrKh6Ws5aQjsNGd7P0mUd2MZkP4Kx8kK4rnBgLuk20/4O4o99FPdTEsves1iV+TW4O7JFGvLtLktTA== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: d2169717-f5d4-4ef7-329e-08d880d9ac18 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2020 15:52:45.7650 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b82a99f6-7981-4a72-9534-4d35298f847b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: K8Jxp797hWRBC1C06pwXf6ghsWCoYLTdzBBQtSGhFRbqugi54qmGsOeKMagrrCZMjXGt3+bUnWQCaeRKnSgcF57DCWyPVGoNS498LZlmzsI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5075 Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Miquel Raynal When writing the driver, a hack was introduced to configure both SATA interrupts regardless of the port in use to overcome a limitation in the SATA core. Now that this limitation has been addressed and the hack moved in the (historically) responsible SATA driver, ahci_{platform,mvebu}.c, let's clean this driver section. Acked-by: Marc Zyngier Reviewed-by: Hans de Goede Signed-off-by: Sven Auhagen Signed-off-by: Miquel Raynal --- drivers/irqchip/irq-mvebu-icu.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/irqchip/irq-mvebu-icu.c b/drivers/irqchip/irq-mvebu-icu.c index 91adf771f185..3e29f8d5b33b 100644 --- a/drivers/irqchip/irq-mvebu-icu.c +++ b/drivers/irqchip/irq-mvebu-icu.c @@ -38,8 +38,6 @@ /* ICU definitions */ #define ICU_MAX_IRQS 207 -#define ICU_SATA0_ICU_ID 109 -#define ICU_SATA1_ICU_ID 107 struct mvebu_icu_subset_data { unsigned int icu_group; @@ -111,22 +109,6 @@ static void mvebu_icu_write_msg(struct msi_desc *desc, struct msi_msg *msg) } writel_relaxed(icu_int, icu->base + ICU_INT_CFG(d->hwirq)); - - /* - * The SATA unit has 2 ports, and a dedicated ICU entry per - * port. The ahci sata driver supports only one irq interrupt - * per SATA unit. To solve this conflict, we configure the 2 - * SATA wired interrupts in the south bridge into 1 GIC - * interrupt in the north bridge. Even if only a single port - * is enabled, if sata node is enabled, both interrupts are - * configured (regardless of which port is actually in use). - */ - if (d->hwirq == ICU_SATA0_ICU_ID || d->hwirq == ICU_SATA1_ICU_ID) { - writel_relaxed(icu_int, - icu->base + ICU_INT_CFG(ICU_SATA0_ICU_ID)); - writel_relaxed(icu_int, - icu->base + ICU_INT_CFG(ICU_SATA1_ICU_ID)); - } } static struct irq_chip mvebu_icu_nsr_chip = { From patchwork Wed Nov 4 15:52:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1394153 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=CzmTG1I2; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CRB5B40qFz9sVT for ; Thu, 5 Nov 2020 02:53:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731111AbgKDPxP (ORCPT ); Wed, 4 Nov 2020 10:53:15 -0500 Received: from mail-eopbgr10117.outbound.protection.outlook.com ([40.107.1.117]:28320 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731108AbgKDPxO (ORCPT ); Wed, 4 Nov 2020 10:53:14 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VTpkKPyTV3cQSFJvefd7HUXGG1GXXMmGJOfToPgG9JehcotWNx7LmaGRCbvsXyTqeEDuyWR3r2VqGJUBxHBS71xJujiU04Oi5XKv22yAYVpONHHVb8ZtayJwkLCBErymMG9kMmFfNWQuSBLB/mBf8wb6KZGi6onh1+HK791k+eEs05DTrNhSvEuzVtfsyivnMVnclfQmRZ+IGRANIPjSGTxhFMRuWnmuontWaGKSgZnboXXyXtwFn+AtN1x+u8SzSp0pmKrUnYBTnLEPo/Jd43GAZEVacIPhaId5Tz43z7DviSbd/pKwkXZUeB/KE3FU3MgYKllNYHGtmVIHRos5OQ== 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-SenderADCheck; bh=t6owgh1Jmkf4KJRh5HqXTdxRQXgqy2bKyEbNmGmbSlg=; b=R0ZLMPiTwo60a+8YtoQXgFPbEoDxfQKVleiO0/SSy3Rd6KkQ11T0SLrAj8IeFzpX0mMkv018XLx214UadhszE7Gocfge0ygqPtukJnKOahqFv6hwyruNDdMF74lCfToAB03OrMkT9lisCXrmYjD+HpjotsC2tU+iZ/4UIRU3M3Ono9HVeSM284t5lshH3IpdWHW9zQvA41s5usrjnMcFBfg9anUc4lM59rY+SrqzVS3yiOQPgDhTfTgYqYMTAysfAJ2NkyY/XJmERRbipOAiWbIjc308ktGf4W7RPqKkwSiV9r/fkBuHLa3sWdI0KTDKER1R/aijmXUbCtVhvM8HFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=voleatech.de; dmarc=pass action=none header.from=voleatech.de; dkim=pass header.d=voleatech.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=voleatech.de; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t6owgh1Jmkf4KJRh5HqXTdxRQXgqy2bKyEbNmGmbSlg=; b=CzmTG1I2mZxBHLes9wtKVDd6KKGBOVoC+D/KN+g5VzhAoEEcugPHY5pREQ45khXFZs+wMtrAW/S2i65qg87mxUDEyQ8rUCgZGkC/J2tR59TMhXLy1kaWQ8V90jdi8kUU0GwZXHSiy1SrrvwRtJz6LvGVLkD4DvEBNtpRTnR3tDQ= Authentication-Results: kernel.dk; dkim=none (message not signed) header.d=none;kernel.dk; dmarc=none action=none header.from=voleatech.de; Received: from AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) by AM0PR05MB5075.eurprd05.prod.outlook.com (2603:10a6:208:d0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.29; Wed, 4 Nov 2020 15:52:46 +0000 Received: from AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4]) by AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4%7]) with mapi id 15.20.3499.032; Wed, 4 Nov 2020 15:52:46 +0000 From: sven.auhagen@voleatech.de To: axboe@kernel.dk, hdegoede@redhat.com, robh+dt@kernel.org, tglx@linutronix.de, maz@kernel.org, gregory.clement@bootlin.com Cc: linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, jason@lakedaemon.net, andrew@lunn.ch, rjw@rjwysocki.net, viresh.kumar@linaro.org, antoine.tenart@bootlin.com, maxime.chevallier@bootlin.com, thomas.petazzoni@bootlin.com, miquel.raynal@bootlin.com Subject: [PATCH v2 7/9] dt-bindings: ata: Update ahci bindings with possible per-port interrupts Date: Wed, 4 Nov 2020 16:52:35 +0100 Message-Id: <20201104155237.77772-8-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201104155237.77772-1-sven.auhagen@voleatech.de> References: <20201104155237.77772-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (109.193.235.168) by AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Wed, 4 Nov 2020 15:52:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eed085ef-c7e5-4ab1-61c1-08d880d9aca1 X-MS-TrafficTypeDiagnostic: AM0PR05MB5075: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NxXGQCsw1WkCMa0XLlkd7+qqcRQvg/d7tdiohoIwXBrOrvIV9+rPVQsorC4DCbv/D3OhMZFziZruKx94q2M+BUimIBkW9at5wWGOklHKXXFeeFxHau2hojf+r/xAetALMYaWWJ5IwEtvanOt+HAsA0l+kW72vMU1tg/8FaqOfJzRxLXxWCl77HwDOCQjbjZpYeFAFVUjf/HcBefnvbWacJlHWdTwjeBqElP72Ca8OgvDuQg6VTtH7QGiFVxnWk672bw17lODDouMehBSzUGltiMNcU/exNjCQlHglYuWC0L3qLXOPfM7uuHj3Ky4N0Bz0RFDahZ0HBLK5tJXWYNfcS4qMzY+LU+qQgSuBsftwxU/oaBEOec4JUfvbCTnQnwC X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8PR05MB7251.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(39840400004)(376002)(136003)(396003)(366004)(8676002)(956004)(2906002)(52116002)(6666004)(316002)(4326008)(2616005)(5660300002)(8936002)(1076003)(6486002)(478600001)(66476007)(66556008)(6512007)(83380400001)(9686003)(66946007)(86362001)(186003)(36756003)(7416002)(16526019)(26005)(69590400008)(15650500001)(6506007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 6rBceN3oXQHDdniBDwxS4H+h5JKeA4hQoiBtTZvTjT3B8HhRswtqHR0vprsfyoOy1eU6GgmSSZRkRMFLsPNApXexv2mCN1keIAsr1Hs0XFtpmRWVjQoK6IVx/B51HaWmun1Ckfjf7RxZ68pBLTNqrrNI8Cl7ksohSLYaTGk39ZcxQvC/Vbih0Ne/dTHuyTFLUZVy8ZG7ytAEO6yuaNio3lZIwlqIIJUIJZssWDJKqk6AL96uNGx+XMo748RH/nedXJzy5gsM3TvvvHmaeH6ipp7Xt7Z5I1+oSr5M5sMwRwO3B5sPq/ByiXFhQNjbqzku8qq9kXP9Dsq+lNK0lt4dlWbPGjDTd319yug5rtOKBKSY78dzODkJT3IonHrKXXS1aJsYrA4Hh5MqoFHWAV5Px8ojeZlD/cV4FTK3fsJRiF/O92t54InN69tRq9wQgPZcre0HQQp/uIg7sRyNvgQuUjmj/2fWrmggUxQzoWCV8I/gD8CsC52KiFGQoYPLKi4dOJK2D/Zo34tpdl1vmcbbD32Q9E6gxXHaKAMeDYujfQyHmW87CRbPXp3k90HXNrRCm0DU4hrS5P0aittNb12jNTihYWm1HEbGX1LvhNXmruKGImqBs3v8MD+6ob7HOcBnvUBo/ki3ybcydTN2ew5IMQ== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: eed085ef-c7e5-4ab1-61c1-08d880d9aca1 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2020 15:52:46.8174 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b82a99f6-7981-4a72-9534-4d35298f847b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ZGP0bhPUAipxsLMvLk9jaClhgbDdcTaE0FtJWamVAfRvi5SkOcS88FUNZ4y3oeXSasTEoTT1805Ialw31+u0NY1yavoktpMJIhtPljWQkIk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5075 Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Miquel Raynal Update bindings to reflect the fact that a SATA IP can either have: - only one interrupt: in this case an 'interrupts' property is declared at the root of the node; or - each SATA port can have their own interrupt: in this case there is one 'interrupts' property per port/sub-node and none at the root. Reviewed-by: Hans de Goede Reviewed-by: Rob Herring Signed-off-by: Sven Auhagen Signed-off-by: Miquel Raynal --- Documentation/devicetree/bindings/ata/ahci-platform.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt index 77091a277642..83d715cbcecd 100644 --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt @@ -49,6 +49,12 @@ And at least one of the following properties: - phys : reference to the SATA PHY node - target-supply : regulator for SATA target power +Sub-nodes optional properties: +- interrupts : , please + note that either the root SATA node has the + interrupts property, or there is one per SATA + port, but not both at the same time. + Examples: sata@ffe08000 { compatible = "snps,spear-ahci"; From patchwork Wed Nov 4 15:52:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1394155 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=BJi78SV4; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CRB5H3lBqz9sTK for ; Thu, 5 Nov 2020 02:53:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731139AbgKDPxW (ORCPT ); Wed, 4 Nov 2020 10:53:22 -0500 Received: from mail-eopbgr10117.outbound.protection.outlook.com ([40.107.1.117]:28320 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731114AbgKDPxS (ORCPT ); Wed, 4 Nov 2020 10:53:18 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PX9aNKUrUagF/dlWG6IrWW4Pjnuco0OfzpC0VXJAFP6XqufCpZx/HAT1ecByfoV6oCu9r2oQlvnz3IMli0GikP3dFYYjOvsOycIbhXRL69WLkcnDKU1p55Rw7sdHf7P9M7cEvs7OJntMm3SjleXaGbAMvWbDbz8Joh6sHe419bDcdy0+bXoM1zjh0hsMF7J9ZpRoYpMeDIqHNz+k72TqpCln7M/RuwMFV1usrONv4RAoDiINFbJ7dkYR4DH6/1N7esirq/0QO0R3QXBihvWo/uyaeiSsT64gU5b0yHmXaQomNIAKzm6m5ihV4hV7Me/cvHr7Cofx1MluhjDW/pB7tQ== 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-SenderADCheck; bh=8FcmBVRT+xlb5/zXm2b0EfAxmZx1QcLG+/EDvqs1uMg=; b=AIosXCGq9JU7CJyGs3XM1fr3igeonAS5GK+t59Yqll180RbKEH9eOOtRJopG3SnaMKlX5uXgBbJSLdooxSULKBFD1nanLEy+kC5KxxvR+1Fhy8qGZn/pNJ/q3vdL3vCVb7LD27ENe7Um3mb+BIr6h6JO7Jv8O2ame/0wo3HExNw65r2oWUekLrb8vW4BnvZaKRLkp2Qjq7TPXwelvRfaMcq2JxvjB7juFPVghpvDRAl5bHSjkWImCwEka8NrkfUwLiqhkyouCH4UdNR1eqFdxUPWyNyl1wuTReA23YZYs5jwNimcWiNyNPyvU7oxcNRBZnirD76mdkEBuFRs5ihTMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=voleatech.de; dmarc=pass action=none header.from=voleatech.de; dkim=pass header.d=voleatech.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=voleatech.de; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8FcmBVRT+xlb5/zXm2b0EfAxmZx1QcLG+/EDvqs1uMg=; b=BJi78SV47VrACX8YiE2n21XoHCnua6HIkK2hvJhiKcbQocLr/Vr2kyh7iSB8uZKWyceDL1pG60L9vHkpF8Rb4L3Ni0PCjRUeP++hqkZ2RfwIpHNqz6mmDpc7EN+hvA26y3YFESx1LVS/oRSetPgnGKi9igBdAdUH9yD4Zj5MexQ= Authentication-Results: kernel.dk; dkim=none (message not signed) header.d=none;kernel.dk; dmarc=none action=none header.from=voleatech.de; Received: from AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) by AM0PR05MB5075.eurprd05.prod.outlook.com (2603:10a6:208:d0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.29; Wed, 4 Nov 2020 15:52:47 +0000 Received: from AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4]) by AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4%7]) with mapi id 15.20.3499.032; Wed, 4 Nov 2020 15:52:47 +0000 From: sven.auhagen@voleatech.de To: axboe@kernel.dk, hdegoede@redhat.com, robh+dt@kernel.org, tglx@linutronix.de, maz@kernel.org, gregory.clement@bootlin.com Cc: linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, jason@lakedaemon.net, andrew@lunn.ch, rjw@rjwysocki.net, viresh.kumar@linaro.org, antoine.tenart@bootlin.com, maxime.chevallier@bootlin.com, thomas.petazzoni@bootlin.com, miquel.raynal@bootlin.com Subject: [PATCH v2 8/9] dt-bindings: ata: Update ahci_mvebu bindings Date: Wed, 4 Nov 2020 16:52:36 +0100 Message-Id: <20201104155237.77772-9-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201104155237.77772-1-sven.auhagen@voleatech.de> References: <20201104155237.77772-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (109.193.235.168) by AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Wed, 4 Nov 2020 15:52:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 005b7051-a8c1-49a0-dfd1-08d880d9ad48 X-MS-TrafficTypeDiagnostic: AM0PR05MB5075: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2399; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cYPgXtSexwoIfn+AtqGYaQonxTFsUu8Lp2NbDKv2gimp7+V2V+OG/P6wyJ4/vEY25B0kvficmnCw5jBTvFU2LeJ7gAFs8jCAdClPSViUuIgnS+q01O7nu1fBM7rdM0ZxyCp9lUDzfWD09rRcNqZpZkqcxiuCUwlz906yN4pVUtmx1H63qwcNNVu7Hflsd2ui8DSb1T2XWeKo83Bqguv93FU0tqXQIWfcNB4iFfzP7mpdNNK6JdDwIq/PN/XmAtXuhPXHwzxnQjRcqzqxkNn/8XcSXwUilGEAS75zd6gTiIXc/booxf2jZyAlrSAEU8qqg5YbFtYc7PKv/P6gvYTtZpQN8qVMQQoEdSpZvQXr4uPXZkq9kd9uBdJkc6MqdoCw X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8PR05MB7251.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(39840400004)(376002)(136003)(396003)(366004)(8676002)(956004)(2906002)(52116002)(6666004)(316002)(4326008)(2616005)(5660300002)(8936002)(1076003)(6486002)(478600001)(66476007)(66556008)(6512007)(83380400001)(9686003)(66946007)(4744005)(86362001)(186003)(36756003)(7416002)(16526019)(26005)(69590400008)(15650500001)(6506007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: jKYjYDl8x7+krEDes5FjQoZIxvoWMIt2WcvR/QudpaNTAKeZ1WgAL1gWYBxXb4SzMzPa2WjnLXLiPf09RgpHRRJuvAXhW7GrbpOCjFmT34LPv03D1InKZKsrNwdsmZO/zoMIpfyou6wd+mPIpaKY+va61L9j9UmBqIKCaEpGcHRIzYVLZBQn4R3BTHDzVkZHZodCd4gadF0Y9sTsMJSX21v+BnJ4+bXBLjDA7jbnHka93OV1rnfUCc9hF8XVGPOdYuJTuZT3goQmV/GyW+ECjobZUwxrum2zmVOE7Q4GQvmm+5QA9T05TNIeWQi6u4i1fZ+nd7mR12watw05WAsgbXDjsK2CraJJERvx95ypbj/rmYJd8MTOKoVKb86ZuIqyd+i8t3kKLuTIpIYfs0AfGaicmmKvxB9P92WfJDw+cCVyrcW6tj/s831qkml/ILPw2R5c4CPGe8MYLKnvaphz4VcE3MBk11bSndS77UEiyrhZ0LM6oLTjxQUaJHyUs1pimjgJ+s6cb4NyIfBK03IG4aa86YcWC8z98slmGQ1eCRteO2wR1YE7El3yK+0CvaP3h+Ei/eGRnZj/NcjXmRgsdAom9ZU2ltYrcSF5tuO5ZxCcYFZV/rNfcheVMIpeCiUT/tWvf3chQpzu8IleCaveaA== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 005b7051-a8c1-49a0-dfd1-08d880d9ad48 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2020 15:52:47.7871 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b82a99f6-7981-4a72-9534-4d35298f847b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5dZl6/dQjRYqIZzFtA57h4YmOEbHRaX4BUq4F9dZLpIPCRk5YHo+NWeJl60/9PvZEpPDFzr6KVyXMgvuBbH4/QbXqw5SJlYZSCGPqIpbCgQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5075 Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Miquel Raynal Update bindings with the already in use Armada 8k compatible. Reviewed-by: Hans de Goede Reviewed-by: Rob Herring Signed-off-by: Sven Auhagen Signed-off-by: Miquel Raynal --- Documentation/devicetree/bindings/ata/ahci-platform.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt index 83d715cbcecd..78d9d413a5c6 100644 --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt @@ -15,6 +15,7 @@ Required properties: - "ibm,476gtr-ahci" - "marvell,armada-380-ahci" - "marvell,armada-3700-ahci" + - "marvell,armada-8k-ahci" - "snps,dwc-ahci" - "snps,spear-ahci" - "generic-ahci" From patchwork Wed Nov 4 15:52:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1394169 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=ln/q22YQ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CRB7r5z5Hz9sVK for ; Thu, 5 Nov 2020 02:55:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730819AbgKDPze (ORCPT ); Wed, 4 Nov 2020 10:55:34 -0500 Received: from mail-eopbgr10117.outbound.protection.outlook.com ([40.107.1.117]:28320 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730831AbgKDPxZ (ORCPT ); Wed, 4 Nov 2020 10:53:25 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OgChGeysSLa/mTDa3lfwdR07Jw9nKukP8y4roeGODi3FzWQzc3J4DZfOGkFhpmRwskfG93sP2RFwKh6EC3CfZ0MH4XbL1QxdglDthPhyUIOsZagMhM7cK4fBvTSeoNbu3kMvXENyhFSNcLj5YtGHUCQI4JhN7NYgOgeV+r2zXCGUDI8OHBSu4EzdXOT1Rlk3zuGO1hdHc+zSNNmf2XMyWI9URrvgf/HGnGoqezzGJSG0LjK+otAhWSQ4IylU5KrEfJ/zgmu97TVM78bXlplGKzkRstVDEMtrv8A11LyNdBroXa50rqLk51n11CKKRXZIoorShCmMa61WwkxbmjgbAg== 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-SenderADCheck; bh=87Q99SMU4MXkLq5cGEiez4Px+9uWDVh7KODXXBL9itk=; b=VU9GcPFz2KM5doSurYymeG0Hqip7u70HWzgmoCOlWzo5HCk+ywh1vsFjuHtHg/G/bZRlyNC02J46HUfZaWRgJAlVdKKZ7FSdNHGEGaj0ZktPAOeBReNNSJJe9SI5iOqlsbY7OEii2jDWYS1S0Bp2U11O0bIzd27JTesV++xujosXwQTu87mAEk7l2wMBVRHuRVCfnvSUGrU5TzghqvR9heVrn4EsmbuQElVEjvZAAAtQRzbdMPpn/VYfLS62SnpICEBQFgXQsT1EVmJs+dyhc00bdW9wf4m1yohd4KJBcS7PCeIUw2YxQQZ/AsFLuV4FBowpfiNW3W4VI1PFl5vMag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=voleatech.de; dmarc=pass action=none header.from=voleatech.de; dkim=pass header.d=voleatech.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=voleatech.de; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=87Q99SMU4MXkLq5cGEiez4Px+9uWDVh7KODXXBL9itk=; b=ln/q22YQu2vQD+aZKE9I5/Z7Y4gGkB/RPrYKhv5Xrj1pGi4/VrgYYGfegifUVxsHTAPjFr8dFKQtaTz438hcgRpge785jfm4w/kO1Q1Fn7g7WHr5lR3pMX7WPtHGwrAZQQ9xJ80uCFPsIgoC2FBHYhk6ZINR5JwYsfS/LabiQWQ= Authentication-Results: kernel.dk; dkim=none (message not signed) header.d=none;kernel.dk; dmarc=none action=none header.from=voleatech.de; Received: from AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) by AM0PR05MB5075.eurprd05.prod.outlook.com (2603:10a6:208:d0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.29; Wed, 4 Nov 2020 15:52:48 +0000 Received: from AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4]) by AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4%7]) with mapi id 15.20.3499.032; Wed, 4 Nov 2020 15:52:48 +0000 From: sven.auhagen@voleatech.de To: axboe@kernel.dk, hdegoede@redhat.com, robh+dt@kernel.org, tglx@linutronix.de, maz@kernel.org, gregory.clement@bootlin.com Cc: linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, jason@lakedaemon.net, andrew@lunn.ch, rjw@rjwysocki.net, viresh.kumar@linaro.org, antoine.tenart@bootlin.com, maxime.chevallier@bootlin.com, thomas.petazzoni@bootlin.com, miquel.raynal@bootlin.com Subject: [PATCH v2 9/9] arm64: dts: marvell: armada-cp110: Switch to per-port SATA interrupts Date: Wed, 4 Nov 2020 16:52:37 +0100 Message-Id: <20201104155237.77772-10-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201104155237.77772-1-sven.auhagen@voleatech.de> References: <20201104155237.77772-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (109.193.235.168) by AM8P190CA0030.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Wed, 4 Nov 2020 15:52:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 51573852-115d-479d-fe7f-08d880d9adca X-MS-TrafficTypeDiagnostic: AM0PR05MB5075: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1169; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zvKU1L5ks6D4MSSBIJxph9LUANCvaBaVuqMvGc7Qpm1QZWV7+jEdwB8KTZo8oRdS0qT1rZMLtfF8XrVIgEHvtcp+8UwfbpGMA2Oc1xZkGU23QBfMgZk0v2plSZ+IuV4U7NlG/0r5v0q3C50v5L8AIwAoQHfTy58aVMwB8A33ofC1dqYwEXotzDRqUl8wWKi5uYMknRS0BtfgCsqvDFvZ/G3/FKLrvRE6+1iSvlKBOwTpaHGMfo4Jm3X/Q8NCIOy6wtDZQFVp03YuYtCKIcgNHzafKwBMPhUsO3KfhpTtBbqFzfFese2JWMWZMm1YskOy63xaQKgBlyUt/N7sc50LnuyHR44+NZ2xDuZjl/syvcem2ahMxlG+1N9qkM8LAB4j X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8PR05MB7251.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(39840400004)(376002)(136003)(396003)(366004)(8676002)(956004)(2906002)(52116002)(6666004)(316002)(4326008)(2616005)(5660300002)(8936002)(1076003)(6486002)(478600001)(66476007)(66556008)(6512007)(83380400001)(9686003)(66946007)(86362001)(186003)(36756003)(7416002)(16526019)(26005)(69590400008)(6506007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: Qvj9yod7xRazDJdc2wSU7m/PwISt9a9aSpO+Xxwa4NicWzMxLBeQGiudpCStxSmdo1Vbe7/TWmCt5rZTUa/qzwbGqpxCQolZ4ukIgq8lWsCao4kb9NtdhDt9vZ1OYph9Z2IJfCyAcPa1G1gjCBE5g/lAgnekbC1SmcU3jIOEe6m6411r+M002bd1XI9wbS/N8yTvpqOKtKL0TZlTVxh6pDJRX0oRLuOlkXx/BQ/tSrt3EYBBzTe07FRw5ELTf8siEm68FcqK81MNJcNSUJ9gA8bc+PqJNF3dGytzYDFAVrD5rs0a7RdbH/TQ6Sv+5VBFdmw/CW0FLmvDA0JG9ovC47yJscjlp1eXesnNfDMeTOfMHWaUWPcsq/+8E6Ia+AkTsrw3ybhaBAd3j/OXw1IhEdJzbp5j1L4tdzM6/z71i4q7Se6Mn58nL8huJF/j0YCqwh26dGotqQuLo2t7jRe09OBrFuZ98k41tb1TCOpmP4AvjZFryD1nRHr76iEskeMJ/PqrdgKhv5bHb+J4nHyKCzxJCNl7zICyqYsIyczICjk741YAxD5WcVtDenmpv0WNrDBgRvdei1CfR2GL3dHD6RY8dymUSODhYE8Eg7OtNpwmtMG8Ob1D4Xq1hiTCEYBE+o3cKBN9yV2Vf2r2Kgqgpw== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 51573852-115d-479d-fe7f-08d880d9adca X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2020 15:52:48.6224 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b82a99f6-7981-4a72-9534-4d35298f847b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PBLpEURaDWJ4mZj0y55wNodU/X+MOR4Aausce6J5ogzvpD9u6a7f0FzhzMqGxZLOEL7GYSgFAX4/dV6eomru4r9Tf2KYoB9Q/Swe1GVhICQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5075 Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Sven Auhagen There are two SATA ports per CP110. Each of them has a dedicated interrupt. Describe the real hardware by adding two SATA ports to the CP110 SATA node. Reviewed-by: Hans de Goede Signed-off-by: Sven Auhagen Signed-off-by: Thomas Petazzoni Signed-off-by: Miquel Raynal --- arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi index 9dcf16beabf5..ec27294f097b 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi @@ -300,11 +300,9 @@ }; CP11X_LABEL(sata0): sata@540000 { - compatible = "marvell,armada-8k-ahci", - "generic-ahci"; + compatible = "marvell,armada-8k-ahci"; reg = <0x540000 0x30000>; dma-coherent; - interrupts = <107 IRQ_TYPE_LEVEL_HIGH>; clocks = <&CP11X_LABEL(clk) 1 15>, <&CP11X_LABEL(clk) 1 16>; #address-cells = <1>; @@ -312,10 +310,12 @@ status = "disabled"; sata-port@0 { + interrupts = <109 IRQ_TYPE_LEVEL_HIGH>; reg = <0>; }; sata-port@1 { + interrupts = <107 IRQ_TYPE_LEVEL_HIGH>; reg = <1>; }; };