diff mbox series

[v13,5/5] usb: xhci: provide a debugfs hook for erasing rom

Message ID 20200506060025.1535960-6-vkoul@kernel.org (mailing list archive)
State Superseded
Headers show
Series usb: xhci: Add support for Renesas USB controllers | expand

Commit Message

Vinod Koul May 6, 2020, 6 a.m. UTC
run "echo 1 > /sys/kernel/debug/renesas-usb/rom_erase" to erase
firmware when driver is loaded.

Subsequent init of driver shall reload the firmware

Signed-off-by: Vinod Koul <vkoul@kernel.org>
---
 drivers/usb/host/xhci-pci-renesas.c | 33 +++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

Comments

Mathias Nyman May 13, 2020, 12:36 p.m. UTC | #1
On 6.5.2020 9.00, Vinod Koul wrote:
> run "echo 1 > /sys/kernel/debug/renesas-usb/rom_erase" to erase
> firmware when driver is loaded.
> 
> Subsequent init of driver shall reload the firmware
> 
> Signed-off-by: Vinod Koul <vkoul@kernel.org>
> ---
>  drivers/usb/host/xhci-pci-renesas.c | 33 +++++++++++++++++++++++++++++
>  1 file changed, 33 insertions(+)
> 
> diff --git a/drivers/usb/host/xhci-pci-renesas.c b/drivers/usb/host/xhci-pci-renesas.c
> index f7d2445d30ec..fa32ec352dc8 100644
> --- a/drivers/usb/host/xhci-pci-renesas.c
> +++ b/drivers/usb/host/xhci-pci-renesas.c
> @@ -2,6 +2,7 @@
>  /* Copyright (C) 2019-2020 Linaro Limited */
>  
>  #include <linux/acpi.h>
> +#include <linux/debugfs.h>
>  #include <linux/firmware.h>
>  #include <linux/module.h>
>  #include <linux/pci.h>
> @@ -170,6 +171,8 @@ static int renesas_fw_verify(const void *fw_data,
>  	return 0;
>  }
>  
> +static void debugfs_init(struct pci_dev *pdev);
> +
>  static bool renesas_check_rom(struct pci_dev *pdev)
>  {
>  	u16 rom_status;
> @@ -183,6 +186,7 @@ static bool renesas_check_rom(struct pci_dev *pdev)
>  	rom_status &= RENESAS_ROM_STATUS_ROM_EXISTS;
>  	if (rom_status) {
>  		dev_dbg(&pdev->dev, "External ROM exists\n");
> +		debugfs_init(pdev);
>  		return true; /* External ROM exists */
>  	}
>  
> @@ -449,6 +453,34 @@ static void renesas_rom_erase(struct pci_dev *pdev)
>  	dev_dbg(&pdev->dev, "ROM Erase... Done success\n");
>  }
>  
> +static int debugfs_rom_erase(void *data, u64 value)
> +{
> +	struct pci_dev *pdev = data;
> +
> +	if (value == 1) {
> +		dev_dbg(&pdev->dev, "Userspace requested ROM erase\n");
> +		renesas_rom_erase(pdev);
> +		return 0;
> +	}
> +	return -EINVAL;
> +}
> +DEFINE_DEBUGFS_ATTRIBUTE(rom_erase_ops, NULL, debugfs_rom_erase, "%llu\n");
> +
> +static struct dentry *debugfs_root;
> +
> +static void debugfs_init(struct pci_dev *pdev)
> +{
> +	debugfs_root = debugfs_create_dir("renesas_usb", NULL);

This will create a renesas_usb directory right under debugfs root.
xhci has its own struct dentry xhci_debugfs_root; 
Use that as parent instead
 
Also note that debugs_create_dir() can fail, for example if debugfs isn't supported.    

- Mathias
Greg KH May 13, 2020, 12:45 p.m. UTC | #2
On Wed, May 13, 2020 at 03:36:19PM +0300, Mathias Nyman wrote:
> On 6.5.2020 9.00, Vinod Koul wrote:
> > run "echo 1 > /sys/kernel/debug/renesas-usb/rom_erase" to erase
> > firmware when driver is loaded.
> > 
> > Subsequent init of driver shall reload the firmware
> > 
> > Signed-off-by: Vinod Koul <vkoul@kernel.org>
> > ---
> >  drivers/usb/host/xhci-pci-renesas.c | 33 +++++++++++++++++++++++++++++
> >  1 file changed, 33 insertions(+)
> > 
> > diff --git a/drivers/usb/host/xhci-pci-renesas.c b/drivers/usb/host/xhci-pci-renesas.c
> > index f7d2445d30ec..fa32ec352dc8 100644
> > --- a/drivers/usb/host/xhci-pci-renesas.c
> > +++ b/drivers/usb/host/xhci-pci-renesas.c
> > @@ -2,6 +2,7 @@
> >  /* Copyright (C) 2019-2020 Linaro Limited */
> >  
> >  #include <linux/acpi.h>
> > +#include <linux/debugfs.h>
> >  #include <linux/firmware.h>
> >  #include <linux/module.h>
> >  #include <linux/pci.h>
> > @@ -170,6 +171,8 @@ static int renesas_fw_verify(const void *fw_data,
> >  	return 0;
> >  }
> >  
> > +static void debugfs_init(struct pci_dev *pdev);
> > +
> >  static bool renesas_check_rom(struct pci_dev *pdev)
> >  {
> >  	u16 rom_status;
> > @@ -183,6 +186,7 @@ static bool renesas_check_rom(struct pci_dev *pdev)
> >  	rom_status &= RENESAS_ROM_STATUS_ROM_EXISTS;
> >  	if (rom_status) {
> >  		dev_dbg(&pdev->dev, "External ROM exists\n");
> > +		debugfs_init(pdev);
> >  		return true; /* External ROM exists */
> >  	}
> >  
> > @@ -449,6 +453,34 @@ static void renesas_rom_erase(struct pci_dev *pdev)
> >  	dev_dbg(&pdev->dev, "ROM Erase... Done success\n");
> >  }
> >  
> > +static int debugfs_rom_erase(void *data, u64 value)
> > +{
> > +	struct pci_dev *pdev = data;
> > +
> > +	if (value == 1) {
> > +		dev_dbg(&pdev->dev, "Userspace requested ROM erase\n");
> > +		renesas_rom_erase(pdev);
> > +		return 0;
> > +	}
> > +	return -EINVAL;
> > +}
> > +DEFINE_DEBUGFS_ATTRIBUTE(rom_erase_ops, NULL, debugfs_rom_erase, "%llu\n");
> > +
> > +static struct dentry *debugfs_root;
> > +
> > +static void debugfs_init(struct pci_dev *pdev)
> > +{
> > +	debugfs_root = debugfs_create_dir("renesas_usb", NULL);
> 
> This will create a renesas_usb directory right under debugfs root.
> xhci has its own struct dentry xhci_debugfs_root; 
> Use that as parent instead

Ah, I misssed that, a follow-on patch can do this, right?

> Also note that debugs_create_dir() can fail, for example if debugfs isn't supported.    

Doesn't matter, never check the result, just move on and all is fine :)

This logic is correct, no need for it to be changed.

thanks,

greg k-h
Greg KH May 14, 2020, 9:24 a.m. UTC | #3
On Wed, May 13, 2020 at 02:45:54PM +0200, Greg Kroah-Hartman wrote:
> On Wed, May 13, 2020 at 03:36:19PM +0300, Mathias Nyman wrote:
> > On 6.5.2020 9.00, Vinod Koul wrote:
> > > run "echo 1 > /sys/kernel/debug/renesas-usb/rom_erase" to erase
> > > firmware when driver is loaded.
> > > 
> > > Subsequent init of driver shall reload the firmware
> > > 
> > > Signed-off-by: Vinod Koul <vkoul@kernel.org>
> > > ---
> > >  drivers/usb/host/xhci-pci-renesas.c | 33 +++++++++++++++++++++++++++++
> > >  1 file changed, 33 insertions(+)
> > > 
> > > diff --git a/drivers/usb/host/xhci-pci-renesas.c b/drivers/usb/host/xhci-pci-renesas.c
> > > index f7d2445d30ec..fa32ec352dc8 100644
> > > --- a/drivers/usb/host/xhci-pci-renesas.c
> > > +++ b/drivers/usb/host/xhci-pci-renesas.c
> > > @@ -2,6 +2,7 @@
> > >  /* Copyright (C) 2019-2020 Linaro Limited */
> > >  
> > >  #include <linux/acpi.h>
> > > +#include <linux/debugfs.h>
> > >  #include <linux/firmware.h>
> > >  #include <linux/module.h>
> > >  #include <linux/pci.h>
> > > @@ -170,6 +171,8 @@ static int renesas_fw_verify(const void *fw_data,
> > >  	return 0;
> > >  }
> > >  
> > > +static void debugfs_init(struct pci_dev *pdev);
> > > +
> > >  static bool renesas_check_rom(struct pci_dev *pdev)
> > >  {
> > >  	u16 rom_status;
> > > @@ -183,6 +186,7 @@ static bool renesas_check_rom(struct pci_dev *pdev)
> > >  	rom_status &= RENESAS_ROM_STATUS_ROM_EXISTS;
> > >  	if (rom_status) {
> > >  		dev_dbg(&pdev->dev, "External ROM exists\n");
> > > +		debugfs_init(pdev);
> > >  		return true; /* External ROM exists */
> > >  	}
> > >  
> > > @@ -449,6 +453,34 @@ static void renesas_rom_erase(struct pci_dev *pdev)
> > >  	dev_dbg(&pdev->dev, "ROM Erase... Done success\n");
> > >  }
> > >  
> > > +static int debugfs_rom_erase(void *data, u64 value)
> > > +{
> > > +	struct pci_dev *pdev = data;
> > > +
> > > +	if (value == 1) {
> > > +		dev_dbg(&pdev->dev, "Userspace requested ROM erase\n");
> > > +		renesas_rom_erase(pdev);
> > > +		return 0;
> > > +	}
> > > +	return -EINVAL;
> > > +}
> > > +DEFINE_DEBUGFS_ATTRIBUTE(rom_erase_ops, NULL, debugfs_rom_erase, "%llu\n");
> > > +
> > > +static struct dentry *debugfs_root;
> > > +
> > > +static void debugfs_init(struct pci_dev *pdev)
> > > +{
> > > +	debugfs_root = debugfs_create_dir("renesas_usb", NULL);
> > 
> > This will create a renesas_usb directory right under debugfs root.
> > xhci has its own struct dentry xhci_debugfs_root; 
> > Use that as parent instead
> 
> Ah, I misssed that, a follow-on patch can do this, right?

Actually, a whole new series with this changed is good, I didn't take
these for now, for some reason I thought I had.

thanks,

greg k-h
Vinod Koul May 14, 2020, 11:26 a.m. UTC | #4
On 14-05-20, 11:24, Greg Kroah-Hartman wrote:
> On Wed, May 13, 2020 at 02:45:54PM +0200, Greg Kroah-Hartman wrote:

> > Ah, I misssed that, a follow-on patch can do this, right?
> 
> Actually, a whole new series with this changed is good, I didn't take
> these for now, for some reason I thought I had.

Do you mind taking these except this patch (last). I will spin this
later

Debugfs was for my own testing to be able to erase so that I can test
load :) No hurry for users to have that yet...

Thanks
Greg KH May 14, 2020, 11:46 a.m. UTC | #5
On Thu, May 14, 2020 at 04:56:18PM +0530, Vinod Koul wrote:
> On 14-05-20, 11:24, Greg Kroah-Hartman wrote:
> > On Wed, May 13, 2020 at 02:45:54PM +0200, Greg Kroah-Hartman wrote:
> 
> > > Ah, I misssed that, a follow-on patch can do this, right?
> > 
> > Actually, a whole new series with this changed is good, I didn't take
> > these for now, for some reason I thought I had.
> 
> Do you mind taking these except this patch (last). I will spin this
> later

Can you resend, they are not in my patch queue anymore.

thanks,

greg k-h
Vinod Koul May 14, 2020, 12:15 p.m. UTC | #6
On 14-05-20, 13:46, Greg Kroah-Hartman wrote:
> On Thu, May 14, 2020 at 04:56:18PM +0530, Vinod Koul wrote:
> > On 14-05-20, 11:24, Greg Kroah-Hartman wrote:
> > > On Wed, May 13, 2020 at 02:45:54PM +0200, Greg Kroah-Hartman wrote:
> > 
> > > > Ah, I misssed that, a follow-on patch can do this, right?
> > > 
> > > Actually, a whole new series with this changed is good, I didn't take
> > > these for now, for some reason I thought I had.
> > 
> > Do you mind taking these except this patch (last). I will spin this
> > later
> 
> Can you resend, they are not in my patch queue anymore.

Sure, will resend dropping patch 5.
diff mbox series

Patch

diff --git a/drivers/usb/host/xhci-pci-renesas.c b/drivers/usb/host/xhci-pci-renesas.c
index f7d2445d30ec..fa32ec352dc8 100644
--- a/drivers/usb/host/xhci-pci-renesas.c
+++ b/drivers/usb/host/xhci-pci-renesas.c
@@ -2,6 +2,7 @@ 
 /* Copyright (C) 2019-2020 Linaro Limited */
 
 #include <linux/acpi.h>
+#include <linux/debugfs.h>
 #include <linux/firmware.h>
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -170,6 +171,8 @@  static int renesas_fw_verify(const void *fw_data,
 	return 0;
 }
 
+static void debugfs_init(struct pci_dev *pdev);
+
 static bool renesas_check_rom(struct pci_dev *pdev)
 {
 	u16 rom_status;
@@ -183,6 +186,7 @@  static bool renesas_check_rom(struct pci_dev *pdev)
 	rom_status &= RENESAS_ROM_STATUS_ROM_EXISTS;
 	if (rom_status) {
 		dev_dbg(&pdev->dev, "External ROM exists\n");
+		debugfs_init(pdev);
 		return true; /* External ROM exists */
 	}
 
@@ -449,6 +453,34 @@  static void renesas_rom_erase(struct pci_dev *pdev)
 	dev_dbg(&pdev->dev, "ROM Erase... Done success\n");
 }
 
+static int debugfs_rom_erase(void *data, u64 value)
+{
+	struct pci_dev *pdev = data;
+
+	if (value == 1) {
+		dev_dbg(&pdev->dev, "Userspace requested ROM erase\n");
+		renesas_rom_erase(pdev);
+		return 0;
+	}
+	return -EINVAL;
+}
+DEFINE_DEBUGFS_ATTRIBUTE(rom_erase_ops, NULL, debugfs_rom_erase, "%llu\n");
+
+static struct dentry *debugfs_root;
+
+static void debugfs_init(struct pci_dev *pdev)
+{
+	debugfs_root = debugfs_create_dir("renesas_usb", NULL);
+
+	debugfs_create_file("rom_erase", 0200, debugfs_root,
+			    pdev, &rom_erase_ops);
+}
+
+static void debugfs_exit(void)
+{
+	debugfs_remove_recursive(debugfs_root);
+}
+
 static bool renesas_setup_rom(struct pci_dev *pdev, const struct firmware *fw)
 {
 	const u32 *fw_data = (const u32 *)fw->data;
@@ -639,6 +671,7 @@  EXPORT_SYMBOL_GPL(renesas_xhci_check_request_fw);
 
 void renesas_xhci_pci_exit(struct pci_dev *dev)
 {
+	debugfs_exit();
 }
 EXPORT_SYMBOL_GPL(renesas_xhci_pci_exit);