On Sun, Jan 20, 2013 at 03:45:34PM -0800, Greg KH wrote:
> On Sat, Jan 19, 2013 at 02:02:28AM -0700, Jon Mason wrote:
> > Address the sparse warnings and resulting fallout
> >
> > Signed-off-by: Jon Mason <[email protected]>
> > ---
> > drivers/ntb/ntb_hw.c | 7 ++++---
> > drivers/ntb/ntb_hw.h | 4 ++--
> > drivers/ntb/ntb_transport.c | 32 ++++++++++++++++----------------
> > 3 files changed, 22 insertions(+), 21 deletions(-)
> >
> > diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c
> > index 18cb5dc..b792ccd 100644
> > --- a/drivers/ntb/ntb_hw.c
> > +++ b/drivers/ntb/ntb_hw.c
> > @@ -104,8 +104,9 @@ MODULE_DEVICE_TABLE(pci, ntb_pci_tbl);
> > *
> > * RETURNS: An appropriate -ERRNO error value on error, or zero for
> > success.
> > */
> > -int ntb_register_event_callback(struct ntb_device *ndev,
> > - void (*func)(void *handle, unsigned int event))
> > +int
> > +ntb_register_event_callback(struct ntb_device *ndev,
> > + void (*func)(void *handle, enum ntb_hw_event event))
>
> What is sparse complaining about here that moving the function name to
> the start of the line fixes? That shouldn't be necessary at all. Ah,
> the enum? If so, why change the first line at all?
All an effort to get it to fit in under 80 chars.
>
> > {
> > if (ndev->event_cb)
> > return -EINVAL;
> > @@ -344,7 +345,7 @@ int ntb_read_remote_spad(struct ntb_device *ndev,
> > unsigned int idx, u32 *val)
> > *
> > * RETURNS: pointer to virtual address, or NULL on error.
> > */
> > -void *ntb_get_mw_vbase(struct ntb_device *ndev, unsigned int mw)
> > +void __iomem *ntb_get_mw_vbase(struct ntb_device *ndev, unsigned int mw)
>
> That makes sense to fix.
>
> > {
> > if (mw > NTB_NUM_MW)
> > return NULL;
> > diff --git a/drivers/ntb/ntb_hw.h b/drivers/ntb/ntb_hw.h
> > index 5e00951..3a3038c 100644
> > --- a/drivers/ntb/ntb_hw.h
> > +++ b/drivers/ntb/ntb_hw.h
> > @@ -165,14 +165,14 @@ int ntb_register_db_callback(struct ntb_device *ndev,
> > unsigned int idx,
> > void ntb_unregister_db_callback(struct ntb_device *ndev, unsigned int idx);
> > int ntb_register_event_callback(struct ntb_device *ndev,
> > void (*event_cb_func) (void *handle,
> > - unsigned int event));
> > + enum ntb_hw_event event));
> > void ntb_unregister_event_callback(struct ntb_device *ndev);
> > int ntb_get_max_spads(struct ntb_device *ndev);
> > int ntb_write_local_spad(struct ntb_device *ndev, unsigned int idx, u32
> > val);
> > int ntb_read_local_spad(struct ntb_device *ndev, unsigned int idx, u32
> > *val);
> > int ntb_write_remote_spad(struct ntb_device *ndev, unsigned int idx, u32
> > val);
> > int ntb_read_remote_spad(struct ntb_device *ndev, unsigned int idx, u32
> > *val);
> > -void *ntb_get_mw_vbase(struct ntb_device *ndev, unsigned int mw);
> > +void __iomem *ntb_get_mw_vbase(struct ntb_device *ndev, unsigned int mw);
> > resource_size_t ntb_get_mw_size(struct ntb_device *ndev, unsigned int mw);
> > void ntb_ring_sdb(struct ntb_device *ndev, unsigned int idx);
> > void *ntb_find_transport(struct pci_dev *pdev);
> > diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c
> > index b3afb24..e0bdfd7 100644
> > --- a/drivers/ntb/ntb_transport.c
> > +++ b/drivers/ntb/ntb_transport.c
> > @@ -58,7 +58,7 @@
> > #include <linux/ntb.h>
> > #include "ntb_hw.h"
> >
> > -#define NTB_TRANSPORT_VERSION 1
> > +#define NTB_TRANSPORT_VERSION 2
>
> How is this a sparse fix?
I changed the format of the header below.
>
> > static unsigned int transport_mtu = 0x401E;
> > module_param(transport_mtu, uint, 0644);
> > @@ -91,14 +91,14 @@ struct ntb_transport_qp {
> > bool qp_link;
> > u8 qp_num; /* Only 64 QP's are allowed. 0-63 */
> >
> > - struct ntb_rx_info *rx_info;
> > + struct ntb_rx_info __iomem *rx_info;
> > struct ntb_rx_info *remote_rx_info;
> >
> > void (*tx_handler) (struct ntb_transport_qp *qp, void *qp_data,
> > void *data, int len);
> > struct list_head tx_free_q;
> > spinlock_t ntb_tx_free_q_lock;
> > - void *tx_mw;
> > + void __iomem *tx_mw;
> > unsigned int tx_index;
> > unsigned int tx_max_entry;
> > unsigned int tx_max_frame;
> > @@ -166,7 +166,7 @@ enum {
> > };
> >
> > struct ntb_payload_header {
> > - u64 ver;
> > + unsigned int ver;
>
> why does sparse care about this?
I am using the number of tx/rx packets transmitted as a sanity check
on the data. This is a 64bit counter. There is no iowrite64, so I
truncated this to 32bits. I can rework this part of the patch to do 2
iowrite32's and keep the value as 64bit.
Thanks,
Jon
>
> thanks,
>
> greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
