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=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 88E87C4320D for ; Tue, 24 Sep 2019 18:13:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 71E6021A4A for ; Tue, 24 Sep 2019 18:13:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2505098AbfIXSNO (ORCPT ); Tue, 24 Sep 2019 14:13:14 -0400 Received: from mx2.suse.de ([195.135.220.15]:44168 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2505076AbfIXSNH (ORCPT ); Tue, 24 Sep 2019 14:13:07 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 67856AC93; Tue, 24 Sep 2019 18:13:04 +0000 (UTC) From: Nicolas Saenz Julienne To: robh+dt@kernel.org, devicetree@vger.kernel.org, frowand.list@gmail.com, linux-arm-kernel@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, dmaengine@vger.kernel.org, etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, xen-devel@lists.xenproject.org, linux-tegra@vger.kernel.org, linux-media@vger.kernel.org, linux-pci@vger.kernel.org, Stuart Yoder , Laurentiu Tudor , Thierry Reding , Bjorn Helgaas Cc: mbrugger@suse.com, robin.murphy@arm.com, f.fainelli@gmail.com, james.quinlan@broadcom.com, wahrenst@gmx.net, Nicolas Saenz Julienne Subject: [PATCH 10/11] of: device: introduce of_dma_configure_parent() Date: Tue, 24 Sep 2019 20:12:41 +0200 Message-Id: <20190924181244.7159-11-nsaenzjulienne@suse.de> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190924181244.7159-1-nsaenzjulienne@suse.de> References: <20190924181244.7159-1-nsaenzjulienne@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Devices not represented in DT, placed behind a bus that autodetects them, pass of_dma_configure() their bus' DT node. This misses that bus' 'dma-ranges' property as the function's implementation expects the DT node to be one of a device. Create of_dma_configure_parent() which takes the given DT node as the device's underlying bus and parses it accordingly. Signed-off-by: Nicolas Saenz Julienne --- drivers/bus/fsl-mc/fsl-mc-bus.c | 2 +- drivers/gpu/host1x/bus.c | 2 +- drivers/of/device.c | 30 ++++++++++++++++++++++++++++-- drivers/pci/pci-driver.c | 3 ++- include/linux/of_device.h | 13 ++++++++++--- 5 files changed, 42 insertions(+), 8 deletions(-) diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c index 5c9bf2e06552..217e64119497 100644 --- a/drivers/bus/fsl-mc/fsl-mc-bus.c +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c @@ -134,7 +134,7 @@ 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(dev, dma_dev->of_node, 0); + return of_dma_configure_parent(dev, dma_dev->of_node, false); } static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index 742aa9ff21b8..2fdc04383a60 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -442,7 +442,7 @@ static int host1x_device_add(struct host1x *host1x, device->dev.bus = &host1x_bus_type; device->dev.parent = host1x->dev; - of_dma_configure(&device->dev, host1x->dev->of_node, true); + of_dma_configure_parent(&device->dev, host1x->dev->of_node, true); device->dev.dma_parms = &device->dma_parms; dma_set_max_seg_size(&device->dev, SZ_4M); diff --git a/drivers/of/device.c b/drivers/of/device.c index 018c52688546..1d0b1127d05e 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -83,6 +83,31 @@ int of_device_add(struct platform_device *ofdev) * accordingly. */ int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma) +{ + struct device_node *dma_parent; + int ret; + + dma_parent = __of_get_dma_parent(np); + ret = of_dma_configure_parent(dev, dma_parent, force_dma); + of_node_put(dma_parent); + + return ret; +} +EXPORT_SYMBOL_GPL(of_dma_configure); + +/** + * of_dma_configure_parent - Setup DMA configuration based on a parent bus' + * DT node + * @dev: Device to apply DMA configuration + * @parent: Parent bus device node + * @force_dma: Whether device is to be set up by of_dma_configure() even if + * DMA capability is not explicitly described by firmware. + * + * Try to get devices's DMA configuration from parent bus' DT and update it + * accordingly. + */ +int of_dma_configure_parent(struct device *dev, struct device_node *parent, + bool force_dma) { u64 dma_addr, paddr, size = 0; int ret; @@ -91,8 +116,9 @@ int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma) const struct iommu_ops *iommu; u64 mask; - ret = of_dma_get_range(__of_get_dma_parent(np), &dma_addr, - &paddr, &size); + dev_dbg(dev, "starting at %pOF\n", parent); + + ret = of_dma_get_range(parent, &dma_addr, &paddr, &size); if (ret < 0) { /* * For legacy reasons, we have to assume some devices need diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index a8124e47bf6e..25073d68a0f6 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1628,7 +1628,8 @@ static int pci_dma_configure(struct device *dev) if (IS_ENABLED(CONFIG_OF) && bridge->parent && bridge->parent->of_node) { - ret = of_dma_configure(dev, bridge->parent->of_node, true); + ret = of_dma_configure_parent(dev, bridge->parent->of_node, + true); } else if (has_acpi_companion(bridge)) { struct acpi_device *adev = to_acpi_device_node(bridge->fwnode); diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 8d31e39dd564..8f319b8c9deb 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -55,9 +55,9 @@ static inline struct device_node *of_cpu_device_node_get(int cpu) return of_node_get(cpu_dev->of_node); } -int of_dma_configure(struct device *dev, - struct device_node *np, - bool force_dma); +int of_dma_configure(struct device *dev, struct devce_node *np, bool force_dma); +int of_dma_configure_parent(struct device *dev, struct device_node *parent, + bool force_dma); #else /* CONFIG_OF */ static inline int of_driver_match_device(struct device *dev, @@ -112,6 +112,13 @@ static inline int of_dma_configure(struct device *dev, { return 0; } + +static inline int of_dma_configure_parent(struct device *dev, + struct device_node *parent, + bool force_dma) +{ + return 0; +} #endif /* CONFIG_OF */ #endif /* _LINUX_OF_DEVICE_H */ -- 2.23.0 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 ECBFBC432C1 for ; Tue, 24 Sep 2019 18:17:18 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C82EC214DA for ; Tue, 24 Sep 2019 18:17:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="XOR94Y/9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C82EC214DA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.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=VtHI+D/ovXOcQ7zqqLhSdkNyPlejUWmfgBtk6M0l2CI=; b=XOR94Y/95WKWdd K/X4Wx+p9F+EMwtf9hUxlE9eOQKcqCBeoXin5VWSBsIcSbcFdL60rowtw4CgxXDPWHmipZNkjKEbP 1vvjRce8p2mZ9q4+dsmn8Pv4hLLg+jzQM6y5KfhoiigL+7KnrFHajQm7uN3Qqc0GUZiF5i5zCmuws jUSsI4gKgEcvLc79jC5wzBJHCn2xNOWPSl+VQNZThzdU9j+ARYx6AyrwoHkdBxV4tJ801AlYGa3cK 495jKUThS9Yvrhkez8MfXWYiLHfnoPymE6544ch/ycfP84pQ0KMkZ1rA4TYnedX5a+oX4rtEIX35B mnVziiOIRxiint1FI/gA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iCpN9-0007Aq-LG; Tue, 24 Sep 2019 18:17:11 +0000 Received: from mx2.suse.de ([195.135.220.15] helo=mx1.suse.de) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iCpJB-0003Dc-OC for linux-arm-kernel@lists.infradead.org; Tue, 24 Sep 2019 18:13:07 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 67856AC93; Tue, 24 Sep 2019 18:13:04 +0000 (UTC) From: Nicolas Saenz Julienne To: robh+dt@kernel.org, devicetree@vger.kernel.org, frowand.list@gmail.com, linux-arm-kernel@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, dmaengine@vger.kernel.org, etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, xen-devel@lists.xenproject.org, linux-tegra@vger.kernel.org, linux-media@vger.kernel.org, linux-pci@vger.kernel.org, Stuart Yoder , Laurentiu Tudor , Thierry Reding , Bjorn Helgaas Subject: [PATCH 10/11] of: device: introduce of_dma_configure_parent() Date: Tue, 24 Sep 2019 20:12:41 +0200 Message-Id: <20190924181244.7159-11-nsaenzjulienne@suse.de> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190924181244.7159-1-nsaenzjulienne@suse.de> References: <20190924181244.7159-1-nsaenzjulienne@suse.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190924_111306_343154_FF4ED7E6 X-CRM114-Status: GOOD ( 14.88 ) 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: f.fainelli@gmail.com, mbrugger@suse.com, wahrenst@gmx.net, james.quinlan@broadcom.com, robin.murphy@arm.com, Nicolas Saenz Julienne Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Devices not represented in DT, placed behind a bus that autodetects them, pass of_dma_configure() their bus' DT node. This misses that bus' 'dma-ranges' property as the function's implementation expects the DT node to be one of a device. Create of_dma_configure_parent() which takes the given DT node as the device's underlying bus and parses it accordingly. Signed-off-by: Nicolas Saenz Julienne --- drivers/bus/fsl-mc/fsl-mc-bus.c | 2 +- drivers/gpu/host1x/bus.c | 2 +- drivers/of/device.c | 30 ++++++++++++++++++++++++++++-- drivers/pci/pci-driver.c | 3 ++- include/linux/of_device.h | 13 ++++++++++--- 5 files changed, 42 insertions(+), 8 deletions(-) diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c index 5c9bf2e06552..217e64119497 100644 --- a/drivers/bus/fsl-mc/fsl-mc-bus.c +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c @@ -134,7 +134,7 @@ 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(dev, dma_dev->of_node, 0); + return of_dma_configure_parent(dev, dma_dev->of_node, false); } static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index 742aa9ff21b8..2fdc04383a60 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -442,7 +442,7 @@ static int host1x_device_add(struct host1x *host1x, device->dev.bus = &host1x_bus_type; device->dev.parent = host1x->dev; - of_dma_configure(&device->dev, host1x->dev->of_node, true); + of_dma_configure_parent(&device->dev, host1x->dev->of_node, true); device->dev.dma_parms = &device->dma_parms; dma_set_max_seg_size(&device->dev, SZ_4M); diff --git a/drivers/of/device.c b/drivers/of/device.c index 018c52688546..1d0b1127d05e 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -83,6 +83,31 @@ int of_device_add(struct platform_device *ofdev) * accordingly. */ int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma) +{ + struct device_node *dma_parent; + int ret; + + dma_parent = __of_get_dma_parent(np); + ret = of_dma_configure_parent(dev, dma_parent, force_dma); + of_node_put(dma_parent); + + return ret; +} +EXPORT_SYMBOL_GPL(of_dma_configure); + +/** + * of_dma_configure_parent - Setup DMA configuration based on a parent bus' + * DT node + * @dev: Device to apply DMA configuration + * @parent: Parent bus device node + * @force_dma: Whether device is to be set up by of_dma_configure() even if + * DMA capability is not explicitly described by firmware. + * + * Try to get devices's DMA configuration from parent bus' DT and update it + * accordingly. + */ +int of_dma_configure_parent(struct device *dev, struct device_node *parent, + bool force_dma) { u64 dma_addr, paddr, size = 0; int ret; @@ -91,8 +116,9 @@ int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma) const struct iommu_ops *iommu; u64 mask; - ret = of_dma_get_range(__of_get_dma_parent(np), &dma_addr, - &paddr, &size); + dev_dbg(dev, "starting at %pOF\n", parent); + + ret = of_dma_get_range(parent, &dma_addr, &paddr, &size); if (ret < 0) { /* * For legacy reasons, we have to assume some devices need diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index a8124e47bf6e..25073d68a0f6 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1628,7 +1628,8 @@ static int pci_dma_configure(struct device *dev) if (IS_ENABLED(CONFIG_OF) && bridge->parent && bridge->parent->of_node) { - ret = of_dma_configure(dev, bridge->parent->of_node, true); + ret = of_dma_configure_parent(dev, bridge->parent->of_node, + true); } else if (has_acpi_companion(bridge)) { struct acpi_device *adev = to_acpi_device_node(bridge->fwnode); diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 8d31e39dd564..8f319b8c9deb 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -55,9 +55,9 @@ static inline struct device_node *of_cpu_device_node_get(int cpu) return of_node_get(cpu_dev->of_node); } -int of_dma_configure(struct device *dev, - struct device_node *np, - bool force_dma); +int of_dma_configure(struct device *dev, struct devce_node *np, bool force_dma); +int of_dma_configure_parent(struct device *dev, struct device_node *parent, + bool force_dma); #else /* CONFIG_OF */ static inline int of_driver_match_device(struct device *dev, @@ -112,6 +112,13 @@ static inline int of_dma_configure(struct device *dev, { return 0; } + +static inline int of_dma_configure_parent(struct device *dev, + struct device_node *parent, + bool force_dma) +{ + return 0; +} #endif /* CONFIG_OF */ #endif /* _LINUX_OF_DEVICE_H */ -- 2.23.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 DC661C32775 for ; Wed, 25 Sep 2019 04:16:36 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 BA1632075D for ; Wed, 25 Sep 2019 04:16:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BA1632075D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iCyj3-0000TN-4t; Wed, 25 Sep 2019 04:16:25 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iCpJJ-0000GQ-3q for xen-devel@lists.xenproject.org; Tue, 24 Sep 2019 18:13:13 +0000 X-Inumbo-ID: f3ee48b4-def6-11e9-9625-12813bfff9fa Received: from mx1.suse.de (unknown [195.135.220.15]) by localhost (Halon) with ESMTPS id f3ee48b4-def6-11e9-9625-12813bfff9fa; Tue, 24 Sep 2019 18:13:05 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 67856AC93; Tue, 24 Sep 2019 18:13:04 +0000 (UTC) From: Nicolas Saenz Julienne To: robh+dt@kernel.org, devicetree@vger.kernel.org, frowand.list@gmail.com, linux-arm-kernel@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, dmaengine@vger.kernel.org, etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, xen-devel@lists.xenproject.org, linux-tegra@vger.kernel.org, linux-media@vger.kernel.org, linux-pci@vger.kernel.org, Stuart Yoder , Laurentiu Tudor , Thierry Reding , Bjorn Helgaas Date: Tue, 24 Sep 2019 20:12:41 +0200 Message-Id: <20190924181244.7159-11-nsaenzjulienne@suse.de> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190924181244.7159-1-nsaenzjulienne@suse.de> References: <20190924181244.7159-1-nsaenzjulienne@suse.de> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 25 Sep 2019 04:16:20 +0000 Subject: [Xen-devel] [PATCH 10/11] of: device: introduce of_dma_configure_parent() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: f.fainelli@gmail.com, mbrugger@suse.com, wahrenst@gmx.net, james.quinlan@broadcom.com, robin.murphy@arm.com, Nicolas Saenz Julienne Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" RGV2aWNlcyBub3QgcmVwcmVzZW50ZWQgaW4gRFQsIHBsYWNlZCBiZWhpbmQgYSBidXMgdGhhdCBh dXRvZGV0ZWN0cwp0aGVtLCBwYXNzIG9mX2RtYV9jb25maWd1cmUoKSB0aGVpciBidXMnIERUIG5v ZGUuIFRoaXMgbWlzc2VzIHRoYXQgYnVzJwonZG1hLXJhbmdlcycgcHJvcGVydHkgYXMgdGhlIGZ1 bmN0aW9uJ3MgaW1wbGVtZW50YXRpb24gZXhwZWN0cyB0aGUgRFQKbm9kZSB0byBiZSBvbmUgb2Yg YSBkZXZpY2UuCgpDcmVhdGUgb2ZfZG1hX2NvbmZpZ3VyZV9wYXJlbnQoKSB3aGljaCB0YWtlcyB0 aGUgZ2l2ZW4gRFQgbm9kZSBhcyB0aGUKZGV2aWNlJ3MgdW5kZXJseWluZyBidXMgYW5kIHBhcnNl cyBpdCBhY2NvcmRpbmdseS4KClNpZ25lZC1vZmYtYnk6IE5pY29sYXMgU2FlbnogSnVsaWVubmUg PG5zYWVuemp1bGllbm5lQHN1c2UuZGU+Ci0tLQoKIGRyaXZlcnMvYnVzL2ZzbC1tYy9mc2wtbWMt YnVzLmMgfCAgMiArLQogZHJpdmVycy9ncHUvaG9zdDF4L2J1cy5jICAgICAgICB8ICAyICstCiBk cml2ZXJzL29mL2RldmljZS5jICAgICAgICAgICAgIHwgMzAgKysrKysrKysrKysrKysrKysrKysr KysrKysrKy0tCiBkcml2ZXJzL3BjaS9wY2ktZHJpdmVyLmMgICAgICAgIHwgIDMgKystCiBpbmNs dWRlL2xpbnV4L29mX2RldmljZS5oICAgICAgIHwgMTMgKysrKysrKysrKy0tLQogNSBmaWxlcyBj aGFuZ2VkLCA0MiBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvYnVzL2ZzbC1tYy9mc2wtbWMtYnVzLmMgYi9kcml2ZXJzL2J1cy9mc2wtbWMvZnNsLW1j LWJ1cy5jCmluZGV4IDVjOWJmMmUwNjU1Mi4uMjE3ZTY0MTE5NDk3IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2J1cy9mc2wtbWMvZnNsLW1jLWJ1cy5jCisrKyBiL2RyaXZlcnMvYnVzL2ZzbC1tYy9mc2wt bWMtYnVzLmMKQEAgLTEzNCw3ICsxMzQsNyBAQCBzdGF0aWMgaW50IGZzbF9tY19kbWFfY29uZmln dXJlKHN0cnVjdCBkZXZpY2UgKmRldikKIAl3aGlsZSAoZGV2X2lzX2ZzbF9tYyhkbWFfZGV2KSkK IAkJZG1hX2RldiA9IGRtYV9kZXYtPnBhcmVudDsKIAotCXJldHVybiBvZl9kbWFfY29uZmlndXJl KGRldiwgZG1hX2Rldi0+b2Zfbm9kZSwgMCk7CisJcmV0dXJuIG9mX2RtYV9jb25maWd1cmVfcGFy ZW50KGRldiwgZG1hX2Rldi0+b2Zfbm9kZSwgZmFsc2UpOwogfQogCiBzdGF0aWMgc3NpemVfdCBt b2RhbGlhc19zaG93KHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZV9hdHRyaWJ1dGUg KmF0dHIsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9ob3N0MXgvYnVzLmMgYi9kcml2ZXJzL2dw dS9ob3N0MXgvYnVzLmMKaW5kZXggNzQyYWE5ZmYyMWI4Li4yZmRjMDQzODNhNjAgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2hvc3QxeC9idXMuYworKysgYi9kcml2ZXJzL2dwdS9ob3N0MXgvYnVz LmMKQEAgLTQ0Miw3ICs0NDIsNyBAQCBzdGF0aWMgaW50IGhvc3QxeF9kZXZpY2VfYWRkKHN0cnVj dCBob3N0MXggKmhvc3QxeCwKIAlkZXZpY2UtPmRldi5idXMgPSAmaG9zdDF4X2J1c190eXBlOwog CWRldmljZS0+ZGV2LnBhcmVudCA9IGhvc3QxeC0+ZGV2OwogCi0Jb2ZfZG1hX2NvbmZpZ3VyZSgm ZGV2aWNlLT5kZXYsIGhvc3QxeC0+ZGV2LT5vZl9ub2RlLCB0cnVlKTsKKwlvZl9kbWFfY29uZmln dXJlX3BhcmVudCgmZGV2aWNlLT5kZXYsIGhvc3QxeC0+ZGV2LT5vZl9ub2RlLCB0cnVlKTsKIAog CWRldmljZS0+ZGV2LmRtYV9wYXJtcyA9ICZkZXZpY2UtPmRtYV9wYXJtczsKIAlkbWFfc2V0X21h eF9zZWdfc2l6ZSgmZGV2aWNlLT5kZXYsIFNaXzRNKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvb2Yv ZGV2aWNlLmMgYi9kcml2ZXJzL29mL2RldmljZS5jCmluZGV4IDAxOGM1MjY4ODU0Ni4uMWQwYjEx MjdkMDVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL29mL2RldmljZS5jCisrKyBiL2RyaXZlcnMvb2Yv ZGV2aWNlLmMKQEAgLTgzLDYgKzgzLDMxIEBAIGludCBvZl9kZXZpY2VfYWRkKHN0cnVjdCBwbGF0 Zm9ybV9kZXZpY2UgKm9mZGV2KQogICogYWNjb3JkaW5nbHkuCiAgKi8KIGludCBvZl9kbWFfY29u ZmlndXJlKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZV9ub2RlICpucCwgYm9vbCBm b3JjZV9kbWEpCit7CisJc3RydWN0IGRldmljZV9ub2RlICpkbWFfcGFyZW50OworCWludCByZXQ7 CisKKwlkbWFfcGFyZW50ID0gX19vZl9nZXRfZG1hX3BhcmVudChucCk7CisJcmV0ID0gb2ZfZG1h X2NvbmZpZ3VyZV9wYXJlbnQoZGV2LCBkbWFfcGFyZW50LCBmb3JjZV9kbWEpOworCW9mX25vZGVf cHV0KGRtYV9wYXJlbnQpOworCisJcmV0dXJuIHJldDsKK30KK0VYUE9SVF9TWU1CT0xfR1BMKG9m X2RtYV9jb25maWd1cmUpOworCisvKioKKyAqIG9mX2RtYV9jb25maWd1cmVfcGFyZW50IC0gU2V0 dXAgRE1BIGNvbmZpZ3VyYXRpb24gYmFzZWQgb24gYSBwYXJlbnQgYnVzJworICoJCQkgICAgIERU IG5vZGUKKyAqIEBkZXY6CURldmljZSB0byBhcHBseSBETUEgY29uZmlndXJhdGlvbgorICogQHBh cmVudDoJUGFyZW50IGJ1cyBkZXZpY2Ugbm9kZQorICogQGZvcmNlX2RtYTogIFdoZXRoZXIgZGV2 aWNlIGlzIHRvIGJlIHNldCB1cCBieSBvZl9kbWFfY29uZmlndXJlKCkgZXZlbiBpZgorICoJCURN QSBjYXBhYmlsaXR5IGlzIG5vdCBleHBsaWNpdGx5IGRlc2NyaWJlZCBieSBmaXJtd2FyZS4KKyAq CisgKiBUcnkgdG8gZ2V0IGRldmljZXMncyBETUEgY29uZmlndXJhdGlvbiBmcm9tIHBhcmVudCBi dXMnIERUIGFuZCB1cGRhdGUgaXQKKyAqIGFjY29yZGluZ2x5LgorICovCitpbnQgb2ZfZG1hX2Nv bmZpZ3VyZV9wYXJlbnQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlX25vZGUgKnBh cmVudCwKKwkJCSAgICBib29sIGZvcmNlX2RtYSkKIHsKIAl1NjQgZG1hX2FkZHIsIHBhZGRyLCBz aXplID0gMDsKIAlpbnQgcmV0OwpAQCAtOTEsOCArMTE2LDkgQEAgaW50IG9mX2RtYV9jb25maWd1 cmUoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wLCBib29sIGZvcmNl X2RtYSkKIAljb25zdCBzdHJ1Y3QgaW9tbXVfb3BzICppb21tdTsKIAl1NjQgbWFzazsKIAotCXJl dCA9IG9mX2RtYV9nZXRfcmFuZ2UoX19vZl9nZXRfZG1hX3BhcmVudChucCksICZkbWFfYWRkciwK LQkJCSAgICAgICAmcGFkZHIsICZzaXplKTsKKwlkZXZfZGJnKGRldiwgInN0YXJ0aW5nIGF0ICVw T0ZcbiIsIHBhcmVudCk7CisKKwlyZXQgPSBvZl9kbWFfZ2V0X3JhbmdlKHBhcmVudCwgJmRtYV9h ZGRyLCAmcGFkZHIsICZzaXplKTsKIAlpZiAocmV0IDwgMCkgewogCQkvKgogCQkgKiBGb3IgbGVn YWN5IHJlYXNvbnMsIHdlIGhhdmUgdG8gYXNzdW1lIHNvbWUgZGV2aWNlcyBuZWVkCmRpZmYgLS1n aXQgYS9kcml2ZXJzL3BjaS9wY2ktZHJpdmVyLmMgYi9kcml2ZXJzL3BjaS9wY2ktZHJpdmVyLmMK aW5kZXggYTgxMjRlNDdiZjZlLi4yNTA3M2Q2OGEwZjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvcGNp L3BjaS1kcml2ZXIuYworKysgYi9kcml2ZXJzL3BjaS9wY2ktZHJpdmVyLmMKQEAgLTE2MjgsNyAr MTYyOCw4IEBAIHN0YXRpYyBpbnQgcGNpX2RtYV9jb25maWd1cmUoc3RydWN0IGRldmljZSAqZGV2 KQogCiAJaWYgKElTX0VOQUJMRUQoQ09ORklHX09GKSAmJiBicmlkZ2UtPnBhcmVudCAmJgogCSAg ICBicmlkZ2UtPnBhcmVudC0+b2Zfbm9kZSkgewotCQlyZXQgPSBvZl9kbWFfY29uZmlndXJlKGRl diwgYnJpZGdlLT5wYXJlbnQtPm9mX25vZGUsIHRydWUpOworCQlyZXQgPSBvZl9kbWFfY29uZmln dXJlX3BhcmVudChkZXYsIGJyaWRnZS0+cGFyZW50LT5vZl9ub2RlLAorCQkJCQkgICAgICB0cnVl KTsKIAl9IGVsc2UgaWYgKGhhc19hY3BpX2NvbXBhbmlvbihicmlkZ2UpKSB7CiAJCXN0cnVjdCBh Y3BpX2RldmljZSAqYWRldiA9IHRvX2FjcGlfZGV2aWNlX25vZGUoYnJpZGdlLT5md25vZGUpOwog CmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L29mX2RldmljZS5oIGIvaW5jbHVkZS9saW51eC9v Zl9kZXZpY2UuaAppbmRleCA4ZDMxZTM5ZGQ1NjQuLjhmMzE5YjhjOWRlYiAxMDA2NDQKLS0tIGEv aW5jbHVkZS9saW51eC9vZl9kZXZpY2UuaAorKysgYi9pbmNsdWRlL2xpbnV4L29mX2RldmljZS5o CkBAIC01NSw5ICs1NSw5IEBAIHN0YXRpYyBpbmxpbmUgc3RydWN0IGRldmljZV9ub2RlICpvZl9j cHVfZGV2aWNlX25vZGVfZ2V0KGludCBjcHUpCiAJcmV0dXJuIG9mX25vZGVfZ2V0KGNwdV9kZXYt Pm9mX25vZGUpOwogfQogCi1pbnQgb2ZfZG1hX2NvbmZpZ3VyZShzdHJ1Y3QgZGV2aWNlICpkZXYs Ci0JCSAgICAgc3RydWN0IGRldmljZV9ub2RlICpucCwKLQkJICAgICBib29sIGZvcmNlX2RtYSk7 CitpbnQgb2ZfZG1hX2NvbmZpZ3VyZShzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZjZV9u b2RlICpucCwgYm9vbCBmb3JjZV9kbWEpOworaW50IG9mX2RtYV9jb25maWd1cmVfcGFyZW50KHN0 cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZV9ub2RlICpwYXJlbnQsCisJCQkgICAgYm9v bCBmb3JjZV9kbWEpOwogI2Vsc2UgLyogQ09ORklHX09GICovCiAKIHN0YXRpYyBpbmxpbmUgaW50 IG9mX2RyaXZlcl9tYXRjaF9kZXZpY2Uoc3RydWN0IGRldmljZSAqZGV2LApAQCAtMTEyLDYgKzEx MiwxMyBAQCBzdGF0aWMgaW5saW5lIGludCBvZl9kbWFfY29uZmlndXJlKHN0cnVjdCBkZXZpY2Ug KmRldiwKIHsKIAlyZXR1cm4gMDsKIH0KKworc3RhdGljIGlubGluZSBpbnQgb2ZfZG1hX2NvbmZp Z3VyZV9wYXJlbnQoc3RydWN0IGRldmljZSAqZGV2LAorCQkJCQkgIHN0cnVjdCBkZXZpY2Vfbm9k ZSAqcGFyZW50LAorCQkJCQkgIGJvb2wgZm9yY2VfZG1hKQoreworCXJldHVybiAwOworfQogI2Vu ZGlmIC8qIENPTkZJR19PRiAqLwogCiAjZW5kaWYgLyogX0xJTlVYX09GX0RFVklDRV9IICovCi0t IAoyLjIzLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpo dHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs