fsi: Use of_property_read_reg() to parse "reg"
PATCH 1/1 fsi: Use of_property_read_reg() to parse "reg"
Use the recently added of_property_read_reg() helper to get the untranslated "reg" address value.
Signed-off-by Rob Herring <[email protected]>
--- drivers/fsi/fsi-core.c | 39 +++++++++------------------------------ 1 file changed, 9 insertions(+), 30 deletions(-)
drivers/fsi/fsi-core.c +9 -30
@@ -16,6 +16,7 @@#include <linux/idr.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_address.h> #include <linux/slab.h> #include <linux/bitops.h> #include <linux/cdev.h>
@@ -415,28 +416,18 @@ EXPORT_SYMBOL_GPL(fsi_slave_release_range);static bool fsi_device_node_matches (struct device *dev,struct device_node *np,uint32_t addr,uint32_t size) { -unsigned int len, na, ns; -const __be32 *prop; -uint32_t psize; +u64 paddr, psize; - na =of_n_addr_cells (np); - ns =of_n_size_cells (np); - -if (na !=1 || ns !=1 ) -return false; - - prop =of_get_property (np,"reg" , &len); -if (!prop || len !=8 ) +if (of_property_read_reg (np,0 , &paddr, &psize))return false; -if (of_read_number (prop,1 ) != addr) +if (paddr != addr)return false; - psize =of_read_number (prop +1 ,1 );if (psize != size) {dev_warn (dev, -"node %s matches probed address, but not size (got 0x%x, expected 0x%x)" , -of_node_full_name (np), psize, size); +"node %pOF matches probed address, but not size (got 0x%llx, expected 0x%x)" , + np, psize, size); }return true;
@@ -653,24 +644,12 @@ static void fsi_slave_release(struct device *dev)static bool fsi_slave_node_matches (struct device_node *np,int link,uint8_t id) { -unsigned int len, na, ns; -const __be32 *prop; - - na =of_n_addr_cells (np); - ns =of_n_size_cells (np); - -/* Ensure we have the correct format for addresses and sizes in -* reg properties -*/ -if (na !=2 || ns !=0 ) -return false; +u64 addr; - prop =of_get_property (np,"reg" , &len); -if (!prop || len !=8 ) +if (of_property_read_reg (np,0 , &addr,NULL ))return false; -return (of_read_number (prop,1 ) == link) && - (of_read_number (prop +1 ,1 ) == id); +return addr == (((u64 )link <<32 ) | id); }/* Find a matching node for the slave at (link, id). Returns NULL if none
Signature · 1 line
2.39.2
Quoted 8 lines · Rob Herring
Use the recently added
of_property_read_reg()helper to get the untranslated "reg" address value.Signed-off-by Rob Herring <[email protected]>--- drivers/fsi/fsi-core.c | 39 +++++++++------------------------------ 1 file changed, 9 insertions(+), 30 deletions(-)
Ping!
Quoted 78 lines
drivers/fsi/fsi-core.c +9
-31@@ -16,6 +16,7 @@#include <linux/idr.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_address.h> #include <linux/slab.h> #include <linux/bitops.h> #include <linux/cdev.h> @@ -415,28 +416,18 @@ EXPORT_SYMBOL_GPL(fsi_slave_release_range);static bool fsi_device_node_matches (struct device *dev,struct device_node *np,uint32_t addr,uint32_t size) { -unsigned int len, na, ns; -const __be32 *prop; -uint32_t psize; +u64 paddr, psize; - na =of_n_addr_cells (np); - ns =of_n_size_cells (np); - -if (na !=1 || ns !=1 ) -return false; - - prop =of_get_property (np,"reg" , &len); -if (!prop || len !=8 ) +if (of_property_read_reg (np,0 , &paddr, &psize))return false; -if (of_read_number (prop,1 ) != addr) +if (paddr != addr)return false; - psize =of_read_number (prop +1 ,1 );if (psize != size) {dev_warn (dev, -"node %s matches probed address, but not size (got 0x%x, expected 0x%x)" , -of_node_full_name (np), psize, size); +"node %pOF matches probed address, but not size (got 0x%llx, expected 0x%x)" , + np, psize, size); }return true;@@ -653,24 +644,12 @@ static void fsi_slave_release(struct device *dev)static bool fsi_slave_node_matches (struct device_node *np,int link,uint8_t id) { -unsigned int len, na, ns; -const __be32 *prop; - - na =of_n_addr_cells (np); - ns =of_n_size_cells (np); - -/* Ensure we have the correct format for addresses and sizes in -* reg properties -*/ -if (na !=2 || ns !=0 ) -return false; +u64 addr; - prop =of_get_property (np,"reg" , &len); -if (!prop || len !=8 ) +if (of_property_read_reg (np,0 , &addr,NULL ))return false; -return (of_read_number (prop,1 ) == link) && - (of_read_number (prop +1 ,1 ) == id); +return addr == (((u64 )link <<32 ) | id); }/* Find a matching node for the slave at (link, id). Returns NULL if none -- 2.39.2
Quoted 6 lines · Rob Herring
Quoted 4 lines · Rob Herring
Use the recently added
of_property_read_reg()helper to get the untranslated "reg" address value.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Rob Herring <[email protected]>--- drivers/fsi/fsi-core.c | 39 +++++++++------------------------------ 1 file changed, 9 insertions(+), 30 deletions(-)Ping!
Is FSI still maintained or should we just remove it?
Quoted 79 lines
Quoted 79 lines
drivers/fsi/fsi-core.c +9
-31@@ -16,6 +16,7 @@#include <linux/idr.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_address.h> #include <linux/slab.h> #include <linux/bitops.h> #include <linux/cdev.h> @@ -415,28 +416,18 @@ EXPORT_SYMBOL_GPL(fsi_slave_release_range);static bool fsi_device_node_matches (struct device *dev,struct device_node *np,uint32_t addr,uint32_t size) { -unsigned int len, na, ns; -const __be32 *prop; -uint32_t psize; +u64 paddr, psize; - na =of_n_addr_cells (np); - ns =of_n_size_cells (np); - -if (na !=1 || ns !=1 ) -return false; - - prop =of_get_property (np,"reg" , &len); -if (!prop || len !=8 ) +if (of_property_read_reg (np,0 , &paddr, &psize))return false; -if (of_read_number (prop,1 ) != addr) +if (paddr != addr)return false; - psize =of_read_number (prop +1 ,1 );if (psize != size) {dev_warn (dev, -"node %s matches probed address, but not size (got 0x%x, expected 0x%x)" , -of_node_full_name (np), psize, size); +"node %pOF matches probed address, but not size (got 0x%llx, expected 0x%x)" , + np, psize, size); }return true;@@ -653,24 +644,12 @@ static void fsi_slave_release(struct device *dev)static bool fsi_slave_node_matches (struct device_node *np,int link,uint8_t id) { -unsigned int len, na, ns; -const __be32 *prop; - - na =of_n_addr_cells (np); - ns =of_n_size_cells (np); - -/* Ensure we have the correct format for addresses and sizes in -* reg properties -*/ -if (na !=2 || ns !=0 ) -return false; +u64 addr; - prop =of_get_property (np,"reg" , &len); -if (!prop || len !=8 ) +if (of_property_read_reg (np,0 , &addr,NULL ))return false; -return (of_read_number (prop,1 ) == link) && - (of_read_number (prop +1 ,1 ) == id); +return addr == (((u64 )link <<32 ) | id); }/* Find a matching node for the slave at (link, id). Returns NULL if none -- 2.39.2
Quoted 11 lines · Rob Herring
Quoted 9 lines · Rob Herring
Quoted 7 lines · Rob Herring
Use the recently added
of_property_read_reg()helper to get the untranslated "reg" address value.Signed-off-by Rob Herring <[email protected]>--- drivers/fsi/fsi-core.c | 39 +++++++++------------------------------ 1 file changed, 9 insertions(+), 30 deletions(-)Ping!
Is FSI still maintained or should we just remove it?
Yes, it is.
Reviewed-by Eddie James <[email protected]>
Quoted 78 lines
Quoted 78 lines
Quoted 78 lines
drivers/fsi/fsi-core.c +9
-31@@ -16,6 +16,7 @@#include <linux/idr.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_address.h> #include <linux/slab.h> #include <linux/bitops.h> #include <linux/cdev.h> @@ -415,28 +416,18 @@ EXPORT_SYMBOL_GPL(fsi_slave_release_range);static bool fsi_device_node_matches (struct device *dev,struct device_node *np,uint32_t addr,uint32_t size) { -unsigned int len, na, ns; -const __be32 *prop; -uint32_t psize; +u64 paddr, psize; - na =of_n_addr_cells (np); - ns =of_n_size_cells (np); - -if (na !=1 || ns !=1 ) -return false; - - prop =of_get_property (np,"reg" , &len); -if (!prop || len !=8 ) +if (of_property_read_reg (np,0 , &paddr, &psize))return false; -if (of_read_number (prop,1 ) != addr) +if (paddr != addr)return false; - psize =of_read_number (prop +1 ,1 );if (psize != size) {dev_warn (dev, -"node %s matches probed address, but not size (got 0x%x, expected 0x%x)" , -of_node_full_name (np), psize, size); +"node %pOF matches probed address, but not size (got 0x%llx, expected 0x%x)" , + np, psize, size); }return true;@@ -653,24 +644,12 @@ static void fsi_slave_release(struct device *dev)static bool fsi_slave_node_matches (struct device_node *np,int link,uint8_t id) { -unsigned int len, na, ns; -const __be32 *prop; - - na =of_n_addr_cells (np); - ns =of_n_size_cells (np); - -/* Ensure we have the correct format for addresses and sizes in -* reg properties -*/ -if (na !=2 || ns !=0 ) -return false; +u64 addr; - prop =of_get_property (np,"reg" , &len); -if (!prop || len !=8 ) +if (of_property_read_reg (np,0 , &addr,NULL ))return false; -return (of_read_number (prop,1 ) == link) && - (of_read_number (prop +1 ,1 ) == id); +return addr == (((u64 )link <<32 ) | id); }/* Find a matching node for the slave at (link, id). Returns NULL if none -- 2.39.2