From patchwork Sun Jul 19 06:59:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 11672217 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 615D91510 for ; Sun, 19 Jul 2020 07:01:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 38F732073A for ; Sun, 19 Jul 2020 07:01:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FR1mdkWn"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=voleatech.de header.i=@voleatech.de header.b="izIvLi3m" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38F732073A Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=8QY0ogF2LXt617BuSGmDUDIW45IVYAS3yGV7jnkWtSo=; b=FR1mdkWn6IM2p46V5koC8NNtK uJKavmVqY/kM8UJf99eg9+VoycJY/nITZWeXw8mghrRQWDOq44/T7O8Wlb0/pJFihAo1absXGeggi d/fWefsjm3UJLdGO/W7OjxVHRxOm+tTkgnzmKzMH3sQLBkjuN7zoFhrc/Vic1y2A7/OMau1icbyOm Y8vMp5FTNFa4+5k48Al/yR2iCFy/0XPNZS1epfgMfY9Ehp3HtiKBXXvZkc4amZuO9eNu+ElZ8W+5N mbOhu2YN3G/kL6re4bxV4f+GcuvrjKmK2gtx7Z62QpBI2jfVTncFQytY9tp/JNALB/R91ArNCkPxk cUMg2PviA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jx3Io-0007w3-7k; Sun, 19 Jul 2020 07:00:02 +0000 Received: from mail-eopbgr60090.outbound.protection.outlook.com ([40.107.6.90] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jx3Id-0007sT-Ps for linux-arm-kernel@lists.infradead.org; Sun, 19 Jul 2020 06:59:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C/h+D/FHaeeXr+qFnEtUK85QGkv//NsNKTnU0YPa5IMLdv1DKIEPrFfNjTT5xVYoPpXqD4c4EiiTinN0LWyfgkqIZXmAcVoSAlLF8iA68b7FdCQLcSHWbxTwnXShS0rCz+qEGjPzhMV/eU4W/TAX/7S/aCh1nEnLXVMjkSvVzkq0y5NEbloww8/xTQeLbBAYwACJBsHd333F5XrKdceNlZ6rvYVfk137EQzoMNHrZNxOkoyrPT6HG307iSNWm3lhMaiZovjqTvFE8+V+CV7z1vZdWBOg0wAx+9kHcrqHodR5hBgOx8WaiqT9D2uwB4GYMBx0WCP1vUQofZIQK4Bh1A== 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=d1W+rcX4qhXUIUoCj8g+SMPjANoyubk0uFu4xCICvFg=; b=ZNQrWOUm7m7UNMgq2F1zceuqqreD4kpmITTfCzaYFxoXuKbPzsvtA4fy6TIwmynGFTqaSJd6CcbTc5iJw5y8eTaKM8wbRoq31MHiy7IWXvyIIml74epyniL90/iwiXhu8hsg1w0HbVRp1AW5Po1uByR3kHe+mMiF5R6ZgLVPv6HW7jlT6uVMoTYTSHVidtWtMfJnRItxFnFp7DGgvpqkJAM4vWz6o82yTzGwBBSqUCqEPpYlk+WUpkX9gqQEodTrV8Sh0y/R77BwsC4THa5VwgGwBN30wmah3vK3X45fqzF0wLmUbX1le2mjrkmJsqJ++ULCAkNghOOPlMsaGuAGHw== 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=d1W+rcX4qhXUIUoCj8g+SMPjANoyubk0uFu4xCICvFg=; b=izIvLi3mylAhMmaaBp/omEVekKREu71fW/YZHhmzy8cqNgaTtc5ONZi7lNo6ZpxfnBLDxL8QsjCKxYYnLWrvf6EWyH969yS9FW1wGddtrEjI99+l66L4QzWuqEGHkzbykap9mxf/t1WkwY1357FbD1ynz7r4WgByOnrW3jjvx/A= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none;lists.infradead.org; dmarc=none action=none header.from=voleatech.de; Received: from AM4PR0501MB2785.eurprd05.prod.outlook.com (2603:10a6:200:5d::11) by AM4PR05MB3396.eurprd05.prod.outlook.com (2603:10a6:205:5::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.23; Sun, 19 Jul 2020 06:59:48 +0000 Received: from AM4PR0501MB2785.eurprd05.prod.outlook.com ([fe80::39a1:e237:5fef:6f39]) by AM4PR0501MB2785.eurprd05.prod.outlook.com ([fe80::39a1:e237:5fef:6f39%11]) with mapi id 15.20.3195.025; Sun, 19 Jul 2020 06:59:48 +0000 From: sven.auhagen@voleatech.de To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 4/7] irqchip/irq-mvebu-icu: Remove the double SATA ports interrupt hack Date: Sun, 19 Jul 2020 08:59:39 +0200 Message-Id: <20200719065942.24693-5-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20200719065942.24693-1-sven.auhagen@voleatech.de> References: <20200719065942.24693-1-sven.auhagen@voleatech.de> X-ClientProxiedBy: AM0PR01CA0099.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::40) To AM4PR0501MB2785.eurprd05.prod.outlook.com (2603:10a6:200:5d::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from SvensMacBookAir.sven.lan (109.193.235.168) by AM0PR01CA0099.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.17 via Frontend Transport; Sun, 19 Jul 2020 06:59:47 +0000 X-Mailer: git-send-email 2.24.3 (Apple Git-128) X-Originating-IP: [109.193.235.168] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 69543b68-a8bf-40bc-d7f2-08d82bb1535e X-MS-TrafficTypeDiagnostic: AM4PR05MB3396: 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: FZYmjL6RJM2lkQPHYEoTq1AHXhl7D5oIflGWCKYIWa5Ip6YgaSB9t/ciyaUaKXdxxG35cJ620GICuhS9XOLtqKEyXq9Rav1JNL9SJXIWAedQZY2aij63hPGCz6IQBLPZ6NW9hP5QxwKR/QmkTdbBJUBrEV2YVCzZo0ym5CNRsSun1mDv4W7aOBfm/SULb4LBO1ctwFm8+I7B6ne8SiO/0IphHlmXMNNw8eGugeOJ47LwH00smw7R/pKPkE1IbYyg7QwJT72EEqhmKs6ByxLjlWEORMK5GR7P/Wa/Q3w/pPzY9+qoYN7vQ8YfgRRz5OhkGn4cOcWBOi393xk2UkqlGQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM4PR0501MB2785.eurprd05.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(346002)(376002)(396003)(39830400003)(136003)(36756003)(316002)(5660300002)(2906002)(6666004)(6486002)(7416002)(66556008)(508600001)(6916009)(83380400001)(8676002)(66476007)(8936002)(6506007)(956004)(1076003)(4326008)(2616005)(26005)(16526019)(86362001)(9686003)(6512007)(186003)(66946007)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: ONDFQr4r9yKF9OIN4+esgfE1IqbtzH8yG2m8C30BjbmB1n4SVnZvu15VWUdcRUeIO25t/spDZWoelImA5W2AASSc9mXsgE/znQH1gG1UIvxzs9ZZeHT4cs3OrYXt+TK6w672vRypBN8MExsIY2WVSZ10udgx5Dy7v/7YRdKvXaP8N9q0hWtBuPIhu03LBLykh2FTjM45INJ15vxTnsrGMtkk+byXbHoBzoRcTAVrqGpR0k1S+imlmKksQy+3DBpvtjTmKNU45hMUddu7cXg4a0es7NyYPyQB67d6hC6LdN6bD/ukGo07wCgy9eD4QNkJy3CqL2PCvdEAv67cuAInDS3B1/bObEDgf0PD2miriuM/7kUxQ06kRMvLie8pPUp28GqCDhvu/9bQHxWGzUJnMOxxzXv4sLWkIPfVlKmI2OZpaNc4QxJs92clvmieCJME0caBgmcqq2crLyFoNCMXw0SbDs++8Efp9zZox88GoPhsRUzAn73ByWrtwJq57uo1 X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 69543b68-a8bf-40bc-d7f2-08d82bb1535e X-MS-Exchange-CrossTenant-AuthSource: AM4PR0501MB2785.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2020 06:59:48.2374 (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: vsZavzUmcTFZYKSmOIeC/sLC6iannBFT7wQoBk7Rf3WK5JF2rXDka4p7IV5kApCcsldxOeYNzss1Lojs3cJI9Kao3ME+S8o46BP+lcnL+es= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR05MB3396 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200719_025951_897483_49E83506 X-CRM114-Status: UNSURE ( 9.25 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.9 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [40.107.6.90 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.6.90 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, andrew@lunn.ch, baruch@tkos.co.il, jason@lakedaemon.net, linux-ide@vger.kernel.org, antoine.tenart@bootlin.com, gregory.clement@bootlin.com, maxime.chevallier@bootlin.com, nadavh@marvell.com, hdegoede@redhat.com, robh+dt@kernel.org, axboe@kernel.dk, thomas.petazzoni@bootlin.com, miquel.raynal@bootlin.com, marc.zyngier@arm.com, tglx@linutronix.de, sebastian.hesselbarth@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 --- 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 = {