memory: renesas-rpc-if: Rebind fixes and misc cleanups
v2 cover memory: renesas-rpc-if: Rebind fixes and misc cleanups
Hi all,
The Renesas RPC-IF provides either HyperFlash or SPI host access. To handle this, three drivers are used:
1. The RPC-IF core diver,
2. An HyperFlash child driver,
3. An SPI child driver.
Currently this driver collection suffers from a sub-optimal division of roles and reponsibilities, leading to (un)bind issues: after manually unbinding the child driver, rebinding the child driver fails with -EBUSY.
This patch series aims to fix this, by splitting off private data and making the RPC-IF core driver responsible for resource acquisition. After that, a few customary cleanups are provided.
This has been tested on the Salvator-X(S) and Ebisu-4D (HyperFlash) and White-Hawk (QSPI FLASH) development boards.
Changes compared to v1[1]:
- Move the two fixes forward and add Fixes-tags to ease backporting, as requested by Krzysztof,
- Add Acked-by,
- Rebased cleanups,
- Remove Runtime PM wrappers,
- Drop patch to add system suspend/resume support to the RPC-IF core driver, as this is apparently not needed on R-Car M3-N and R-Car E3, nor fixes the issue on R-Car H3 ES2.0. I will reply to the original patch with my latest investigation results.
Thanks for your comments!
[1] [PATCH 0/7] memory: renesas-rpc-if: Rebind and s2ram fixes
https://lore.kernel.org/r/[email protected]
Geert Uytterhoeven (6):
memory: renesas-rpc-if: Split-off private data from struct rpcif
memory: renesas-rpc-if: Move resource acquisition to .probe()
memory: renesas-rpc-if: Always use dev in rpcif_probe()
memory: renesas-rpc-if: Improve Runtime PM handling
memory: renesas-rpc-if: Pass device instead of rpcif to rpcif_*()
memory: renesas-rpc-if: Remove Runtime PM wrappers
drivers/memory/renesas-rpc-if.c | 152 ++++++++++++++++++++------------ drivers/mtd/hyperbus/rpc-if.c | 18 ++-- drivers/spi/spi-rpc-if.c | 14 +-- include/memory/renesas-rpc-if.h | 34 +------ 4 files changed, 118 insertions(+), 100 deletions(-)
Signature · 12 lines
2.25.1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsPATCH v2 1/6 memory: renesas-rpc-if: Split-off private data from struct rpcif
The rpcif structure is used as a common data structure, shared by the RPC-IF core driver and by the HyperBus and SPI child drivers. This poses several problems:
- Most structure members describe private core driver state, which should not be accessible by the child drivers,
- The structure's lifetime is controlled by the child drivers, complicating use by the core driver.
Fix this by moving the private core driver state to its own structure, managed by the RPC-IF core driver, and store it in the core driver's private data field. This requires absorbing the child's platform device, as that was stored in the driver's private data field before.
---
v2:
- Move forward in series,
- Add Fixes tag.
--- drivers/memory/renesas-rpc-if.c | 75 +++++++++++++++++++++++++-------- include/memory/renesas-rpc-if.h | 16 ------- 2 files changed, 57 insertions(+), 34 deletions(-)
drivers/memory/renesas-rpc-if.c +57 -18
@@ -163,14 +163,36 @@ static const struct regmap_access_table rpcif_volatile_table = { .n_yes_ranges = ARRAY_SIZE(rpcif_volatile_ranges), }; +struct rpcif_priv { +struct device *dev; +void __iomem *base; +void __iomem *dirmap; +struct regmap *regmap; +struct reset_control *rstc; +struct platform_device *vdev; +size_t size; +enum rpcif_type type; +enum rpcif_data_dir dir; +u8 bus_size; +u8 xfer_size; +void *buffer; +u32 xferlen; +u32 smcr; +u32 smadr; +u32 command;/* DRCMR or SMCMR */ +u32 option;/* DROPR or SMOPR */ +u32 enable;/* DRENR or SMENR */ +u32 dummy;/* DRDMCR or SMDMCR */ +u32 ddr;/* DRDRENR or SMDRENR */ +};/* * Custom accessor functions to ensure SM[RW]DR[01] are always accessed with -* proper width. Requires rpcif.xfer_size to be correctly set before! +* proper width. Requires rpcif_priv.xfer_size to be correctly set before! */ static int rpcif_reg_read (void *context,unsigned int reg,unsigned int *val) { -struct rpcif *rpc = context; +struct rpcif_priv *rpc = context;switch (reg) {case RPCIF_SMRDR0 :
@@ -206,7 +228,7 @@ static int rpcif_reg_read(void *context, unsigned int reg, unsigned int *val)static int rpcif_reg_write (void *context,unsigned int reg,unsigned int val) { -struct rpcif *rpc = context; +struct rpcif_priv *rpc = context;switch (reg) {case RPCIF_SMWDR0 :
@@ -253,13 +275,12 @@ static const struct regmap_config rpcif_regmap_config = { .volatile_table = &rpcif_volatile_table, }; -int rpcif_sw_init (struct rpcif *rpc,struct device *dev) +int rpcif_sw_init (struct rpcif *rpcif,struct device *dev) {struct platform_device *pdev =to_platform_device (dev); +struct rpcif_priv *rpc =dev_get_drvdata (dev);struct resource *res; - rpc->dev = dev; - rpc->base =devm_platform_ioremap_resource_byname (pdev,"regs" );if (IS_ERR (rpc->base))return PTR_ERR (rpc->base);
@@ -280,12 +301,17 @@ int rpcif_sw_init(struct rpcif *rpc, struct device *dev) rpc->type = (uintptr_t )of_device_get_match_data (dev); rpc->rstc =devm_reset_control_get_exclusive (&pdev->dev,NULL ); +if (IS_ERR (rpc->rstc)) +return PTR_ERR (rpc->rstc); -return PTR_ERR_OR_ZERO (rpc->rstc); + rpcif->dev = dev; + rpcif->dirmap = rpc->dirmap; + rpcif->size = rpc->size; +return 0 ; }EXPORT_SYMBOL (rpcif_sw_init); -static void rpcif_rzg2l_timing_adjust_sdr (struct rpcif *rpc) +static void rpcif_rzg2l_timing_adjust_sdr (struct rpcif_priv *rpc) {regmap_write (rpc->regmap,RPCIF_PHYWR ,0xa5390000 );regmap_write (rpc->regmap,RPCIF_PHYADD ,0x80000000 );
@@ -299,8 +325,9 @@ static void rpcif_rzg2l_timing_adjust_sdr(struct rpcif *rpc)regmap_write (rpc->regmap,RPCIF_PHYADD ,0x80000032 ); } -int rpcif_hw_init (struct rpcif *rpc,bool hyperflash) +int rpcif_hw_init (struct rpcif *rpcif,bool hyperflash) { +struct rpcif_priv *rpc =dev_get_drvdata (rpcif->dev);u32 dummy;pm_runtime_get_sync (rpc->dev);
@@ -364,7 +391,7 @@ int rpcif_hw_init(struct rpcif *rpc, bool hyperflash) }EXPORT_SYMBOL (rpcif_hw_init); -static int wait_msg_xfer_end (struct rpcif *rpc) +static int wait_msg_xfer_end (struct rpcif_priv *rpc) {u32 sts;
@@ -373,7 +400,7 @@ static int wait_msg_xfer_end(struct rpcif *rpc) USEC_PER_SEC); } -static u8 rpcif_bits_set (struct rpcif *rpc,u32 nbytes) +static u8 rpcif_bits_set (struct rpcif_priv *rpc,u32 nbytes) {if (rpc->bus_size ==2 ) nbytes /=2 ;
@@ -386,9 +413,11 @@ static u8 rpcif_bit_size(u8 buswidth)return buswidth >4 ?2 :ilog2 (buswidth); } -void rpcif_prepare (struct rpcif *rpc,const struct rpcif_op *op,u64 *offs, +void rpcif_prepare (struct rpcif *rpcif,const struct rpcif_op *op,u64 *offs,size_t *len) { +struct rpcif_priv *rpc =dev_get_drvdata (rpcif->dev); + rpc->smcr =0 ; rpc->smadr =0 ; rpc->enable =0 ;
@@ -472,8 +501,9 @@ void rpcif_prepare(struct rpcif *rpc, const struct rpcif_op *op, u64 *offs, }EXPORT_SYMBOL (rpcif_prepare); -int rpcif_manual_xfer (struct rpcif *rpc) +int rpcif_manual_xfer (struct rpcif *rpcif) { +struct rpcif_priv *rpc =dev_get_drvdata (rpcif->dev);u32 smenr, smcr, pos =0 , max = rpc->bus_size ==2 ?8 :4 ;int ret =0 ;
@@ -593,7 +623,7 @@ int rpcif_manual_xfer(struct rpcif *rpc) err_out:if (reset_control_reset (rpc->rstc))dev_err (rpc->dev,"Failed to reset HW\n" ); -rpcif_hw_init (rpc, rpc->bus_size ==2 ); +rpcif_hw_init (rpcif, rpc->bus_size ==2 ); goto exit; }EXPORT_SYMBOL (rpcif_manual_xfer);
@@ -640,8 +670,9 @@ static void memcpy_fromio_readw(void *to, } } -ssize_t rpcif_dirmap_read (struct rpcif *rpc,u64 offs,size_t len,void *buf) +ssize_t rpcif_dirmap_read (struct rpcif *rpcif,u64 offs,size_t len,void *buf) { +struct rpcif_priv *rpc =dev_get_drvdata (rpcif->dev);loff_t from = offs & (rpc->size -1 );size_t size = rpc->size - from;
@@ -676,6 +707,7 @@ static int rpcif_probe(struct platform_device *pdev) {struct platform_device *vdev;struct device_node *flash; +struct rpcif_priv *rpc;const char *name;int ret;
@@ -696,11 +728,18 @@ static int rpcif_probe(struct platform_device *pdev) }of_node_put (flash); + rpc =devm_kzalloc (&pdev->dev,sizeof (*rpc),GFP_KERNEL ); +if (!rpc) +return -ENOMEM ; + vdev =platform_device_alloc (name, pdev->id);if (!vdev)return -ENOMEM ; vdev->dev.parent = &pdev->dev; -platform_set_drvdata (pdev, vdev); + + rpc->dev = &pdev->dev; + rpc->vdev = vdev; +platform_set_drvdata (pdev, rpc); ret =platform_device_add (vdev);if (ret) {
@@ -713,9 +752,9 @@ static int rpcif_probe(struct platform_device *pdev)static int rpcif_remove (struct platform_device *pdev) { -struct platform_device *vdev =platform_get_drvdata (pdev); +struct rpcif_priv *rpc =platform_get_drvdata (pdev); -platform_device_unregister (vdev); +platform_device_unregister (rpc->vdev);return 0 ; }
include/memory/renesas-rpc-if.h +0 -16
@@ -65,24 +65,8 @@ enum rpcif_type {struct rpcif {struct device *dev; -void __iomem *base;void __iomem *dirmap; -struct regmap *regmap; -struct reset_control *rstc;size_t size; -enum rpcif_type type; -enum rpcif_data_dir dir; -u8 bus_size; -u8 xfer_size; -void *buffer; -u32 xferlen; -u32 smcr; -u32 smadr; -u32 command;/* DRCMR or SMCMR */ -u32 option;/* DROPR or SMOPR */ -u32 enable;/* DRENR or SMENR */ -u32 dummy;/* DRDMCR or SMDMCR */ -u32 ddr;/* DRDRENR or SMDRENR */ };int rpcif_sw_init (struct rpcif *rpc,struct device *dev);
Signature · 1 line
2.25.1
PATCH v2 2/6 memory: renesas-rpc-if: Move resource acquisition to .probe()
In reply to Geert UytterhoevenWhile the acquired resources are tied to the lifetime of the RPC-IF core device (through the use of managed resource functions), the actual resource acquisition is triggered from the HyperBus and SPI child drivers. Due to this mismatch, unbinding and rebinding the child drivers manually fails with -EBUSY:
# echo rpc-if-hyperflash > /sys/bus/platform/drivers/rpc-if-hyperflash/unbind
# echo rpc-if-hyperflash > /sys/bus/platform/drivers/rpc-if-hyperflash/bind
rpc-if ee200000.spi: can't request region for resource [mem 0xee200000-0xee2001ff]
rpc-if-hyperflash: probe of rpc-if-hyperflash failed with error -16The same is true for rpc-if-spi.
Fix this by moving all resource acquisition to the core driver's probe routine.
---
v2:
- Move forward in series,
- Add Fixes tag.
--- drivers/memory/renesas-rpc-if.c | 49 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 25 deletions(-)
drivers/memory/renesas-rpc-if.c +24 -25
@@ -277,32 +277,7 @@ static const struct regmap_config rpcif_regmap_config = {int rpcif_sw_init (struct rpcif *rpcif,struct device *dev) { -struct platform_device *pdev =to_platform_device (dev);struct rpcif_priv *rpc =dev_get_drvdata (dev); -struct resource *res; - - rpc->base =devm_platform_ioremap_resource_byname (pdev,"regs" ); -if (IS_ERR (rpc->base)) -return PTR_ERR (rpc->base); - - rpc->regmap =devm_regmap_init (&pdev->dev,NULL , rpc, &rpcif_regmap_config); -if (IS_ERR (rpc->regmap)) { -dev_err (&pdev->dev, -"failed to init regmap for rpcif, error %ld\n" , -PTR_ERR (rpc->regmap)); -return PTR_ERR (rpc->regmap); - } - - res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"dirmap" ); - rpc->dirmap =devm_ioremap_resource (&pdev->dev, res); -if (IS_ERR (rpc->dirmap)) -return PTR_ERR (rpc->dirmap); - rpc->size =resource_size (res); - - rpc->type = (uintptr_t )of_device_get_match_data (dev); - rpc->rstc =devm_reset_control_get_exclusive (&pdev->dev,NULL ); -if (IS_ERR (rpc->rstc)) -return PTR_ERR (rpc->rstc); rpcif->dev = dev; rpcif->dirmap = rpc->dirmap;
@@ -705,9 +680,11 @@ EXPORT_SYMBOL(rpcif_dirmap_read);static int rpcif_probe (struct platform_device *pdev) { +struct device *dev = &pdev->dev;struct platform_device *vdev;struct device_node *flash;struct rpcif_priv *rpc; +struct resource *res;const char *name;int ret;
@@ -732,6 +709,28 @@ static int rpcif_probe(struct platform_device *pdev)if (!rpc)return -ENOMEM ; + rpc->base =devm_platform_ioremap_resource_byname (pdev,"regs" ); +if (IS_ERR (rpc->base)) +return PTR_ERR (rpc->base); + + rpc->regmap =devm_regmap_init (dev,NULL , rpc, &rpcif_regmap_config); +if (IS_ERR (rpc->regmap)) { +dev_err (dev,"failed to init regmap for rpcif, error %ld\n" , +PTR_ERR (rpc->regmap)); +return PTR_ERR (rpc->regmap); + } + + res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"dirmap" ); + rpc->dirmap =devm_ioremap_resource (dev, res); +if (IS_ERR (rpc->dirmap)) +return PTR_ERR (rpc->dirmap); + rpc->size =resource_size (res); + + rpc->type = (uintptr_t )of_device_get_match_data (dev); + rpc->rstc =devm_reset_control_get_exclusive (dev,NULL ); +if (IS_ERR (rpc->rstc)) +return PTR_ERR (rpc->rstc); + vdev =platform_device_alloc (name, pdev->id);if (!vdev)return -ENOMEM ;
Signature · 1 line
2.25.1
PATCH v2 3/6 memory: renesas-rpc-if: Always use dev in rpcif_probe()
In reply to Geert Uytterhoevenrpcif_probe() already has a "dev" variable pointing to the right device structure, so there is no need to take a detour through the platform device.
---
v2:
- Combination of the old "memory: renesas-rpc-if: Always use dev in rpcif_sw_init()" and "memory: renesas-rpc-if: Add dev helper to rpcif_probe()" after rebasing on top of the two fixes.
--- drivers/memory/renesas-rpc-if.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/memory/renesas-rpc-if.c +6 -6
@@ -688,9 +688,9 @@ static int rpcif_probe(struct platform_device *pdev)const char *name;int ret; - flash =of_get_next_child (pdev->dev.of_node,NULL ); + flash =of_get_next_child (dev->of_node,NULL );if (!flash) { -dev_warn (&pdev->dev,"no flash node found\n" ); +dev_warn (dev,"no flash node found\n" );return -ENODEV ; }
@@ -700,12 +700,12 @@ static int rpcif_probe(struct platform_device *pdev) name ="rpc-if-hyperflash" ; }else {of_node_put (flash); -dev_warn (&pdev->dev,"unknown flash type\n" ); +dev_warn (dev,"unknown flash type\n" );return -ENODEV ; }of_node_put (flash); - rpc =devm_kzalloc (&pdev->dev,sizeof (*rpc),GFP_KERNEL ); + rpc =devm_kzalloc (dev,sizeof (*rpc),GFP_KERNEL );if (!rpc)return -ENOMEM ;
@@ -734,9 +734,9 @@ static int rpcif_probe(struct platform_device *pdev) vdev =platform_device_alloc (name, pdev->id);if (!vdev)return -ENOMEM ; - vdev->dev.parent = &pdev->dev; + vdev->dev.parent = dev; - rpc->dev = &pdev->dev; + rpc->dev = dev; rpc->vdev = vdev;platform_set_drvdata (pdev, rpc);
Signature · 1 line
2.25.1
PATCH v2 4/6 memory: renesas-rpc-if: Improve Runtime PM handling
In reply to Geert UytterhoevenConvert from the deprecated pm_runtime_get_sync() to the new pm_runtime_resume_and_get(), and add error checking.
---
v2:
- No changes.
--- drivers/memory/renesas-rpc-if.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/memory/renesas-rpc-if.c +11 -5
@@ -304,12 +304,13 @@ int rpcif_hw_init(struct rpcif *rpcif, bool hyperflash) {struct rpcif_priv *rpc =dev_get_drvdata (rpcif->dev);u32 dummy; +int ret; -pm_runtime_get_sync (rpc->dev); + ret =pm_runtime_resume_and_get (rpc->dev); +if (ret) +return ret;if (rpc->type ==RPCIF_RZ_G2L ) { -int ret; - ret =reset_control_reset (rpc->rstc);if (ret)return ret;
@@ -482,7 +483,9 @@ int rpcif_manual_xfer(struct rpcif *rpcif)u32 smenr, smcr, pos =0 , max = rpc->bus_size ==2 ?8 :4 ;int ret =0 ; -pm_runtime_get_sync (rpc->dev); + ret =pm_runtime_resume_and_get (rpc->dev); +if (ret <0 ) +return ret;regmap_update_bits (rpc->regmap,RPCIF_PHYCNT ,RPCIF_PHYCNT_CAL ,RPCIF_PHYCNT_CAL );
@@ -650,11 +653,14 @@ ssize_t rpcif_dirmap_read(struct rpcif *rpcif, u64 offs, size_t len, void *buf)struct rpcif_priv *rpc =dev_get_drvdata (rpcif->dev);loff_t from = offs & (rpc->size -1 );size_t size = rpc->size - from; +int ret;if (len > size) len = size; -pm_runtime_get_sync (rpc->dev); + ret =pm_runtime_resume_and_get (rpc->dev); +if (ret <0 ) +return ret;regmap_update_bits (rpc->regmap,RPCIF_CMNCR ,RPCIF_CMNCR_MD ,0 );regmap_write (rpc->regmap,RPCIF_DRCR ,0 );
Signature · 1 line
2.25.1
PATCH v2 5/6 memory: renesas-rpc-if: Pass device instead of rpcif to rpcif_*()
In reply to Geert UytterhoevenMost rpcif_*() API functions do not need access to any other fields in the rpcif structure than the device pointer. Simplify dependencies by passing the device pointer instead.
---
v2:
- Add Acked-by.
--- drivers/memory/renesas-rpc-if.c | 32 ++++++++++++++++---------------- drivers/mtd/hyperbus/rpc-if.c | 18 +++++++++--------- drivers/spi/spi-rpc-if.c | 14 +++++++------- include/memory/renesas-rpc-if.h | 16 ++++++++-------- 4 files changed, 40 insertions(+), 40 deletions(-)
drivers/memory/renesas-rpc-if.c +16 -16
@@ -300,13 +300,13 @@ static void rpcif_rzg2l_timing_adjust_sdr(struct rpcif_priv *rpc)regmap_write (rpc->regmap,RPCIF_PHYADD ,0x80000032 ); } -int rpcif_hw_init (struct rpcif *rpcif,bool hyperflash) +int rpcif_hw_init (struct device *dev,bool hyperflash) { -struct rpcif_priv *rpc =dev_get_drvdata (rpcif->dev); +struct rpcif_priv *rpc =dev_get_drvdata (dev);u32 dummy;int ret; - ret =pm_runtime_resume_and_get (rpc->dev); + ret =pm_runtime_resume_and_get (dev);if (ret)return ret;
@@ -359,7 +359,7 @@ int rpcif_hw_init(struct rpcif *rpcif, bool hyperflash)regmap_write (rpc->regmap,RPCIF_SSLDR ,RPCIF_SSLDR_SPNDL (7 ) |RPCIF_SSLDR_SLNDL (7 ) |RPCIF_SSLDR_SCKDL (7 )); -pm_runtime_put (rpc->dev); +pm_runtime_put (dev); rpc->bus_size = hyperflash ?2 :1 ;
@@ -389,10 +389,10 @@ static u8 rpcif_bit_size(u8 buswidth)return buswidth >4 ?2 :ilog2 (buswidth); } -void rpcif_prepare (struct rpcif *rpcif,const struct rpcif_op *op,u64 *offs, +void rpcif_prepare (struct device *dev,const struct rpcif_op *op,u64 *offs,size_t *len) { -struct rpcif_priv *rpc =dev_get_drvdata (rpcif->dev); +struct rpcif_priv *rpc =dev_get_drvdata (dev); rpc->smcr =0 ; rpc->smadr =0 ;
@@ -477,13 +477,13 @@ void rpcif_prepare(struct rpcif *rpcif, const struct rpcif_op *op, u64 *offs, }EXPORT_SYMBOL (rpcif_prepare); -int rpcif_manual_xfer (struct rpcif *rpcif) +int rpcif_manual_xfer (struct device *dev) { -struct rpcif_priv *rpc =dev_get_drvdata (rpcif->dev); +struct rpcif_priv *rpc =dev_get_drvdata (dev);u32 smenr, smcr, pos =0 , max = rpc->bus_size ==2 ?8 :4 ;int ret =0 ; - ret =pm_runtime_resume_and_get (rpc->dev); + ret =pm_runtime_resume_and_get (dev);if (ret <0 )return ret;
@@ -595,13 +595,13 @@ int rpcif_manual_xfer(struct rpcif *rpcif) } exit: -pm_runtime_put (rpc->dev); +pm_runtime_put (dev);return ret; err_out:if (reset_control_reset (rpc->rstc)) -dev_err (rpc->dev,"Failed to reset HW\n" ); -rpcif_hw_init (rpcif, rpc->bus_size ==2 ); +dev_err (dev,"Failed to reset HW\n" ); +rpcif_hw_init (dev, rpc->bus_size ==2 ); goto exit; }EXPORT_SYMBOL (rpcif_manual_xfer);
@@ -648,9 +648,9 @@ static void memcpy_fromio_readw(void *to, } } -ssize_t rpcif_dirmap_read (struct rpcif *rpcif,u64 offs,size_t len,void *buf) +ssize_t rpcif_dirmap_read (struct device *dev,u64 offs,size_t len,void *buf) { -struct rpcif_priv *rpc =dev_get_drvdata (rpcif->dev); +struct rpcif_priv *rpc =dev_get_drvdata (dev);loff_t from = offs & (rpc->size -1 );size_t size = rpc->size - from;int ret;
@@ -658,7 +658,7 @@ ssize_t rpcif_dirmap_read(struct rpcif *rpcif, u64 offs, size_t len, void *buf)if (len > size) len = size; - ret =pm_runtime_resume_and_get (rpc->dev); + ret =pm_runtime_resume_and_get (dev);if (ret <0 )return ret;
@@ -678,7 +678,7 @@ ssize_t rpcif_dirmap_read(struct rpcif *rpcif, u64 offs, size_t len, void *buf)else memcpy_fromio (buf, rpc->dirmap + from, len); -pm_runtime_put (rpc->dev); +pm_runtime_put (dev);return len; }
drivers/mtd/hyperbus/rpc-if.c +9 -9
@@ -56,7 +56,7 @@ static void rpcif_hb_prepare_read(struct rpcif *rpc, void *to, op.data.nbytes = len; op.data.buf.in = to; -rpcif_prepare (rpc, &op,NULL ,NULL ); +rpcif_prepare (rpc->dev, &op,NULL ,NULL ); } static void rpcif_hb_prepare_write(struct rpcif *rpc, unsigned long to,
@@ -70,7 +70,7 @@ static void rpcif_hb_prepare_write(struct rpcif *rpc, unsigned long to, op.data.nbytes = len; op.data.buf.out = from; -rpcif_prepare (rpc, &op,NULL ,NULL ); +rpcif_prepare (rpc->dev, &op,NULL ,NULL ); }static u16 rpcif_hb_read16 (struct hyperbus_device *hbdev,unsigned long addr)
@@ -81,7 +81,7 @@ static u16 rpcif_hb_read16(struct hyperbus_device *hbdev, unsigned long addr)rpcif_hb_prepare_read (&hyperbus->rpc, &data, addr,2 ); -rpcif_manual_xfer (&hyperbus->rpc); +rpcif_manual_xfer (hyperbus->rpc.dev);return data.x[0 ]; }
@@ -94,7 +94,7 @@ static void rpcif_hb_write16(struct hyperbus_device *hbdev, unsigned long addr,rpcif_hb_prepare_write (&hyperbus->rpc, addr, &data,2 ); -rpcif_manual_xfer (&hyperbus->rpc); +rpcif_manual_xfer (hyperbus->rpc.dev); } static void rpcif_hb_copy_from(struct hyperbus_device *hbdev, void *to,
@@ -105,7 +105,7 @@ static void rpcif_hb_copy_from(struct hyperbus_device *hbdev, void *to,rpcif_hb_prepare_read (&hyperbus->rpc, to, from, len); -rpcif_dirmap_read (&hyperbus->rpc, from, len, to); +rpcif_dirmap_read (hyperbus->rpc.dev, from, len, to); }static const struct hyperbus_ops rpcif_hb_ops = {
@@ -130,9 +130,9 @@ static int rpcif_hb_probe(struct platform_device *pdev)platform_set_drvdata (pdev, hyperbus); -rpcif_enable_rpm (&hyperbus->rpc); +rpcif_enable_rpm (hyperbus->rpc.dev); - error =rpcif_hw_init (&hyperbus->rpc, true); + error =rpcif_hw_init (hyperbus->rpc.dev, true);if (error) goto out_disable_rpm;
@@ -150,7 +150,7 @@ static int rpcif_hb_probe(struct platform_device *pdev)return 0 ; out_disable_rpm: -rpcif_disable_rpm (&hyperbus->rpc); +rpcif_disable_rpm (hyperbus->rpc.dev);return error; }
@@ -160,7 +160,7 @@ static int rpcif_hb_remove(struct platform_device *pdev)hyperbus_unregister_device (&hyperbus->hbdev); -rpcif_disable_rpm (&hyperbus->rpc); +rpcif_disable_rpm (hyperbus->rpc.dev);return 0 ; }
drivers/spi/spi-rpc-if.c +7 -7
@@ -58,7 +58,7 @@ static void rpcif_spi_mem_prepare(struct spi_device *spi_dev, rpc_op.data.dir =RPCIF_NO_DATA ; } -rpcif_prepare (rpc, &rpc_op, offs, len); +rpcif_prepare (rpc->dev, &rpc_op, offs, len); } static bool rpcif_spi_mem_supports_op(struct spi_mem *mem,
@@ -86,7 +86,7 @@ static ssize_t rpcif_spi_mem_dirmap_read(struct spi_mem_dirmap_desc *desc,rpcif_spi_mem_prepare (desc->mem->spi, &desc->info.op_tmpl, &offs, &len); -return rpcif_dirmap_read (rpc, offs, len, buf); +return rpcif_dirmap_read (rpc->dev, offs, len, buf); }static int rpcif_spi_mem_dirmap_create (struct spi_mem_dirmap_desc *desc)
@@ -117,7 +117,7 @@ static int rpcif_spi_mem_exec_op(struct spi_mem *mem,rpcif_spi_mem_prepare (mem->spi, op,NULL ,NULL ); -return rpcif_manual_xfer (rpc); +return rpcif_manual_xfer (rpc->dev); }static const struct spi_controller_mem_ops rpcif_spi_mem_ops = {
@@ -147,7 +147,7 @@ static int rpcif_spi_probe(struct platform_device *pdev) ctlr->dev.of_node = parent->of_node; -rpcif_enable_rpm (rpc); +rpcif_enable_rpm (rpc->dev); ctlr->num_chipselect =1 ; ctlr->mem_ops = &rpcif_spi_mem_ops;
@@ -156,7 +156,7 @@ static int rpcif_spi_probe(struct platform_device *pdev) ctlr->mode_bits =SPI_CPOL |SPI_CPHA |SPI_TX_QUAD |SPI_RX_QUAD ; ctlr->flags =SPI_CONTROLLER_HALF_DUPLEX ; - error =rpcif_hw_init (rpc, false); + error =rpcif_hw_init (rpc->dev, false);if (error) goto out_disable_rpm;
@@ -169,7 +169,7 @@ static int rpcif_spi_probe(struct platform_device *pdev)return 0 ; out_disable_rpm: -rpcif_disable_rpm (rpc); +rpcif_disable_rpm (rpc->dev);return error; }
@@ -179,7 +179,7 @@ static int rpcif_spi_remove(struct platform_device *pdev)struct rpcif *rpc =spi_controller_get_devdata (ctlr);spi_unregister_controller (ctlr); -rpcif_disable_rpm (rpc); +rpcif_disable_rpm (rpc->dev);return 0 ; }
include/memory/renesas-rpc-if.h +8 -8
@@ -70,20 +70,20 @@ struct rpcif { };int rpcif_sw_init (struct rpcif *rpc,struct device *dev); -int rpcif_hw_init (struct rpcif *rpc,bool hyperflash); -void rpcif_prepare (struct rpcif *rpc,const struct rpcif_op *op,u64 *offs, +int rpcif_hw_init (struct device *dev,bool hyperflash); +void rpcif_prepare (struct device *dev,const struct rpcif_op *op,u64 *offs,size_t *len); -int rpcif_manual_xfer (struct rpcif *rpc); -ssize_t rpcif_dirmap_read (struct rpcif *rpc,u64 offs,size_t len,void *buf); +int rpcif_manual_xfer (struct device *dev); +ssize_t rpcif_dirmap_read (struct device *dev,u64 offs,size_t len,void *buf); -static inline void rpcif_enable_rpm (struct rpcif *rpc) +static inline void rpcif_enable_rpm (struct device *dev) { -pm_runtime_enable (rpc->dev); +pm_runtime_enable (dev); } -static inline void rpcif_disable_rpm (struct rpcif *rpc) +static inline void rpcif_disable_rpm (struct device *dev) { -pm_runtime_disable (rpc->dev); +pm_runtime_disable (dev); }#endif // __RENESAS_RPC_IF_H
Signature · 1 line
2.25.1
Re: [PATCH v2 5/6] memory: renesas-rpc-if: Pass device instead of rpcif to rpcif_*()
Quoted 3 lines · Geert Uytterhoeven
Most rpcif_*() API functions do not need access to any other fields in the rpcif structure than the device pointer. Simplify dependencies by passing the device pointer instead.
PATCH v2 6/6 memory: renesas-rpc-if: Remove Runtime PM wrappers
In reply to Geert UytterhoevenNow the rpcif_{en,dis}able_rpm() wrappers just take a pointer to a device structure, there is no point in keeping them. Remove them, and update the callers to call Runtime PM directly.
---
This could be split in three patches for three different subsystems, with the changes to <memory/renesas-rpc-if.h> postponed, to relax dependencies, but the previous patch already touches all three subsystems anyway.
v2:
- New.
--- drivers/mtd/hyperbus/rpc-if.c | 6 +++--- drivers/spi/spi-rpc-if.c | 6 +++--- include/memory/renesas-rpc-if.h | 10 ---------- 3 files changed, 6 insertions(+), 16 deletions(-)
drivers/mtd/hyperbus/rpc-if.c +3 -3
@@ -130,7 +130,7 @@ static int rpcif_hb_probe(struct platform_device *pdev)platform_set_drvdata (pdev, hyperbus); -rpcif_enable_rpm (hyperbus->rpc.dev); +pm_runtime_enable (hyperbus->rpc.dev); error =rpcif_hw_init (hyperbus->rpc.dev, true);if (error)
@@ -150,7 +150,7 @@ static int rpcif_hb_probe(struct platform_device *pdev)return 0 ; out_disable_rpm: -rpcif_disable_rpm (hyperbus->rpc.dev); +pm_runtime_disable (hyperbus->rpc.dev);return error; }
@@ -160,7 +160,7 @@ static int rpcif_hb_remove(struct platform_device *pdev)hyperbus_unregister_device (&hyperbus->hbdev); -rpcif_disable_rpm (hyperbus->rpc.dev); +pm_runtime_disable (hyperbus->rpc.dev);return 0 ; }
drivers/spi/spi-rpc-if.c +3 -3
@@ -147,7 +147,7 @@ static int rpcif_spi_probe(struct platform_device *pdev) ctlr->dev.of_node = parent->of_node; -rpcif_enable_rpm (rpc->dev); +pm_runtime_enable (rpc->dev); ctlr->num_chipselect =1 ; ctlr->mem_ops = &rpcif_spi_mem_ops;
@@ -169,7 +169,7 @@ static int rpcif_spi_probe(struct platform_device *pdev)return 0 ; out_disable_rpm: -rpcif_disable_rpm (rpc->dev); +pm_runtime_disable (rpc->dev);return error; }
@@ -179,7 +179,7 @@ static int rpcif_spi_remove(struct platform_device *pdev)struct rpcif *rpc =spi_controller_get_devdata (ctlr);spi_unregister_controller (ctlr); -rpcif_disable_rpm (rpc->dev); +pm_runtime_disable (rpc->dev);return 0 ; }
include/memory/renesas-rpc-if.h +0 -10
@@ -76,14 +76,4 @@ void rpcif_prepare(struct device *dev, const struct rpcif_op *op, u64 *offs,int rpcif_manual_xfer (struct device *dev);ssize_t rpcif_dirmap_read (struct device *dev,u64 offs,size_t len,void *buf); -static inline void rpcif_enable_rpm (struct device *dev) -{ -pm_runtime_enable (dev); -} - -static inline void rpcif_disable_rpm (struct device *dev) -{ -pm_runtime_disable (dev); -} -#endif // __RENESAS_RPC_IF_H
Signature · 1 line
2.25.1
Quoted 8 lines · Geert Uytterhoeven
Hi all,
The Renesas RPC-IF provides either HyperFlash or SPI host access. To handle this, three drivers are used:
1. The RPC-IF core diver,
2. An HyperFlash child driver,
3. An SPI child driver.
Thank you for the patch.
It is too late in the cycle for me to pick it up. I will take it after the merge window.
Best regards,
Krzysztof
Krzysztof Kozlowski
Reviewed-byQuoted 10 lines · Krzysztof Kozlowski
Quoted 8 lines · Geert Uytterhoeven
Hi all,
The Renesas RPC-IF provides either HyperFlash or SPI host access. To handle this, three drivers are used:
1. The RPC-IF core diver,
2. An HyperFlash child driver,
3. An SPI child driver.
Quoted 3 lines
Thank you for the patch.
It is too late in the cycle for me to pick it up. I will take it after the merge window.
Optionally, if you want to push it via Renesas SoC tree and there are no conflicts with existing two patches, then these look good:
Otherwise, I'll pick them up after the merge window.
Best regards,
Krzysztof
Hi Krzysztof,
Quoted 8 lines · Krzysztof Kozlowski
Quoted 7 lines · Krzysztof Kozlowski
Quoted 5 lines · Geert Uytterhoeven
The Renesas RPC-IF provides either HyperFlash or SPI host access. To handle this, three drivers are used:
1. The RPC-IF core diver,
2. An HyperFlash child driver,
3. An SPI child driver.
Quoted 6 lines
Quoted 3 lines
Thank you for the patch.
It is too late in the cycle for me to pick it up. I will take it after the merge window.Optionally, if you want to push it via Renesas SoC tree and there are no conflicts with existing two patches, then these look good:
It's too late for the Renesas tree, too.
Quoted 3 lines
Reviewed-by Krzysztof Kozlowski <[email protected]>Otherwise, I'll pick them up after the merge window.
Thanks!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Quoted 13 lines · Geert Uytterhoeven
Hi all,
The Renesas RPC-IF provides either HyperFlash or SPI host access. To handle this, three drivers are used:
1. The RPC-IF core diver,
2. An HyperFlash child driver,
3. An SPI child driver.Currently this driver collection suffers from a sub-optimal division of roles and reponsibilities, leading to (un)bind issues: after manually unbinding the child driver, rebinding the child driver fails with
-EBUSY.
Quoted 6 lines
This patch series aims to fix this, by splitting off private data and making the RPC-IF core driver responsible for resource acquisition. After that, a few customary cleanups are provided.
This has been tested on the Salvator-X(S) and Ebisu-4D (HyperFlash) and White-Hawk (QSPI FLASH) development boards.
Sadly, I don't have the bandwidth to do a full review. But from a glimpse, it all looks good. And from a high level PoV, this all makes a lot of sense. So:
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
Krzysztof Kozlowski
AppliedQuoted 9 lines · Geert Uytterhoeven
Hi all,
The Renesas RPC-IF provides either HyperFlash or SPI host access. To handle this, three drivers are used:
1. The RPC-IF core diver,
2. An HyperFlash child driver,
3. An SPI child driver.[...]
Applied, thanks!
[1/6] memory: renesas-rpc-if: Split-off private data from struct rpcif
https://git.kernel.org/krzk/linux-mem-ctrl/c/f8fa9cb3fb16e06514fec0bac58996015dedc453 [2/6] memory: renesas-rpc-if: Move resource acquisition to .probe() https://git.kernel.org/krzk/linux-mem-ctrl/c/9bdb35b864fb92c037b3e441ae8f3a7efc6bc679 [3/6] memory: renesas-rpc-if: Always use dev in rpcif_probe() https://git.kernel.org/krzk/linux-mem-ctrl/c/ef1eabee9d97e263e61aa32c961f8c94cb3e6e5c [4/6] memory: renesas-rpc-if: Improve Runtime PM handling https://git.kernel.org/krzk/linux-mem-ctrl/c/f63d7c4d409461aee459c21797a3d7bb6039affd [5/6] memory: renesas-rpc-if: Pass device instead of rpcif to rpcif_*() https://git.kernel.org/krzk/linux-mem-ctrl/c/eb66a9971ffddd0dc0640f282768660875445ef1 [6/6] memory: renesas-rpc-if: Remove Runtime PM wrappers https://git.kernel.org/krzk/linux-mem-ctrl/c/691f04fc5251f79c71975acf1f69ace87496738b
Best regards,
Signature · 1 line
Krzysztof Kozlowski <[email protected]>
Quoted 9 lines · Krzysztof Kozlowski
Quoted 8 lines · Geert Uytterhoeven
Hi all,
The Renesas RPC-IF provides either HyperFlash or SPI host access. To handle this, three drivers are used:
1. The RPC-IF core diver,
2. An HyperFlash child driver,
3. An SPI child driver.
Quoted 6 lines
Quoted 1 line
[...]
Applied, thanks!
[1/6] memory: renesas-rpc-if: Split-off private data from struct rpcif
https://git.kernel.org/krzk/linux-mem-ctrl/c/f8fa9cb3fb16e06514fec0bac58996015dedc453
Missing checkpatch. I corrected now:
WARNING: Please use correct Fixes: style 'Fixes: <12 chars of sha1> ("<title line>")' - ie: 'Fixes: ca7d8b980b67 ("memory: add Renesas RPC-IF driver")'
Best regards,
Krzysztof
Quoted 12 lines · Krzysztof Kozlowski
Quoted 11 lines · Krzysztof Kozlowski
Quoted 7 lines · Geert Uytterhoeven
The Renesas RPC-IF provides either HyperFlash or SPI host access. To handle this, three drivers are used:
1. The RPC-IF core diver,
2. An HyperFlash child driver,
3. An SPI child driver.[...]
Applied, thanks!
Quoted 7 lines
Quoted 2 lines
[1/6] memory: renesas-rpc-if: Split-off private data from struct rpcif
https://git.kernel.org/krzk/linux-mem-ctrl/c/f8fa9cb3fb16e06514fec0bac58996015dedc453Missing checkpatch. I corrected now:
WARNING: Please use correct Fixes: style 'Fixes: <12 chars of sha1> ("<title line>")' - ie: 'Fixes:ca7d8b980b67("memory: add Renesas RPC-IF driver")'
Oh well... Merry Xmas ;-)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds