Don't fail device probing due to of_dma_set_restricted_buffer()
v2 cover Don't fail device probing due to of_dma_set_restricted_buffer()
Hi all,
This is v2 of the patch I previously posted here:
https://lore.kernel.org/r/[email protected]
Changes since v1 are:
* Move of_dma_set_restricted_buffer() into of/device.c (Rob)
* Use IS_ENABLED() instead of 'static inline' stub (Rob)
This applies on Konrad's devel/for-linus-5.15 branch in swiotlb.git
Cheers,
Will
--->8
Will Deacon (2):
of: Move of_dma_set_restricted_buffer() into device.c
of: restricted dma: Don't fail device probe on rmem init failure
drivers/of/address.c | 33 --------------------------------- drivers/of/device.c | 39 ++++++++++++++++++++++++++++++++++++++- drivers/of/of_private.h | 7 ------- 3 files changed, 38 insertions(+), 41 deletions(-)
Signature · 6 lines
2.33.0.rc1.237.g0d66db33f3-goog _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 1/2 of: Move of_dma_set_restricted_buffer() into device.c
Rob observes that:
| of_dma_set_restricted_buffer() [...] should also be moved to | of/device.c. There's no reason for it to be in of/address.c. It has | nothing to do with address parsing.
Move it to of/device.c, as he suggests.
--- drivers/of/address.c | 33 --------------------------------- drivers/of/device.c | 34 ++++++++++++++++++++++++++++++++++ drivers/of/of_private.h | 7 ------- 3 files changed, 34 insertions(+), 40 deletions(-)
drivers/of/address.c +0 -33
@@ -8,7 +8,6 @@#include <linux/logic_pio.h> #include <linux/module.h> #include <linux/of_address.h> -#include <linux/of_reserved_mem.h> #include <linux/pci.h> #include <linux/pci_regs.h> #include <linux/sizes.h>
@@ -996,38 +995,6 @@ int of_dma_get_range(struct device_node *np, const struct bus_dma_region **map)of_node_put (node); return ret; } - -int of_dma_set_restricted_buffer (struct device *dev,struct device_node *np) -{ -struct device_node *node, *of_node = dev->of_node; -int count, i; - - count =of_property_count_elems_of_size (of_node,"memory-region" , -sizeof (u32)); -/* -* If dev->of_node doesn't exist or doesn't contain memory-region, try -* the OF node having DMA configuration. -*/ -if (count <=0 ) { - of_node = np; - count =of_property_count_elems_of_size ( - of_node,"memory-region" ,sizeof (u32)); - } - -for (i =0 ; i < count; i++) { - node =of_parse_phandle (of_node,"memory-region" , i); -/* -* There might be multiple memory regions, but only one -* restricted-dma-pool region is allowed. -*/ -if (of_device_is_compatible (node,"restricted-dma-pool" ) && -of_device_is_available (node)) -return of_reserved_mem_device_init_by_idx (dev, of_node, - i); - } - -return 0 ; -}#endif /* CONFIG_HAS_DMA */ /**
drivers/of/device.c +34 -0
@@ -5,6 +5,7 @@#include <linux/of_device.h> #include <linux/of_address.h> #include <linux/of_iommu.h> +#include <linux/of_reserved_mem.h> #include <linux/dma-direct.h> /* for bus_dma_region */ #include <linux/dma-map-ops.h> #include <linux/init.h>
@@ -52,6 +53,39 @@ int of_device_add(struct platform_device *ofdev)return device_add (&ofdev->dev); } +static int +of_dma_set_restricted_buffer (struct device *dev,struct device_node *np) +{ +struct device_node *node, *of_node = dev->of_node; +int count, i; + + count =of_property_count_elems_of_size (of_node,"memory-region" , +sizeof (u32)); +/* +* If dev->of_node doesn't exist or doesn't contain memory-region, try +* the OF node having DMA configuration. +*/ +if (count <=0 ) { + of_node = np; + count =of_property_count_elems_of_size ( + of_node,"memory-region" ,sizeof (u32)); + } + +for (i =0 ; i < count; i++) { + node =of_parse_phandle (of_node,"memory-region" , i); +/* +* There might be multiple memory regions, but only one +* restricted-dma-pool region is allowed. +*/ +if (of_device_is_compatible (node,"restricted-dma-pool" ) && +of_device_is_available (node)) +return of_reserved_mem_device_init_by_idx (dev, of_node, + i); + } + +return 0 ; +} +/** * of_dma_configure_id - Setup DMA configuration * @dev: Device to apply DMA configuration
drivers/of/of_private.h +0 -7
@@ -163,19 +163,12 @@ struct bus_dma_region;#if defined(CONFIG_OF_ADDRESS ) && defined(CONFIG_HAS_DMA )int of_dma_get_range (struct device_node *np,const struct bus_dma_region **map); -int of_dma_set_restricted_buffer (struct device *dev,struct device_node *np);#else static inline int of_dma_get_range (struct device_node *np,const struct bus_dma_region **map) {return -ENODEV ; } -static inline int of_dma_set_restricted_buffer (struct device *dev, -struct device_node *np) -{ -/* Do nothing, successfully. */ -return 0 ; -}#endif void fdt_init_reserved_mem (void );
Signature · 6 lines
2.33.0.rc1.237.g0d66db33f3-goog _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 2/2 of: restricted dma: Don't fail device probe on rmem init failure
In reply to Will DeaconIf CONFIG_DMA_RESTRICTED_POOL=n then probing a device with a reference to a "restricted-dma-pool" will fail with a reasonably cryptic error:
| pci-host-generic: probe of 10000.pci failed with error -22
Rework of_dma_set_restricted_buffer() so that it does not cause probing failure and instead either returns early if CONFIG_DMA_RESTRICTED_POOL=n or emits a diagnostic if the reserved DMA pool fails to initialise.
--- drivers/of/device.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/of/device.c +8 -5
@@ -53,12 +53,15 @@ int of_device_add(struct platform_device *ofdev)return device_add (&ofdev->dev); } -static int +static void of_dma_set_restricted_buffer (struct device *dev,struct device_node *np) {struct device_node *node, *of_node = dev->of_node;int count, i; +if (!IS_ENABLED (CONFIG_DMA_RESTRICTED_POOL )) +return ; + count =of_property_count_elems_of_size (of_node,"memory-region" ,sizeof (u32));/*
@@ -79,11 +82,11 @@ of_dma_set_restricted_buffer(struct device *dev, struct device_node *np)*/ if (of_device_is_compatible (node,"restricted-dma-pool" ) &&of_device_is_available (node)) -return of_reserved_mem_device_init_by_idx (dev, of_node, - i); +break ; } -return 0 ; +if (i != count &&of_reserved_mem_device_init_by_idx (dev, of_node, i)) +dev_warn (dev,"failed to initialise \"restricted-dma-pool\" memory node\n" ); }/**
@@ -200,7 +203,7 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,arch_setup_dma_ops (dev, dma_start, size, iommu, coherent);if (!iommu) -return of_dma_set_restricted_buffer (dev, np); +of_dma_set_restricted_buffer (dev, np);return 0 ; }
Signature · 6 lines
2.33.0.rc1.237.g0d66db33f3-goog _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 26 lines · Will Deacon
Hi all,
This is v2 of the patch I previously posted here:
https://lore.kernel.org/r/[email protected]
Changes since v1 are:
* Move
of_dma_set_restricted_buffer()intoof/device.c(Rob)
* UseIS_ENABLED()instead of 'static inline' stub (Rob)This applies on Konrad's devel/for-linus-5.15 branch in swiotlb.git
Cheers,
Will
Cc Claire Chang <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Rob Herring <[email protected]>Cc Robin Murphy <[email protected]>--->8
Quoted 8 lines
Will Deacon (2):
of: Moveof_dma_set_restricted_buffer()intodevice.c
of: restricted dma: Don't fail device probe on rmem init failuredrivers/of/address.c | 33 --------------------------------- drivers/of/device.c | 39 ++++++++++++++++++++++++++++++++++++++- drivers/of/of_private.h | 7 ------- 3 files changed, 38 insertions(+), 41 deletions(-)
Quoted 4 lines · Will Deacon
Hi all,
This is v2 of the patch I previously posted here:
Quoted 8 lines
https://lore.kernel.org/r/[email protected]
Changes since v1 are:
* Move
of_dma_set_restricted_buffer()intoof/device.c(Rob)
* UseIS_ENABLED()instead of 'static inline' stub (Rob)This applies on Konrad's devel/for-linus-5.15 branch in swiotlb.git
It should show up later today.
Thanks!
Quoted 13 lines
Cheers,
Will
Cc Claire Chang <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Rob Herring <[email protected]>Cc Robin Murphy <[email protected]>--->8
Quoted 12 lines
Will Deacon (2):
of: Moveof_dma_set_restricted_buffer()intodevice.c
of: restricted dma: Don't fail device probe on rmem init failuredrivers/of/address.c | 33 --------------------------------- drivers/of/device.c | 39 ++++++++++++++++++++++++++++++++++++++- drivers/of/of_private.h | 7 ------- 3 files changed, 38 insertions(+), 41 deletions(-)Signature · 1 line
2.33.0.rc1.237.g0d66db33f3-goog
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 7 lines · Konrad Rzeszutek Wilk
Quoted 6 lines · Will Deacon
Hi all,
This is v2 of the patch I previously posted here:
Quoted 8 lines
Quoted 6 lines
Changes since v1 are:
* Move
of_dma_set_restricted_buffer()intoof/device.c(Rob)
* UseIS_ENABLED()instead of 'static inline' stub (Rob)This applies on Konrad's devel/for-linus-5.15 branch in swiotlb.git
It should show up later today.
Brill, thanks Konrad!
Will