From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD94EC433DF for ; Thu, 9 Jul 2020 10:14:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9FE49207D0 for ; Thu, 9 Jul 2020 10:14:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="qNV3iG4l" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726475AbgGIKO4 (ORCPT ); Thu, 9 Jul 2020 06:14:56 -0400 Received: from mail-db8eur05on2057.outbound.protection.outlook.com ([40.107.20.57]:6171 "EHLO EUR05-DB8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726365AbgGIKOz (ORCPT ); Thu, 9 Jul 2020 06:14:55 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IfA39nxx8+rtvcZXjwVC5YeJVl2Mf+Fq8skd5F9RX2No8JXQJTb3FSafgxhUMRXlE+i2w75yMiF+0+aLquXL7aC8jEZ2kK6OE9QVVKB4AA6vJMsFp5pKJwTxekJFTo4kKsSoJAMxPMaRauhDv0ZvTOqSxpzMofnVPbca/yu+/qXilnE9EUbB65Lp3trq/nNZSKRMaJoPtG6kNoDRSo3AvY+W2MXZQ7gR7dlRDaX7hNtPAKTqCbzzTvPOoEavXlYE6GPHVZCTTg/lwXAgsyJA8iw1DLOS9qm2hMHVnKUNhZcjBYm+o+xl8z80RXhuwQ6EPKOxi2bY3+xmsEcyAwAe5w== 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=uVX4XjwNa0CysUAdtJ4NqhzSadXdZxErhaPgNnn7zLQ=; b=B2DVKuQCSs2mi1l4ESa3wKyVBKasOxVNWF3Tm4DzZAui3XeHy+Bk1qUL2H7zBzea/VmKX0PqwPC9e2AgrIP3oqny1cWpi0xw5TtZZ8laxlB7qwuXK3DBy3zENY5FeSnb3xBWzhQ4pSDJ+eEkrsXzdogR3+PAng54+9Zv772SsJm1n+SmdKmn31ZOVpitsmXJ9Q+BRREzTJ+ruJUa7sDreHY95744x83C+/6VN7bwnT40N00goDb5b+2aYl1A2ycic3YH1R/vHJcgzdkNpXKSZhyeV30naGYLrtQISJCetMJY3n0nffxWxuNjexZu5eFHm2Oc55+n/j+bFByPukC4KQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uVX4XjwNa0CysUAdtJ4NqhzSadXdZxErhaPgNnn7zLQ=; b=qNV3iG4lqUTr3/7GPCo6XnZ0VxPFkj10xliUjBlXSaNh+LNYvf4YZQ96NBc/TJpb7Oex7H0aI1eug75gD5JUkj/cPnhOYJW7d2rkdcv7F5I4Vh8vNbmnw1jM2HmMNucjVFvSgaYB/8gtY86xvMIQgGRGdWVkQT8YLYZYWfIidkw= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=nxp.com; Received: from VI1PR0402MB3405.eurprd04.prod.outlook.com (2603:10a6:803:3::26) by VI1PR04MB5583.eurprd04.prod.outlook.com (2603:10a6:803:d4::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Thu, 9 Jul 2020 10:14:49 +0000 Received: from VI1PR0402MB3405.eurprd04.prod.outlook.com ([fe80::b97a:64f0:3ab5:d7fa]) by VI1PR0402MB3405.eurprd04.prod.outlook.com ([fe80::b97a:64f0:3ab5:d7fa%5]) with mapi id 15.20.3174.022; Thu, 9 Jul 2020 10:14:49 +0000 Subject: Re: [EXT] Re: [PATCH v2 12/12] bus: fsl-mc: Add ACPI support for fsl-mc To: Makarand Pawagi , Lorenzo Pieralisi Cc: "linux-arm-kernel@lists.infradead.org" , "Diana Madalina Craciun (OSS)" , "iommu@lists.linux-foundation.org" , "linux-acpi@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-pci@vger.kernel.org" , Rob Herring , "Rafael J. Wysocki" , Joerg Roedel , Hanjun Guo , Bjorn Helgaas , Sudeep Holla , Robin Murphy , Catalin Marinas , Will Deacon , Marc Zyngier References: <20200521130008.8266-1-lorenzo.pieralisi@arm.com> <20200619082013.13661-1-lorenzo.pieralisi@arm.com> <20200619082013.13661-13-lorenzo.pieralisi@arm.com> <20200709091950.GA18149@e121166-lin.cambridge.arm.com> From: Laurentiu Tudor Message-ID: <203372be-144c-54ba-d011-30d0746dd615@nxp.com> Date: Thu, 9 Jul 2020 13:14:45 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AM0PR03CA0101.eurprd03.prod.outlook.com (2603:10a6:208:69::42) To VI1PR0402MB3405.eurprd04.prod.outlook.com (2603:10a6:803:3::26) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [192.168.1.107] (86.120.184.194) by AM0PR03CA0101.eurprd03.prod.outlook.com (2603:10a6:208:69::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20 via Frontend Transport; Thu, 9 Jul 2020 10:14:47 +0000 X-Originating-IP: [86.120.184.194] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a5153a77-c0eb-4529-77b9-08d823f0e9be X-MS-TrafficTypeDiagnostic: VI1PR04MB5583: X-MS-Exchange-Transport-Forked: True 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: eufU1vanAilRUImQGc5S+bhVRonh6BV5uYEWKRhHFpMVRDbHwXZ43Q3Ru1kB03/U9ctisSYoMh2WgVjje3nwYpninEo+DBJSdm8Twn6DWE59lYFYzfjO/QP3VH/PDlJXwrRoPXkgeIm2UC5Z0ewx4s5E3ZcRs8YdvrxCGkRM6JumX6XQk9nIp2Q/vyXcj9VuYzcEKf6elqbFYJx6K5VoNBve01P2Gh5F1LIDQhanHRtS/hlm9anuHGvQQp2npZCxetIuiENAYvmoQ3I57RPuBUZzOqE2yq5PeCcFr/JKGQ+Gag2rozMMLedR6CqYzkeH8L7jfwMB+xpsE6EK5FSLZYoCXtll8ujjQ865WTNEh2W/56iuA/fvh2UAdFY6E46z X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3405.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(136003)(396003)(39860400002)(346002)(376002)(478600001)(7416002)(110136005)(54906003)(2906002)(31696002)(52116002)(86362001)(316002)(31686004)(5660300002)(83380400001)(36756003)(26005)(16576012)(4326008)(53546011)(956004)(66946007)(44832011)(8936002)(16526019)(2616005)(6486002)(186003)(66476007)(66556008)(8676002)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 0WTixTlSt0bJEJjIg3IcUPlIG0ySspYCO6Aw5vfrwqFt4gjM83sb4VpqEZR4FM5AexvWgiex8Rq2On8Q2199FagNy3GFAgLSKdS0KQN4uyMkRhyoUYZc1T/Fb5V4bSIoPNM0pE3iAPuDLrZ9IJ/d0jwagu1Ds9Pawz+t5F4iDdd3bCOsIMbazSA2FGJyptYpN/7J2vHzwDgNLkFcbqsNjKVdZAXyFDLq0VxFiAFtU9piwOxrXWrKZOq5kXeXs2RO7azJEoCwwGEBiPLbj7D0lAH6bMu2yIr00ZoFDzBl/tAKk2nlrUgMaR44B8wRmSaCYgClOjOM9/ReNh0ISZyCWAY02Gk/BsBuemhRkvNhnbXcf+ysSsKlk10N7MGJavDoOOAh1uMe97n013hMehqRvhjSBRFLq9NakL5CHdenC8rD0uPMzb3E2I++SBuJA/PA9iaMBbuZhU0U730Z4cFUBoIknNVBJ4E87vZtJt8LXfXAYweeOtkDpe+dBriEErBj X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5153a77-c0eb-4529-77b9-08d823f0e9be X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3405.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2020 10:14:49.6550 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: oWssU3C/QI601hQTeh9oeda3WGB0aP9cPdEbv/PdOHZCkoxUgZT8xvmEAhb+WVjA/07FTsKGVfZCcuTq/rqLbg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5583 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On 7/9/2020 12:26 PM, Makarand Pawagi wrote: > > >> -----Original Message----- >> From: Lorenzo Pieralisi >> Sent: Thursday, July 9, 2020 2:50 PM >> To: Laurentiu Tudor >> Cc: linux-arm-kernel@lists.infradead.org; Makarand Pawagi >> ; Diana Madalina Craciun (OSS) >> ; iommu@lists.linux-foundation.org; linux- >> acpi@vger.kernel.org; devicetree@vger.kernel.org; linux-pci@vger.kernel.org; >> Rob Herring ; Rafael J. Wysocki ; >> Joerg Roedel ; Hanjun Guo ; Bjorn >> Helgaas ; Sudeep Holla ; >> Robin Murphy ; Catalin Marinas >> ; Will Deacon ; Marc Zyngier >> >> Subject: [EXT] Re: [PATCH v2 12/12] bus: fsl-mc: Add ACPI support for fsl-mc >> >> Caution: EXT Email >> >> On Wed, Jul 01, 2020 at 07:55:28PM +0300, Laurentiu Tudor wrote: >>> >>> >>> On 6/19/2020 11:20 AM, Lorenzo Pieralisi wrote: >>>> From: Makarand Pawagi >>>> >>>> Add ACPI support in the fsl-mc driver. Driver parses MC DSDT table >>>> to extract memory and other resources. >>>> >>>> Interrupt (GIC ITS) information is extracted from the MADT table by >>>> drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c. >>>> >>>> IORT table is parsed to configure DMA. >>>> >>>> Signed-off-by: Makarand Pawagi >>>> Signed-off-by: Diana Craciun >>>> Signed-off-by: Laurentiu Tudor >>>> --- >>>> drivers/bus/fsl-mc/fsl-mc-bus.c | 73 ++++++++++++---- >>>> drivers/bus/fsl-mc/fsl-mc-msi.c | 37 +++++---- >>>> drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c | 92 >>>> ++++++++++++++++----- >>>> 3 files changed, 150 insertions(+), 52 deletions(-) >>>> >>>> diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c >>>> b/drivers/bus/fsl-mc/fsl-mc-bus.c index 824ff77bbe86..324d49d6df89 >>>> 100644 >>>> --- a/drivers/bus/fsl-mc/fsl-mc-bus.c >>>> +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c >>>> @@ -18,6 +18,8 @@ >>>> #include >>>> #include >>>> #include >>>> +#include >>>> +#include >>>> >>>> #include "fsl-mc-private.h" >>>> >>>> @@ -38,6 +40,7 @@ struct fsl_mc { >>>> struct fsl_mc_device *root_mc_bus_dev; >>>> u8 num_translation_ranges; >>>> struct fsl_mc_addr_translation_range *translation_ranges; >>>> + void *fsl_mc_regs; >>>> }; >>>> >>>> /** >>>> @@ -56,6 +59,10 @@ struct fsl_mc_addr_translation_range { >>>> phys_addr_t start_phys_addr; >>>> }; >>>> >>>> +#define FSL_MC_FAPR 0x28 >>>> +#define MC_FAPR_PL BIT(18) >>>> +#define MC_FAPR_BMT BIT(17) >>>> + >>>> /** >>>> * fsl_mc_bus_match - device to driver matching callback >>>> * @dev: the fsl-mc device to match against @@ -124,7 +131,10 @@ >>>> static int fsl_mc_dma_configure(struct device *dev) >>>> while (dev_is_fsl_mc(dma_dev)) >>>> dma_dev = dma_dev->parent; >>>> >>>> - return of_dma_configure_id(dev, dma_dev->of_node, 0, &input_id); >>>> + if (dev_of_node(dma_dev)) >>>> + return of_dma_configure_id(dev, dma_dev->of_node, 0, >>>> + &input_id); >>>> + >>>> + return acpi_dma_configure_id(dev, DEV_DMA_COHERENT, &input_id); >>>> } >>>> >>>> static ssize_t modalias_show(struct device *dev, struct >>>> device_attribute *attr, @@ -865,8 +875,11 @@ static int >> fsl_mc_bus_probe(struct platform_device *pdev) >>>> struct fsl_mc_io *mc_io = NULL; >>>> int container_id; >>>> phys_addr_t mc_portal_phys_addr; >>>> - u32 mc_portal_size; >>>> - struct resource res; >>>> + u32 mc_portal_size, mc_stream_id; >>>> + struct resource *plat_res; >>>> + >>>> + if (!iommu_present(&fsl_mc_bus_type)) >>>> + return -EPROBE_DEFER; >>>> >>>> mc = devm_kzalloc(&pdev->dev, sizeof(*mc), GFP_KERNEL); >>>> if (!mc) >>>> @@ -874,19 +887,33 @@ static int fsl_mc_bus_probe(struct >>>> platform_device *pdev) >>>> >>>> platform_set_drvdata(pdev, mc); >>>> >>>> + plat_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); >>>> + mc->fsl_mc_regs = devm_ioremap_resource(&pdev->dev, plat_res); >>>> + if (IS_ERR(mc->fsl_mc_regs)) >>>> + return PTR_ERR(mc->fsl_mc_regs); >>>> + >>>> + if (IS_ENABLED(CONFIG_ACPI) && !dev_of_node(&pdev->dev)) { >>>> + mc_stream_id = readl(mc->fsl_mc_regs + FSL_MC_FAPR); >>>> + /* >>>> + * HW ORs the PL and BMT bit, places the result in bit 15 of >>>> + * the StreamID and ORs in the ICID. Calculate it accordingly. >>>> + */ >>>> + mc_stream_id = (mc_stream_id & 0xffff) | >>>> + ((mc_stream_id & (MC_FAPR_PL | MC_FAPR_BMT)) ? >>>> + 0x4000 : 0); >>>> + error = acpi_dma_configure_id(&pdev->dev, DEV_DMA_COHERENT, >>>> + &mc_stream_id); >>>> + if (error) >>>> + dev_warn(&pdev->dev, "failed to configure dma: %d.\n", >>>> + error); >>>> + } >>>> + >>>> /* >>>> * Get physical address of MC portal for the root DPRC: >>>> */ >>>> - error = of_address_to_resource(pdev->dev.of_node, 0, &res); >>>> - if (error < 0) { >>>> - dev_err(&pdev->dev, >>>> - "of_address_to_resource() failed for %pOF\n", >>>> - pdev->dev.of_node); >>>> - return error; >>>> - } >>>> - >>>> - mc_portal_phys_addr = res.start; >>>> - mc_portal_size = resource_size(&res); >>>> + plat_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >>>> + mc_portal_phys_addr = plat_res->start; >>>> + mc_portal_size = resource_size(plat_res); >>>> error = fsl_create_mc_io(&pdev->dev, mc_portal_phys_addr, >>>> mc_portal_size, NULL, >>>> FSL_MC_IO_ATOMIC_CONTEXT_PORTAL, >>>> &mc_io); @@ -903,11 +930,13 @@ static int fsl_mc_bus_probe(struct >> platform_device *pdev) >>>> dev_info(&pdev->dev, "MC firmware version: %u.%u.%u\n", >>>> mc_version.major, mc_version.minor, >>>> mc_version.revision); >>>> >>>> - error = get_mc_addr_translation_ranges(&pdev->dev, >>>> - &mc->translation_ranges, >>>> - &mc->num_translation_ranges); >>>> - if (error < 0) >>>> - goto error_cleanup_mc_io; >>>> + if (dev_of_node(&pdev->dev)) { >>>> + error = get_mc_addr_translation_ranges(&pdev->dev, >>>> + &mc->translation_ranges, >>>> + &mc->num_translation_ranges); >>>> + if (error < 0) >>>> + goto error_cleanup_mc_io; >>>> + } >>>> >>>> error = dprc_get_container_id(mc_io, 0, &container_id); >>>> if (error < 0) { >>>> @@ -934,6 +963,7 @@ static int fsl_mc_bus_probe(struct platform_device >> *pdev) >>>> goto error_cleanup_mc_io; >>>> >>>> mc->root_mc_bus_dev = mc_bus_dev; >>>> + mc_bus_dev->dev.fwnode = pdev->dev.fwnode; >>> >>> Makarand, this looks a bit weird. Is there really a reason for it? >> >> Can you clarify please so that we can reach a conclusion on this matter ? >> > Laurentiu, can you clarify what exactly is the doubt here? Are you asking about fwnode assignment from pdev to mc_bus_dev? > Yes. I remember that a while ago I tested without this fwnode assignment and didn't encounter any issues. Maybe we can just drop it? --- Best Regards, Laurentiu