| Submitter | Ajit Khaparde |
|---|---|
| Date | Aug. 14, 2009, 5:33 p.m. |
| Message ID | <20090814173314.GA26218@serverengines.com> |
| Download | mbox | patch |
| Permalink | /patch/31428/ |
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
Comments
On Fri, 2009-08-14 at 23:03 +0530, Ajit Khaparde wrote: > This patch adds support to flash a firmware image to a device using ethtool. > The driver gets the filename of the firmware image and flashes this image > using the request_firmware() path. > > Signed-off-by: Ajit Khaparde <ajitk@serverengines.com> > --- > include/linux/ethtool.h | 8 ++++++++ > net/core/ethtool.c | 17 +++++++++++++++++ > 2 files changed, 25 insertions(+), 0 deletions(-) > > diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h > index 90c4a36..243cdce 100644 > --- a/include/linux/ethtool.h > +++ b/include/linux/ethtool.h > @@ -362,6 +362,12 @@ struct ethtool_rxnfc { > __u32 rule_locs[0]; > }; > > +/* for passing firmware flashing related parameters */ > +struct ethtool_flash { > + __u32 cmd; > + __u8 *data; There also needs to be some sort of identifier to distinguish different flash regions. [...] > --- a/net/core/ethtool.c > +++ b/net/core/ethtool.c > @@ -898,6 +898,20 @@ static int ethtool_set_value(struct net_device *dev, char __user *useraddr, > return actor(dev, edata.data); > } > > +static int ethtool_flash_device(struct net_device *dev, char __user *useraddr) > +{ > + int err; > + struct ethtool_flash efl; > + > + if (copy_from_user(&efl, useraddr, sizeof(efl))) > + return -EFAULT; [...] This leaves efl.data as a user-space pointer, not a kernel-space pointer. The string will then also need to be copied. It's simpler to embed the string in the structure, though that means putting a limit on the string length. Ben.
Patch
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 90c4a36..243cdce 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -362,6 +362,12 @@ struct ethtool_rxnfc { __u32 rule_locs[0]; }; +/* for passing firmware flashing related parameters */ +struct ethtool_flash { + __u32 cmd; + __u8 *data; +}; + #ifdef __KERNEL__ struct net_device; @@ -489,6 +495,7 @@ struct ethtool_ops { int (*get_stats_count)(struct net_device *);/* use get_sset_count */ int (*get_rxnfc)(struct net_device *, struct ethtool_rxnfc *, void *); int (*set_rxnfc)(struct net_device *, struct ethtool_rxnfc *); + int (*flash_device)(struct net_device *, u8 *); }; #endif /* __KERNEL__ */ @@ -545,6 +552,7 @@ struct ethtool_ops { #define ETHTOOL_GRXCLSRLALL 0x00000030 /* Get all RX classification rule */ #define ETHTOOL_SRXCLSRLDEL 0x00000031 /* Delete RX classification rule */ #define ETHTOOL_SRXCLSRLINS 0x00000032 /* Insert RX classification rule */ +#define ETHTOOL_FLASHDEV 0x00000033 /* Flash firmware to device */ /* compatibility with older code */ #define SPARC_ETH_GSET ETHTOOL_GSET diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 44e5711..bb94b3d 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -898,6 +898,20 @@ static int ethtool_set_value(struct net_device *dev, char __user *useraddr, return actor(dev, edata.data); } +static int ethtool_flash_device(struct net_device *dev, char __user *useraddr) +{ + int err; + struct ethtool_flash efl; + + if (copy_from_user(&efl, useraddr, sizeof(efl))) + return -EFAULT; + + if (!dev->ethtool_ops->flash_device) + return -EOPNOTSUPP; + + return dev->ethtool_ops->flash_device(dev, efl.data); +} + /* The main entry point in this file. Called from net/core/dev.c */ int dev_ethtool(struct net *net, struct ifreq *ifr) @@ -1111,6 +1125,9 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) case ETHTOOL_SGRO: rc = ethtool_set_gro(dev, useraddr); break; + case ETHTOOL_FLASHDEV: + rc = ethtool_flash_device(dev, useraddr); + break; default: rc = -EOPNOTSUPP; }
This patch adds support to flash a firmware image to a device using ethtool. The driver gets the filename of the firmware image and flashes this image using the request_firmware() path. Signed-off-by: Ajit Khaparde <ajitk@serverengines.com> --- include/linux/ethtool.h | 8 ++++++++ net/core/ethtool.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-)