From patchwork Wed Oct 7 15:45:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1378071 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=fva/x/uT; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C5zFn6PGxz9sTm for ; Thu, 8 Oct 2020 02:46:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728732AbgJGPqF (ORCPT ); Wed, 7 Oct 2020 11:46:05 -0400 Received: from mail-eopbgr80101.outbound.protection.outlook.com ([40.107.8.101]:61507 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728728AbgJGPqF (ORCPT ); Wed, 7 Oct 2020 11:46:05 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=URH7zX8Pibcj5x57KZC5W/KRisbzdoMfjj9YFuK9jRCNs+h2AuGWWFoaW2lxrnYAbYu2hZLP/HVUkp6P+iJFiR9VEN6qmo+UGdLJvvX8ufzRAP8rKIZsLmLiGzLfDSNlTItMrVXvkuMjhj4YRUuWaNUWzieZ6Cw9pUBQnpDkSuWHXClcIJwuryNEJVTPFOUlfBWqn38R1nxV/vdBq2dzM5Jteo68OI2BR75xO4KmsFGJ2q29U2vs8c23N+vu/fq2vUCNabtVefqDq996YkZhei9sJ+G6D2Xh63OOXZHQqH+MQF/eNgYG8wo0OphCg492I9bkE2WdERcblwA4c2B+4A== 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=82bTvlLCQFALA7Jx2meyRx3MnVXs2cX237ufwYzgfJg=; b=dIgeKya7Yy2UHbzGPvT9AFmYKxvpWOP7zYUNYO9n3Ez8/kG7xV0NPGgDAYL4C5/yeA0Qh9pjuxeT1nqvCh1et6N40rtkkq4dChxCsPraur+iSj7+EJcgbjGksqUW5XK4FBXZx7UUihHyWWs29Lcjh3VFGk+kc34ui3Oj909PoghZDyt9DfqeXJ3Cm22mfHraP26WXe7wG8xMThZQbpqy7eWT6V0Pb1kDflhd5j1fF8gIboq0etGrB4Jp9y5HAtrHmToF2pZzSFSjuURpnyNciF30lRiQ0Go6koeOrw7m0+kYRALONqC6vqiNOW6rHZTIcv8iYjfEYbmy5Bep7oF4UA== 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=82bTvlLCQFALA7Jx2meyRx3MnVXs2cX237ufwYzgfJg=; b=fva/x/uT0JO66Wc9f+yHrQVUi8PRK6PlfhKW234+2+ZqA3kqh1esst6tJ2cNq2H9Tp8zNIyjIgJPHmvBrfFDtfj+P4UvFPKgr2Ea4OU5nTFMAnN4uPTfk34769vkAHf56GPlnJtAqVQP0wgKHHDKzBNgMfF12MEV8iklnhthaFY= 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 AM0PR0502MB4018.eurprd05.prod.outlook.com (2603:10a6:208:b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21; Wed, 7 Oct 2020 15:45:58 +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.3433.045; Wed, 7 Oct 2020 15:45:58 +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 1/7] ata: ahci: mvebu: Rename a platform data flag Date: Wed, 7 Oct 2020 17:45:48 +0200 Message-Id: <20201007154554.66650-2-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201007154554.66650-1-sven.auhagen@voleatech.de> References: <20201007154554.66650-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM0PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:208:1::24) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from svensmacbookair.sven.lan (109.193.235.168) by AM0PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:208:1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21 via Frontend Transport; Wed, 7 Oct 2020 15:45:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 948f65a9-5e9f-41af-fdd3-08d86ad8159f X-MS-TrafficTypeDiagnostic: AM0PR0502MB4018: 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: wLmcRLLibBw4XFSoXnvmsdaOQkCxNIQzV3DY4Zde3AcWvp5f5wn3MFH99mSGEaIolwtZrh32e0Y/zc3qzCnvTUQpY2DGhSe9jxiXSqA6YyFPUZxgjVsqvnJ4OGkzytIqcfXl8AdzB6j1r6rdIrLhEgG+PQurQKiPP6AvqQSVqE2Fg/42rdPdYtvIWqoSM+Ir3rh3EvHB6eU2ZuCfuR1xXbGrepu1AXtgTOpcZTu9tMi6V6YDw/Ioz57nY9V+XteR1beOuv3qnWqyRH3APcHkJsPN8gAtkpro41PzydhVlgroELz0HC0keonyJLAVSzNpcJcT6sINBN7SELNUQPLdow== 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)(396003)(136003)(376002)(346002)(366004)(8936002)(956004)(5660300002)(66556008)(83380400001)(478600001)(66946007)(316002)(16526019)(2906002)(6666004)(66476007)(1076003)(4326008)(2616005)(26005)(86362001)(6486002)(36756003)(7416002)(6512007)(9686003)(8676002)(6506007)(186003)(52116002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: xn2e+hwz/QnpAeIQPsqdlvASBQ7MuXmlHcJui7j1BYmXCm1ztBPADz9Rwzf3U9eo64FE/RmDaj+Ba4ug3bTOYipH8lqPbMomVElqV3N2yfkO4BjAvSSBRFeogPULGs7R2uVZS8dFkbNYFIY6/A4jMe16HcwplmfwL6JGT+EDAdmWcmwtmPTT3lY2EyRj5Evig3lUasHBZA6b55mSOaypkr5iLVJ4uESm7ScV/qRo1pqZeRIWZfD/Ac8WvJdL5ib9J7ggbr69UD7Wqu06ozTprNHjocb1o+jYc1BKoVTR34Xv92i4GupAhmuPfHeE7rMLYOh/s/alqTQSSWIDi63lEMcDruUtof8rBqEpY8YY0lS8Jw+YVG01Y65DzJlwCKpOqSCSZuzQZMpA6lB9ZBJH7m3b+lUCUq3I4S+Odqx8sqEi1Ts5woY2YfbIypAPSYSzpFcU3VMIlhBpz3vEIswOynvIoPlXVWtBWWJG9ThnHNR0MGdrM+Zf3uxifbTFfURdb1EKHkiwt3/mOU1FkUNgWWpi1CgXLBcACx3vfkyV6tGwaTLq01jbiDTf6y46GRc5bMwAZ5PWSvfAUgnBiEnNIF/Mu00T1Om0qWI89lcF0IVQZOjxnsV9axXSy0ZE36m22mirrQ6F6CbI4BOKorMTMQ== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 948f65a9-5e9f-41af-fdd3-08d86ad8159f X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 15:45:58.4826 (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: ZZJg5GZzThJTITqL+MwVRvMiudLNMru6aaA265dC+TZNZ1yb78v0uCp4l4RK69uAC7UjRJWxxvjZlGbid6Ne95/vqWgnPI9KzN06/dosY6Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB4018 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. Signed-off-by: Miquel Raynal Reviewed-by: Hans de Goede --- 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 d4bba3ace45d..43bb2db59698 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, + .host_flags = AHCI_HFLAG_SUSPEND_PHYS, }; static const struct of_device_id ahci_mvebu_of_match[] = { From patchwork Wed Oct 7 15:45:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1378072 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=SUC+cozO; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C5zFw36xqz9sV0 for ; Thu, 8 Oct 2020 02:46:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728749AbgJGPqJ (ORCPT ); Wed, 7 Oct 2020 11:46:09 -0400 Received: from mail-eopbgr80090.outbound.protection.outlook.com ([40.107.8.90]:50658 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728728AbgJGPqI (ORCPT ); Wed, 7 Oct 2020 11:46:08 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H2GSFr+SqgvRPtYRJtq6sXZ3swjN4ZBCj1IJqkErJPxHq/161gZ6CpCUJWUAed220NMZ2EATBmocHzn66KJk67w6w0vS4kWOULP28dtnxJw3qUS24vX1HJfrQHM5jSb+r66MuC2mLuIzqQ0dVAezlVuAsHKrVNjIt9k8A9D8TadhuPBQhy2DKW+KsecKnJ2kPaacYAmXVihbBbM2kTTU5/RRHfyjTmPBIqjT1LL1IcJ/4BMZWwnmt0PP1FuuK+u/4ziLcUD/5cpf3wvLiXw+GVcQp5GfwGd9KQ45gQOx2l/QCfwmktGQwsmyPbThKwhDsrb70KIzb7pxdSf7bzXiCA== 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=6h5/vCO46Bb1HuhsPmKw9tovodEjXYz4yQCFImF8KBM=; b=G2Da7ndRzSFLpk5eZbThjcRH5ODFTPo6aBkxDCm5sqdc13xZ4LM0v2u7zdsYqtazZoA/XBXc/CujNWQZbugriCuYhJBbrenNQJr1wGb0SX24zO6c34EsptCAf+L1jgT2vVYgwMxFHlnxfo1RmorRR8KhbC4smmKTsR0s2F9q0tZBuAZWp0fvslJqMVLXwOL7cfMifLm/CfetdAqj90GMly+9HuT6xWedINGq2/7SuMhZKxjpJkhAORjrsIZ+yTH6NVVZl0Tz1O+I1WuVj2xviGOxAfuVgVEgt7wC8XtebPZ9HID/qH6l2Oz2WidgFF6TEiO1eLaYc8O0zl0JsptjqA== 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=6h5/vCO46Bb1HuhsPmKw9tovodEjXYz4yQCFImF8KBM=; b=SUC+cozOCnuzzchMUIPCXzJg+b5O2JzHCX2xkqOxJgy4YRASZwWSxny/nT6i/j2KYfv8Z80NzWen7nnWMdG/tCuVS+OZXsg1EF24lfEbJP87wQHx5qX/oKf/+oWwMcAawhEvpoSQu679i4TsuHaqiWRyh3zmt29lwSNoVxkkqmQ= 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 AM0PR0502MB4018.eurprd05.prod.outlook.com (2603:10a6:208:b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21; Wed, 7 Oct 2020 15:45:59 +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.3433.045; Wed, 7 Oct 2020 15:45:59 +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 2/7] ata: ahci: mvebu: Support A8k compatible Date: Wed, 7 Oct 2020 17:45:49 +0200 Message-Id: <20201007154554.66650-3-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201007154554.66650-1-sven.auhagen@voleatech.de> References: <20201007154554.66650-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM0PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:208:1::24) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from svensmacbookair.sven.lan (109.193.235.168) by AM0PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:208:1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21 via Frontend Transport; Wed, 7 Oct 2020 15:45:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 17a5f477-d042-4e4a-d98f-08d86ad81642 X-MS-TrafficTypeDiagnostic: AM0PR0502MB4018: 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: UjQSESItX2dlAVj/9MkpGxWLxLt/pKUFanFFT+BZgV91GoRKQdksA8/jpT6NDaHO0Y96IDLzVXqdIF+tIfnwPDGzwX8RkyflVbv7XfZEoEOmn4C0RWFm7UsOiMqGgz3UKbf1CDrIHa5HQFaQg3fbrD1DVD9zC7un2talNH9qQQIUajc5oDVrZAKy0S78fRS47oASFAhVl1FaZHVjscbrfnlDMP/SRrClAK9suTgYSjbSabMwzB4GaXoJ/jz+Kb/R58+2tg05RqLizMWdSVvbfqHeQzMvT+CEcsHLat+e2u5xS60dV3fiimsXt0NG4SRdhfnoJe4qvaEdLpU3vsSdRg== 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)(396003)(136003)(376002)(346002)(366004)(8936002)(956004)(5660300002)(66556008)(83380400001)(478600001)(66946007)(316002)(16526019)(2906002)(6666004)(66476007)(1076003)(4326008)(2616005)(26005)(86362001)(6486002)(36756003)(7416002)(6512007)(9686003)(8676002)(6506007)(186003)(52116002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 8CeuZzvyuWvpj5Jl45bNc2y7Fo/XJDDERPW7I20an73NfpQ/sck1FTHxYDaWMoZhOvtpjCjia9AP+nHs8WSvxEOlHGAYyOwJ8L4WkXo/JYCScbhL13AWCnxkUzivaPUviWxo3sRlTyKABXmWieafbak2YMZNXTboM9GBrL78/mQO1TDmtCrBG8di7LgOFcSDdOEoJskLQk8EvHssp8ofhnFRiUtIHmdFvzpuCzvmToJLRTnRxI/Ny7MNEmDkN/fF+EmlA3c8o0r2MufupiyCxdAQS+KPYAsm8peotR/RbWt8dFUZfsLp9ZiJAWSPkZhBrex5QpG4QmhXtCAA/3kcJUazR9w8DbpMyKCK0tq6XUq5kH6og6iYieTPAO97lMDmi62E+exwsIg4bpuToSO6lTzW85Nfe/jDq+eAKL6s3G79mrCyHpXhSTFBaY7gm/hCJGierGIeoFsgfBVH7H4TvfUAA9G6XXnDhUgBUxna4HcwSgR5d3a5iThuH4jZ6IwWYJ8tu1rRCBbk7Nggx+ZNUJbLxzl1JZZL51ZPczcOZpH7Rvl/d0JQ+sIAGspinC0t7BhHdnRTMtdlg6QhWuyN2gyeRGysphqFYYzyGk38gCjpYo3Mr3F7bY49xXOa06wckEFLAlAxN/ghIwqCkSJIfA== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 17a5f477-d042-4e4a-d98f-08d86ad81642 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 15:45:59.3806 (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: qbx2zZie7ppn9+rKKHtefM4I6ESf4+mE1z8HUcSB4PrdP7+k1HH5iAdW1RyozsDCGwyT8o/n1bofRwsYq5mTDweI/wxy4tpxiPRfJUEl398= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB4018 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. Signed-off-by: Miquel Raynal Reviewed-by: Hans de Goede --- 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 43bb2db59698..1cdc126882eb 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, }; +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 Oct 7 15:45:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1378074 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=NvSZqCXO; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C5zG05FHSz9sTq for ; Thu, 8 Oct 2020 02:46:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728038AbgJGPqP (ORCPT ); Wed, 7 Oct 2020 11:46:15 -0400 Received: from mail-eopbgr80101.outbound.protection.outlook.com ([40.107.8.101]:61507 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728729AbgJGPqJ (ORCPT ); Wed, 7 Oct 2020 11:46:09 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=buDUQ+cHyqXl+IJvMYKhMRZLK+ZPhgbyk5OMsNSvGn0Z1h1uBgzhGlRYPv/t1p2H3OjuwXTNl6RgffZpYSs8U66GzXmvihSOakGKflUBxdHKdYJ+8OYskl0KWLkR3JzdGK+yA19g54jETmhPWitlT9lZFERkzX3gOSHS7SI4mwSlD28NDuu+7SNn/uNSNG3UQINRrAZvyd4R1/WD2KG6CVgkKS4Es0TJlDzlzq+Tw8V2DHZcbC3gRPud2Pg+cM1VEQSI+3rFbb2sSVL01LOeVxCAdDZYU1KHWv8GxTZenKt0Qth20DeCKHZK/risskKznFLs1fWft9HoMh4mdMgnyQ== 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=aeEp7BQWKU6MbeWTQRG8EuOUvawQ3v7QwTu8wiEiKkQ=; b=aQs5Ij8V88nVP+ZexM2TPpAs7E1OEd3kpLAxj0DpJPro/doXaD05DjcPiVWuObVf51YT/yTul4yV6Wv2XjdQuOjly5WW6OOJif3NvPMfCH0/I3fs9743/lpEO8eNoa6M2UdwSIFLtUmdKvKad/XnHLsWN+pV7Rg4zwgU76r/lf7yr+gQNZ2IPdGbDP3CWIviKrvXmW/3NKHF7MHFU7OTWT55oByr1koKUUE32fp9aRErLJY6tK0ns3fnmvXHpRt4UIIiRU+jXhcVSABckczC683BJbf0d1WNh2Tr+dV5u1lc+sNhFb8dK57w0k4HdHPvDyQLd2pT7M5Bo97DfB1C5Q== 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=aeEp7BQWKU6MbeWTQRG8EuOUvawQ3v7QwTu8wiEiKkQ=; b=NvSZqCXOXqqUV7oRg4cSoIyUwWHky4KzzK4kgjjKW7VVFHEEdpEImIFIY6LKP8sWO2AGRM3k0Mwt6PtUMSSAwXS6GKOY0wk/Lt/RyFMM4D7IyYB3F8ADtBEfibdr7eWPTY/VkEXFCzQiP7Hj+dp1BjM2pkbBf8dX27F6PscDUiM= 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 AM0PR0502MB4018.eurprd05.prod.outlook.com (2603:10a6:208:b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21; Wed, 7 Oct 2020 15:46:00 +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.3433.045; Wed, 7 Oct 2020 15:46:00 +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 3/7] ata: ahci: mvebu: Add support for A8k legacy DT bindings Date: Wed, 7 Oct 2020 17:45:50 +0200 Message-Id: <20201007154554.66650-4-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201007154554.66650-1-sven.auhagen@voleatech.de> References: <20201007154554.66650-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM0PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:208:1::24) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from svensmacbookair.sven.lan (109.193.235.168) by AM0PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:208:1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21 via Frontend Transport; Wed, 7 Oct 2020 15:45:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9a91ad0c-5c66-4d37-5666-08d86ad816cc X-MS-TrafficTypeDiagnostic: AM0PR0502MB4018: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:663; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PlYJLMo8BOhZ0bb5m7Myh2vOCUgg2TxDknTfCFvr2n0e05w77YYwc/B2SNbLAhUiXju2t4BuWOL/15g23Cgw4emba5zA6jenzIYfjGYAutdbS9Crwn1r2QcWSzEOMP+iRqWRRTQTwjEYvEuw48X1dFm2M34xEzWOgh/KPm5Kzr+SS3VuW5WO4pT5qxmgAvQjxyPIqu/43ROg7GUj9Zk3j9+x0Ld0jEUAL0B90dqQH0vcHf0C7FQpoxhUYst9LQPDjn0AlUejg7s8uRlajNXLvpe1wf1l9UlRizmSd8OV1ZO23PZgAuoBg+KcqizkXBOVkZ20zI1c96bDk7xBR+US/A== 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)(396003)(136003)(376002)(346002)(366004)(8936002)(956004)(5660300002)(66556008)(83380400001)(478600001)(66946007)(316002)(16526019)(2906002)(6666004)(30864003)(66476007)(1076003)(4326008)(2616005)(26005)(86362001)(6486002)(36756003)(7416002)(6512007)(9686003)(8676002)(6506007)(186003)(52116002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: MWXrW09F/IQUzpkumraXBN3TeCumLSvmbaBtb99aKIpU+vGDegnvYobERtiKonZzgHGgRtje8Uzu9qI+vFlXTKCU/zDLFhfJiJkOWc0Vo6u1tmFNybsN0rQgKDIz5w0NrJnUInwb/VAy/KwEgnwtJ6oBNL6oz7VquYEDyeDPXTxPIMrmn11pGtwhkG7VCJbI51aUHjpNbCnM/NuVNLYGKTS9i6rmhrWscYPKFCB3Ip9XSobAZWQDGlhhXJDcq3oCe3Tl9QHAhCTuydSlc/bpSKFNgW2uEsUWAk/fMd7Djje0PTPs3IaOV3ueIIRshQrhSuSdIa5nK51l6+rLBswcRXKZ1aU7RgQKYHuOX8tVS8tpoe8EYDg6vg3dvWTJy5UwC+/lE1bW7oRBNGd+c84iUvc8ZC40GGo6Q2RH8nIwEvcoGHV72K+0QUgMhTZDl41t7sGWJ8xc4fsQNJ1VhkhqxDOiS74OVz/DEHHLxR4IPi6CNiv1PhAYVdhxUmr8Ru5tm1xM9vhiOHIeBYcSVZUFkmQCX8YW6rW1wgtD+P6NJDlEUkKfIpxpM69klVL8RE7FGYuEMcW59vAIfipXJIPkKNRJZBx8TJo7ZqBa32RgB2v4rjaOfvs029kQy/+jY8ev098Z75Lg6aYkWKmPoxIvxw== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 9a91ad0c-5c66-4d37-5666-08d86ad816cc X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 15:46:00.2458 (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: mP2s/CBUJAfv10wXMPOPLHjzB7R7c/oaRasCIAwl/yHi/Q78GuzkdoFUVXaU9Ey2x29haaaMfBxNBFXHsv7hPnF4OJcKPyZ8QZQmMYxysu4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB4018 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 --- drivers/ata/ahci.h | 3 + drivers/ata/ahci_mvebu.c | 235 ++++++++++++++++++++++++++++++++- drivers/ata/libahci.c | 3 +- drivers/ata/libahci_platform.c | 3 + include/linux/ahci_platform.h | 1 + 5 files changed, 239 insertions(+), 6 deletions(-) diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index d991dd46e89c..8cb256eec86b 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -407,6 +407,9 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class, int ahci_do_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline, bool *online); +void ahci_handle_port_interrupt(struct ata_port *ap, + void __iomem *port_mmio, u32 status); + unsigned int ahci_qc_issue(struct ata_queued_cmd *qc); int ahci_stop_engine(struct ata_port *ap); void ahci_start_fis_rx(struct ata_port *ap); diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c index 1cdc126882eb..62e9b94e2bba 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,14 @@ #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); unsigned int host_flags; + unsigned int resource_flags; + unsigned int port_irq[2]; }; static void ahci_mvebu_mbus_config(struct ahci_host_priv *hpriv, @@ -96,6 +102,213 @@ static int ahci_mvebu_armada_3700_config(struct ahci_host_priv *hpriv) 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 irqreturn_t ahci_multi_irqs_intr_hard_armada8k(int irq, void *dev_instance) +{ + struct ata_port *ap = dev_instance; + struct ata_host *host = ap->host; + struct ahci_host_priv *hpriv = host->private_data; + void __iomem *port_mmio = ahci_port_base(ap); + void __iomem *mmio = hpriv->mmio; + u32 status; + + VPRINTK("ENTER\n"); + + status = readl(port_mmio + PORT_IRQ_STAT); + writel(status, port_mmio + PORT_IRQ_STAT); + + spin_lock(ap->lock); + ahci_handle_port_interrupt(ap, port_mmio, status); + spin_unlock(ap->lock); + + writel(BIT(ap->port_no), mmio + HOST_IRQ_STAT); + + VPRINTK("EXIT\n"); + + return IRQ_HANDLED; +} + +static int ahci_host_activate_multi_irqs_armada8k(struct ata_host *host, + struct scsi_host_template *sht) +{ + struct ahci_host_priv *hpriv = host->private_data; + int i, rc; + + rc = ata_host_start(host); + if (rc) + return rc; + /* + * Requests IRQs one per port + */ + for (i = 0; i < host->n_ports; i++) { + struct ahci_port_priv *pp = host->ports[i]->private_data; + int irq = hpriv->get_irq_vector(host, i); + + /* Do not receive interrupts sent by dummy ports */ + if (!pp) { + disable_irq(irq); + continue; + } + + rc = devm_request_irq(host->dev, irq, ahci_multi_irqs_intr_hard_armada8k, + 0, pp->irq_desc, host->ports[i]); + + if (rc) + return rc; + ata_port_desc(host->ports[i], "irq %d", irq); + } + + return ata_host_register(host, sht); +} + +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}, + }; + + if (of_get_child_count(dev->of_node)) + return 0; + + pdata->port_irq[1] = irq_create_fwspec_mapping(&fwspec); + if (pdata->port_irq[1]) + hpriv->mask_port_map = GENMASK(1, 0); + + return 0; +} + +static int ahci_platform_init_host_armada8k(struct platform_device *pdev, + struct ahci_host_priv *hpriv, + const struct ata_port_info *pi_template, + struct scsi_host_template *sht) +{ + struct ahci_mvebu_plat_data *pdata = hpriv->plat_data; + struct device *dev = &pdev->dev; + struct ata_port_info pi = *pi_template; + const struct ata_port_info *ppi[] = { &pi, NULL }; + struct device_node *child; + struct ata_host *host; + int i, port_irq, n_ports, rc, 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) { + rc = port_irq; + return rc; + } + + pdata->port_irq[port] = port_irq; + port++; + } + } else { + /* 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 -EINVAL; + } + } + + hpriv->get_irq_vector = ahci_get_per_port_irq_armada8k; + + /* prepare host */ + pi.private_data = (void *)(unsigned long)hpriv->flags; + + ahci_save_initial_config(dev, hpriv); + + if (hpriv->cap & HOST_CAP_NCQ) + pi.flags |= ATA_FLAG_NCQ; + + if (hpriv->cap & HOST_CAP_PMP) + pi.flags |= ATA_FLAG_PMP; + + ahci_set_em_messages(hpriv, &pi); + + /* CAP.NP sometimes indicate the index of the last enabled + * port, at other times, that of the last possible port, so + * determining the maximum port number requires looking at + * both CAP.NP and port_map. + */ + n_ports = max(ahci_nr_ports(hpriv->cap), fls(hpriv->port_map)); + + host = ata_host_alloc_pinfo(dev, ppi, n_ports); + if (!host) + return -ENOMEM; + + host->private_data = hpriv; + + if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss) + host->flags |= ATA_HOST_PARALLEL_SCAN; + else + dev_info(dev, "SSS flag set, parallel bus scan disabled\n"); + + if (pi.flags & ATA_FLAG_EM) + ahci_reset_em(host); + + for (i = 0; i < host->n_ports; i++) { + struct ata_port *ap = host->ports[i]; + + ata_port_desc(ap, "mmio %pR", + platform_get_resource(pdev, IORESOURCE_MEM, 0)); + ata_port_desc(ap, "port 0x%x", 0x100 + ap->port_no * 0x80); + + /* set enclosure management message type */ + if (ap->flags & ATA_FLAG_EM) + ap->em_message_type = hpriv->em_msg_type; + + /* disabled/not-implemented port */ + if (!(hpriv->port_map & (1 << i))) + ap->ops = &ata_dummy_port_ops; + } + + if (hpriv->cap & HOST_CAP_64) { + rc = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(64)); + if (rc) { + rc = dma_coerce_mask_and_coherent(dev, + DMA_BIT_MASK(32)); + if (rc) { + dev_err(dev, "Failed to enable 64-bit DMA.\n"); + return rc; + } + dev_warn(dev, "Enable 32-bit DMA instead of 64-bit.\n"); + } + } + + rc = ahci_reset_controller(host); + if (rc) + return rc; + + ahci_init_controller(host); + ahci_print_info(host, "platform"); + + return ahci_host_activate_multi_irqs_armada8k(host, sht); +} + static int ahci_mvebu_armada_8k_config(struct ahci_host_priv *hpriv) { return 0; @@ -189,15 +402,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); @@ -214,7 +434,11 @@ static int ahci_mvebu_probe(struct platform_device *pdev) if (rc) goto disable_resources; - rc = ahci_platform_init_host(pdev, hpriv, &ahci_mvebu_port_info, + if (pdata->resource_flags & AHCI_PLATFORM_A8K_QUIRK) + rc = ahci_platform_init_host_armada8k(pdev, hpriv, &ahci_mvebu_port_info, + &ahci_platform_sht); + else + rc = ahci_platform_init_host(pdev, hpriv, &ahci_mvebu_port_info, &ahci_platform_sht); if (rc) goto disable_resources; @@ -237,6 +461,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_A8K_QUIRK, }; static const struct of_device_id ahci_mvebu_of_match[] = { diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index ea5bf5f4cbed..0e6eaa2e03a9 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -1799,7 +1799,7 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat) ata_port_abort(ap); } -static void ahci_handle_port_interrupt(struct ata_port *ap, +void ahci_handle_port_interrupt(struct ata_port *ap, void __iomem *port_mmio, u32 status) { struct ata_eh_info *ehi = &ap->link.eh_info; @@ -1882,6 +1882,7 @@ static void ahci_handle_port_interrupt(struct ata_port *ap, ata_port_freeze(ap); } } +EXPORT_SYMBOL_GPL(ahci_handle_port_interrupt); static void ahci_port_intr(struct ata_port *ap) { diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c index 129556fcf6be..21332a33f766 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_A8K_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..b31972e0bfbf 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_A8K_QUIRK 0x02 #endif /* _AHCI_PLATFORM_H */ From patchwork Wed Oct 7 15:45:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1378073 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=TpqF77mI; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C5zFz4Pdzz9sV0 for ; Thu, 8 Oct 2020 02:46:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728755AbgJGPqP (ORCPT ); Wed, 7 Oct 2020 11:46:15 -0400 Received: from mail-eopbgr80090.outbound.protection.outlook.com ([40.107.8.90]:50658 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728038AbgJGPqL (ORCPT ); Wed, 7 Oct 2020 11:46:11 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J/ikbelQPioJKIBbycPx9xLYPRKrLEKu5u8zDW7jqsBDQ9yQe4+qN+P066Uc7JAYHJZ5Xnv6yqQdxSn+MaWM/h+ZpjwhdJ5q0RllXj+W52XVbpu7qToBUDij5IsbiQytEkwsoXaMQDMXtQVajzyHupWFc9ZQk2695f+sWpu3XjhHuU/yJAN4Os/O+PxYDij/Re9qCVexzs3HSCDZRZOW5ygqYxJ2fRDuu7uSnzJLVS8TDkg2/lOWPi2QcI0FshGF7Gjqdjei6yurHrNsKgd709FIo7MDplpvfblHmz9wnTBXp2R4IgEt9sI9pp+Zpdt01/wthY31URJYmjPA/5/m1Q== 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=9oNkHhHy+eRnp6MbnjKvlP+YoHuqwrg3T8zmFFmwiK4=; b=mHXyEzHwfNM4C+oVSLyM46NNTHgjfR36LLNUbjz44ZnJOseoGd6/U6adONSccY3XSpAchL9+u7N0eUZlzmqz3SzTnqqU94wDqThjbUPPmA+jGS4VPvZVX/a9rsRr9auy9IKxeIqYgB6hp36iIGjhKThef+e3QFopj1kWwFkbwiQGcMnHr4GjGD3hwmSIvN9MEotepsh+KMZCLpLF0ay1oBV384S/OdMnhLK83IDO/M0bxqQiJdy0oZ/vcDyNJbBF46lGDTZEkyOuHUylll8UH9JWkI2gyCNrJ/mInThVVLp7U58nQxIjqe+ri9Yw6Tk22UkJtXnL1UmdW5kpp945Mg== 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=9oNkHhHy+eRnp6MbnjKvlP+YoHuqwrg3T8zmFFmwiK4=; b=TpqF77mIPZfuhSPMh/1lTPQz9aWNKR7wcINq538L9AK6TWoF7NDPOjr+bb+ouyEbq8Wiov2GQsgPNpIfmbm81DazRCQqzAlRXNW/vmy1RWAbrX73MQ6xAzrBjO4n4q9OV8XurCe2mnPMjZdCWEzyH8tba58O9AaIzHTnbDPiELs= 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 AM0PR0502MB4018.eurprd05.prod.outlook.com (2603:10a6:208:b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21; Wed, 7 Oct 2020 15:46:01 +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.3433.045; Wed, 7 Oct 2020 15:46:01 +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 4/7] irqchip/irq-mvebu-icu: Remove the double SATA ports interrupt hack Date: Wed, 7 Oct 2020 17:45:51 +0200 Message-Id: <20201007154554.66650-5-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201007154554.66650-1-sven.auhagen@voleatech.de> References: <20201007154554.66650-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM0PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:208:1::24) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from svensmacbookair.sven.lan (109.193.235.168) by AM0PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:208:1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21 via Frontend Transport; Wed, 7 Oct 2020 15:46:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b528e64a-ce94-470f-448e-08d86ad81751 X-MS-TrafficTypeDiagnostic: AM0PR0502MB4018: 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: k6yXNUP+TM4IsB8qNIgulZn/0SOaMih6uwFfKQ/x7miP3KT+fRIetspQgs2HDkjg2DFHjpqxyHbYRtLOH1HLJI07yxerFD20oWbu1QoRlhrW2ykaBW1NcA7AR8iuMeshmg/srrnQCTiaTY1XV05qHBJVocTOjIck5Cm6laRV6BN6LhCpTJAnzeOqUQHZPu5A+LVawoHPmRzGRjeuqYLdWH5KuPP5Nw//Jb9QY5Ny6e/vEBDz2n01mV+p5AH7WvPxCqysrR5CWpRakU2fB785a4BKdohZ711FhbiijFTvSFrZmGrR/gjVRW1l1GcUFFxB1sJm9f13ak81EZhNwFhdRA== 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)(396003)(136003)(376002)(346002)(366004)(8936002)(956004)(5660300002)(66556008)(83380400001)(478600001)(66946007)(316002)(16526019)(2906002)(6666004)(66476007)(1076003)(4326008)(2616005)(26005)(86362001)(6486002)(36756003)(7416002)(6512007)(9686003)(8676002)(6506007)(186003)(52116002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: DkgkcMvbFxZMfXPasaTv4wMhcOnzoipG5Sz9Bi14fegwPFNRyP/LFDoAro96sRNspzXm7KjmDv7rwjFxORLKiukuZdkzzoiK5QTH2xB24WC/Pj6aNIoojlYbEwo0+Wv776rY4i+fFNCN6dPsz0xhWnGqbA6nl7d2eLYm++WlYt1kVMB+imwI8zFD5/FGMiSOILhbMT7Hp+UPGPDucYegKlK6FuHgA9pFw8p8Eh9gCWVeJlUkd7MprJ58b05j11DnGBJDujVOz2ufNxC4mxwMGKEyAXmgzDXIWAUNGUxJoD+u6XbBAH2zKn6KMvutcsLix6yggjnAzMs44TXi8aP4+tZNBw18BCeVg8lipFx1zgRuxh04zXDmBF4uDxzhGw+yR0r8+yOtyUtvQV0qytPvxjlISYDwxlFcUmuOcLx4vcH4so3MXCI3f1C6+u30yIvV/Ge8OhZnEDhyJlgocb5YtRddykrm2+W63r1Yq7zXbDFD6nslAUoXPTXKKz19bOiH7k2S4C6Q6LQOL/xLNTWCaeCdT4PXkVU7qV2G2wDNMvviIVI+eLJCmRe4Te4S0GyrMiIm+XiTBLNf6lXdYs3I2AfKawuPcS6NimMnDz6ILa5U1JMYh9kJo4uEQgb4QkCvG9MTCkqTa6+0PCltgNzN/w== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: b528e64a-ce94-470f-448e-08d86ad81751 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 15:46:01.1180 (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: jNoWyOVuoIUmBUUL5701W0ERXRn8V3rw/vo37ptg8q7t06neGc+j5v8cuDQPp1rItN4R08mAKvu1uuoxMoSxT6QfZBpXYLS6cNmOaD8gSx8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB4018 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. Signed-off-by: Miquel Raynal Acked-by: Marc Zyngier Reviewed-by: Hans de Goede --- 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 Oct 7 15:45:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1378079 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=SMqok/+Z; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C5zG63kM0z9sTm for ; Thu, 8 Oct 2020 02:46:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728767AbgJGPqU (ORCPT ); Wed, 7 Oct 2020 11:46:20 -0400 Received: from mail-eopbgr80101.outbound.protection.outlook.com ([40.107.8.101]:61507 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728756AbgJGPqS (ORCPT ); Wed, 7 Oct 2020 11:46:18 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RFz3hXihA14UTw8ZdKzR9G4vo9PkO9BReN94Ytcm/D+BK+bqQOqPJbBCMrjpSvfozsStYZVconWJN3xtwjN2p2p5REZdSZNR9p/6qAq32VZBmy7K7584OGIdpGFp4GJMooSVK6Eed+MnCiaB9MLy+6kaW1E6ChQBakufuNs24fDxTnlvZHzcg8o0dVCu2Z/T3THcxA6Q4osHo8ceovoLyCzhocLGdtrwxlYs1m/HDJWSEa6wsijzuDzeHsgS7Nf4SW8NH7kX4ml+gqWUSglYlKj5I6PPv2n8bzJK7PZvKC/e9IRnIGe/ufxx31YDNO1cVZdU4BFMkh9zKI5FoSxL9Q== 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=Ht3SwZF/1kaFhy1E85zrXYO08GkuSItrpVZukCmpmh8=; b=fhfHAEhoBorpJFqPiNWPXGXCacmSiqKvcW+BV/YQ1B5qETfi0LKzfPXu+mRXJQvhYwB6XNZBFZze5JIeg1fS8m4shyeiG/5ldWi16L2/zakScXvS9LjwdwN3pmpTzdSq3EjLmsXnpKe9LgeIOhdyWAF0XZPQX0oEXN93zE2Oya3bAgXhdWKFxe5n6UnU6YZ8Tv+5Ls8C0Yz80oYI922XVwcjpsm4SuAt+ykYqo1nDxpa2xp9V/9jdlnmj/9LmeZ2CORiL5X4Fu0HHtikp+tDeDAYO0+vPxBbRWdCbvULm+i7uVhkPmJwKcEoMN4Nn/r8mOixwKyPJQhH8eeXgysTaA== 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=Ht3SwZF/1kaFhy1E85zrXYO08GkuSItrpVZukCmpmh8=; b=SMqok/+ZHIlUo7bq6s5GOjNQYHt98OZXKDGpZTgnWlTLuWsiq8Na0J6jjzn1qkEXj6PKn+R3B63gLxk5UsD65df68Omqi+tGVUd4K07xmjrX7IDhrGbZtKHcTEf7xjm0H9eLVxE1GTKluD9BDKPkzrCfxm2BmFIjdsfTc11+wvM= 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 AM0PR0502MB4018.eurprd05.prod.outlook.com (2603:10a6:208:b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21; Wed, 7 Oct 2020 15:46:02 +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.3433.045; Wed, 7 Oct 2020 15:46:02 +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 5/7] dt-bindings: ata: Update ahci bindings with possible per-port interrupts Date: Wed, 7 Oct 2020 17:45:52 +0200 Message-Id: <20201007154554.66650-6-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201007154554.66650-1-sven.auhagen@voleatech.de> References: <20201007154554.66650-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM0PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:208:1::24) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from svensmacbookair.sven.lan (109.193.235.168) by AM0PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:208:1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21 via Frontend Transport; Wed, 7 Oct 2020 15:46:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1cdcf0be-ea50-42dd-732c-08d86ad81829 X-MS-TrafficTypeDiagnostic: AM0PR0502MB4018: 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: GOsOrBtrNTsm+56iZidVqqw7Vw66GulY8sQq11JyIjvqHveec961AkEaGBOuieRe4cKxpCvUoUx3MEQPXrIb9z2F9OwcvAU6kcj3skEauS/2qUuArQpCneOBxGiJb+9dSIf6lF1aZLIeyGlaRTFmujhZtY+2veQhTt8Fgbz0Kk77O2t9TeTeK3gLCwlB6e1rcRbLfZDsbdUFz47mEykjJ7LKhw6US2ibAWyhGajPaGYK+f3oVmqUGoBJJXOcf6q/byDN9qpWGB/yI2aheWB3qjXPw/gE+gAIHvx39+X0tdgOApdQptw4ATC8q+j1qbsWYZUHM4cPtJPVDvhSY2nyMg== 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)(396003)(39840400004)(136003)(376002)(346002)(366004)(8936002)(956004)(5660300002)(66556008)(83380400001)(478600001)(66946007)(316002)(16526019)(2906002)(6666004)(66476007)(1076003)(4326008)(2616005)(26005)(86362001)(6486002)(36756003)(7416002)(6512007)(9686003)(8676002)(15650500001)(6506007)(186003)(52116002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: zpvAfBnNVYFcnzuxivrRDkhmT3DYk08r0eodYte5oGy2vQKPl1k+Kuj/SHCVqi+ZG2cB5cMOQ/1mtEEPdnGwTSckUBneoempS3XwZR1Jb8YP3fixqf+LbhIjjrlbvlp4m9M6iRFUp/71Xub6kKRCfEi9XhuAecIng5NjYgr7kOfum2m1/TL5cRWQzFoHGZYCwgsOjhk+GARmBB/ZOkbR2aYWU4giQQflhTsFTylgofUYGLrR/SNfCsoKoYAvq0B2YbtzpJCYWvUvcSqeXFzIcqQUKJmfyTIMM3uz2wc/JcTnqNpkNMrMwiD7+/ZTQZ0cFHA25CXLv0lVEicU99xmuRZSPpxraEnY889td8nRAfK6RLiF93qOzUd7Kx9cuCPkO/8qSsCJdc75wodskWXko3+l9wY88ZuE9tLQjj0OsSbvKkIkUBg6YQnUb4TzxMXHJnXpVf5yeglK7BS2rmM9MuGc9mwbgaePn7KdHXbQdZDCbGT8W7Wvapm+Mb4jkmUIjnGqHftC1ePJgF1+Ia6jlmXTK/LzwUgpCDyIyZNYSs7Lx1IHO9kxf+piHZ/36O4CS/RfGMiED92OSUo4QpEhfGMG8+gVb20Vm9ZUKM9kqkLjjvVRLA0y3i/Ti0UrAz/ple2h13TDye+nXapD9euiOw== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 1cdcf0be-ea50-42dd-732c-08d86ad81829 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 15:46:02.6045 (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: VsoHfRkCc+xe/p4Wojng8bHCVax8IRPVkrADs77dIlGgfF+QF04zqcY/1ui+d+LFRircOzIwD4bl1evtUhQwsm9pPFVlToKVJ30tymWEVvk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB4018 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. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring Reviewed-by: Hans de Goede --- 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 Oct 7 15:45:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1378075 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=F+bWtBW2; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C5zG21QRXz9sTt for ; Thu, 8 Oct 2020 02:46:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728729AbgJGPqR (ORCPT ); Wed, 7 Oct 2020 11:46:17 -0400 Received: from mail-eopbgr80090.outbound.protection.outlook.com ([40.107.8.90]:50658 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728759AbgJGPqR (ORCPT ); Wed, 7 Oct 2020 11:46:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tl1EhKxcRVRYlI3VXf/fFbxLXrWG0UutQkQPcJaNlObCnbSgQnESzEkZipVl4Nd76zpJuVPWgrIYrrZe/kHpDZAo3Ax6E5AoyW/LgggABqWMnV5Ms5sSbPZ1G0zt5xqeNPrnmxv7BANP3QJAomSk1iO1+05cyMBaUwOkW+3hEIS9XGPlUVqr/5RduNGswabAqVDOhP6GIlDrbeUUNZYl36HilsHAApYTGA8c9aCFOOByw+lMvyRzqzrvT+4Evlde3Qhuuv48uELK7JKE6KfOhIzCWj2dQUKHMoM62Yw8a+qtwySfe7/jut6BsH+iJIiOyXKTPr5zlMLI0sFekBXksA== 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=/JUyw11InmqgqknormzmcFzgA3E43go6O/wijs8CNdY=; b=MDJO4dCUGqleWi/Q6ymDe/o2TYCjWlx85WrGyC+hlTD6fsPeP365F/Id2KmrtWaSx0SC0lsntTSLHPM5F/InOwaNvL3wj0uGf5syiCFy3zlc+nZP9x/1gakD3lPsXpePo5dYb2PdAhYvEnNaRAP5oHw8EV/8FBEewseDT0feFNcBC9qkwHLqNMffbhV6j99nx8LlHqDZirC3Sdjtd3l7KjGsa5BNYDRYgGZOl6N6MqsWY4UFO4xn/hWK6byr8auif3Sxqok2UeKfyQzRKlDbVPJHd3Qmi8XUwfe3Z02z+64AXBeTG5JQ3LOFni3cYUQJRysTCne3vhqVdYAjs1ri/w== 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=/JUyw11InmqgqknormzmcFzgA3E43go6O/wijs8CNdY=; b=F+bWtBW2AeVb/4BT5MK9O4TXuR0BHuMyC81LwtlLZNOM0qB3ju39X/JXFMa2JmHjV/qi/oVV2Z8ox1hKvOvXfB/y8qKfOvfDTdZUSuCFMKchB/E+Y9e8Idz9GvpgGSuRZLeCX26tJoqFigp457krx3+ghfi3+le0U/6maf0RLVs= 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 AM0PR0502MB4018.eurprd05.prod.outlook.com (2603:10a6:208:b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21; Wed, 7 Oct 2020 15:46:03 +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.3433.045; Wed, 7 Oct 2020 15:46:03 +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 6/7] dt-bindings: ata: Update ahci_mvebu bindings Date: Wed, 7 Oct 2020 17:45:53 +0200 Message-Id: <20201007154554.66650-7-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201007154554.66650-1-sven.auhagen@voleatech.de> References: <20201007154554.66650-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM0PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:208:1::24) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from svensmacbookair.sven.lan (109.193.235.168) by AM0PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:208:1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21 via Frontend Transport; Wed, 7 Oct 2020 15:46:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8e053e57-84f3-4f37-d06f-08d86ad818c8 X-MS-TrafficTypeDiagnostic: AM0PR0502MB4018: 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: TIlhzq8MbAPF2C5tmcQj1MHCE9m6Kr9xKeqPUbXCe5eT5a7ksFroRK29tuyPmvjEY3I4t97bKNLL8A3RhWlCii35U+D6TgdCMKhXK1Xy1X15+vRkGQlI/705khHa4cCzVLBQatxVi2up98q+kBLXPtXneQ7WUVKRDIOJW1ttdg/ABIbhUJY7u3GpDxp/8Pts7SIUmGUE5NirS33qcxziwN/hqUT/HNUgdIcWZNPVXYx6558uB5TODiVvefQ+RVVsGRLhjtTtzvLgYwytHO5UUVGbcpRreu+qBXEEDh7cprfnBEyDXUrdzHAwhQP5TlBl 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)(396003)(39840400004)(136003)(376002)(346002)(366004)(8936002)(956004)(5660300002)(66556008)(4744005)(83380400001)(478600001)(66946007)(316002)(16526019)(2906002)(6666004)(66476007)(1076003)(4326008)(2616005)(26005)(86362001)(6486002)(36756003)(7416002)(6512007)(9686003)(8676002)(15650500001)(6506007)(186003)(52116002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: E2lhBawG/1nT88GF5X5apebyPTUyI4b3tSDSEQMSO7LELIFf2+jbZ+qY1cUYYWwga/DRzISZlx/bu1gjIWGV4onDTiM6+LJ4EePBtomr6uwte1TOHw4a8SCi4BnNNuWly6eGiTXJr9Nwh2p+vROyta1X6jZhtlddN8/4qGAcdRD1uN/8cbLMY1+4z1AQ93sgpLf3+EBVinChq5khdDExzB/Cz7AFwSzcLo3PKZmsweSKedf4SGbfNxxys/w/f2SNZLxpIPE754fWY9JSzI2l+TvX4IqCH3dCdjpkaH/WgE+HZCnQhTLdZH7dTAdCmq0qeTX2/mdXIN7hB8L1cU70jOzn0hidpv4fobqojY7TnSwZ4+csUDxcGTKPAlms3IlTei3D7bktmsD+9oL71KcbCWtiBr2nummDeZdgX6zqEc023SJDchfzAd6UjC+4cAmR+YTX9Pz1ybrSJydpXmPinY2TfklNXpTb0EFcj+05HEDE9KuFusV9fkkKmYTEMv9yXrhcUtQwLPAML4UjFx29qBu35QO7kqNP42lrsFR+CSqYraLpp4SycZulDPYm3pwsYy69PfnDAYalyIqiYXcy2Vs3+xEDnKK5ZvmtMo8W1tktLc6E9btlki9Hdcrwvnad3+GuV837gZ2nyanmQT2FkA== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 8e053e57-84f3-4f37-d06f-08d86ad818c8 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 15:46:03.5841 (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: OW+2pELxshCzDfPfkN1JPsMZ2VExxu38CLk/xH940gzhKunwrFETi2lxmLrEjbNgPzmPEXFRcdlpmAZh9wKvtMDOfjF1SS56tSvZ4dyJr/g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB4018 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. Signed-off-by: Miquel Raynal Reviewed-by: Rob Herring Reviewed-by: Hans de Goede --- 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 Oct 7 15:45:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1378078 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=PHyO0THm; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C5zG46fWnz9sTt for ; Thu, 8 Oct 2020 02:46:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728759AbgJGPqU (ORCPT ); Wed, 7 Oct 2020 11:46:20 -0400 Received: from mail-eopbgr80090.outbound.protection.outlook.com ([40.107.8.90]:50658 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728728AbgJGPqT (ORCPT ); Wed, 7 Oct 2020 11:46:19 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BVKa4QwxWv6GviJlUuXMhbhQOOXeoxVQTaPoWNcU/OYU1UK9uqTONmTWc2QizQ4RAH1efDMeRENFd/7CM7YdWmYhBSAGCLz0AD3vJQ6+4okwJRzZoACOCeC+eA4G3WW9P3OLVGtWYJvo3DKI849DME+Q39dDPsVVhY/XzJ//NTdBv8cQI7kzI9IZHUoNcEz4eWw5uy3wWT9pR4BM+GH6OfCR4Moz2o/ozw/gIOLRcM4Q6cG7isDimG28DHgZgOKzubRvrp4jqPZA7VaUliX95OO3YVU+me4EAHlO99yGWcZ9pVO4zhhHPbvBx3lOJmkrXQ3S5H70BfAjLuhrbVuwTA== 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=Y0J0F+ZZfztLObf+ffDbTOb1C+UP0ppjG4fFyqlwRWI=; b=QlMbUD9HLes6NelAPZewlFcVy1nR4EsUeMenu7iAL/A4GXyg6T2ASQ9OkjVDgoNGuxadJgPcA9EPbbuwOWoa4bTos1s4fIvWsPWNURcJwROSqfOAqxVWrvxuI1G0cRXomMEKePl499pi3V6g+VqZjS22abqOiH+QXa1LDlDk6hGFGndy8Sjd7cnp7Ry5iAocjfcBHfOn2iiaa8sixGA5xZOGftrc8kHg94/whLbTcEJ+bNpyqykOeZIIsV90wyKUfPJHKP9UXOUgBeZ9jO9+FH9U6vaAvc0Gr+vQ/G8UcqdQLvYvigUkHdSZbLzOToLkJtBEPsU4NB+OAgmbaDpQ+w== 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=Y0J0F+ZZfztLObf+ffDbTOb1C+UP0ppjG4fFyqlwRWI=; b=PHyO0THmSR0Ko1uPY1zYhC+vDLZzl5GJI1NTM8M6CD/nGF1b8O73KCBC/ivNRgH1YOiZWnFVwCXWF5uAGSJt8VnpHpqOAjwvwGEP6U418uvlOCR7bmREeBRSSKBx9WHK48/KcTGSqAkrK31LCQmhOAQxyJ80PN8XTELOBic0U1c= 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 AM0PR0502MB4018.eurprd05.prod.outlook.com (2603:10a6:208:b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21; Wed, 7 Oct 2020 15:46:04 +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.3433.045; Wed, 7 Oct 2020 15:46:04 +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 7/7] arm64: dts: marvell: armada-cp110: Switch to per-port SATA interrupts Date: Wed, 7 Oct 2020 17:45:54 +0200 Message-Id: <20201007154554.66650-8-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201007154554.66650-1-sven.auhagen@voleatech.de> References: <20201007154554.66650-1-sven.auhagen@voleatech.de> X-Originating-IP: [109.193.235.168] X-ClientProxiedBy: AM0PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:208:1::24) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from svensmacbookair.sven.lan (109.193.235.168) by AM0PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:208:1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21 via Frontend Transport; Wed, 7 Oct 2020 15:46:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3018760e-2727-4a5e-e5d8-08d86ad81959 X-MS-TrafficTypeDiagnostic: AM0PR0502MB4018: 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: esaMH/YjJkWviT/GcF7yNcmm+xm2Nmul1xF6A2ufjR8RT8RD6wm6hJ6ZDrIHWm19tBRGDxvxl3aCTSIiYgmGlNFTfa1WXW8x2SBlJUROy4twd65y1AA/inR5jpsuYmnGCZnsPt7n7uSpqr8p0TPuz53qdpcKUzDEI6FDzb5wJY1k66ke0r61rahsOU9ITWnDJHd6FQ7fRwE16GFimn/giA0TOJWvOzE1qT/kwopz5D1AtC6rh6TwBfXaS3UQh5VLV+bJ5E1Jiwa8UxGN630LBTKmH0eqt6yZiK9YDrEIHSuHTVbe5nUN5pkxoqMgsIc9ZmHhM4mtkPzvrEOMXb8Uwg== 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)(396003)(39840400004)(136003)(376002)(346002)(366004)(8936002)(956004)(5660300002)(66556008)(83380400001)(478600001)(66946007)(316002)(16526019)(2906002)(6666004)(66476007)(1076003)(4326008)(2616005)(26005)(86362001)(6486002)(36756003)(7416002)(6512007)(9686003)(8676002)(6506007)(186003)(52116002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 6GFO0XovvrfLyMr13wnE0PPqSfxJJBxoHuW/w5dmN6bhBLwY+vqJ4EqvhDHcMxLNuSWwjcOfnxDUrwuYTg1dVarf6qa8nVoLxcEgPV2utF5go1VlsSltDCw8cGD232Xk+1wjhSe8ebZ+jHgjE/AaGAOBp7Wc4dpJ3e2sFpeUQ26ionI6MTC9YrmU5Lop69b/svcbNGonkAvFGhm99tpy7hbdCaVRTEcGcfcFG2xcCIwRG+V62Mhvsl/6VL+JauKuuSpDdGgS6Zx1+7Gldxutu49j+xAnGQ4JViqSZt9q6w5VDzhq63d5ToQ6oo7Bx9LjUD3u1flp7O8Y7Mzd/d1QiP04x3hDieUhteaIFTmEZpdtwFraIeNMC6zJeE4XeFvyWWglfHtTOZGEvmQQVTmRht4LcV5bY9aURJzUre+nNu0T+XqCgQLAUxZ9evR28njb5o6bg7EWrG4MILcyWynN53IXUpdtYB8/6l+9QJdQVCuDkm5BexvWtFCthSf9rvm6Mo2LgbiF6pbGEj1uRk6Z9ZfpulgPushPOG6nmsu2V/cAIEUTWdZ2Pdy2L1DvlOz5mcPYw8gJbEKWPj2A6OqFKDHftVQ18cW/gHNTws2sEdZ4oyhX+vnbLJ1S/9vFtuWXblbB/KnMLh8fnaF0jpDhww== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 3018760e-2727-4a5e-e5d8-08d86ad81959 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2020 15:46:04.5559 (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: PM+2pHr8+/YViTeaHy39g2v34ZtqR9zjTtc1sBRggnY/fax7gLjmQ7SW/xnfDsSbn0E5NKxaFByFlCXFTQlrM7BIQEcjKa4zlDrqSVrnOkE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB4018 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. Signed-off-by: Sven Auhagen Signed-off-by: Thomas Petazzoni Signed-off-by: Miquel Raynal Reviewed-by: Hans de Goede --- 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>; }; };