[net-next,11/14] i40e: Ioremap changes

From: Anjali Singhai <anjali.singhai@intel.com>

For future device support we do not want to map the whole CSR space since some
of it is mapped by other drivers with different mapping methods.

Note: As a side effect, the flash region (if exposed through the memory map)
gets unmapped too since it follows the future use region.

Change-ID: Ic729a2eacd692984220b1a415ff4fa0f98ea419a
Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Jim Young <james.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/i40e/i40e.h      | 1 +
 drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

On Thu, 2015-03-05 at 08:46 -0800, Jeff Kirsher wrote:
[...]
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -9459,6 +9459,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>  	struct i40e_pf *pf;
>  	struct i40e_hw *hw;
>  	static u16 pfs_found;
> +	u32 ioremap_len;
>  	u16 link_status;
>  	int err = 0;
>  	u32 len;
> @@ -9507,8 +9508,11 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>  
>  	hw = &pf->hw;
>  	hw->back = pf;
> -	hw->hw_addr = ioremap(pci_resource_start(pdev, 0),
> -			      pci_resource_len(pdev, 0));
> +
> +	ioremap_len = min_t(int, pci_resource_len(pdev, 0),
> +			    I40E_MAX_CSR_SPACE);

What type do you really want ioremap_len to be, u32 or int?  (I think
the correct answer is unsigned long as that's the ioremap() parameter
type.)

Ben.

> +	hw->hw_addr = ioremap(pci_resource_start(pdev, 0), ioremap_len);
>  	if (!hw->hw_addr) {
>  		err = -EIO;
>  		dev_info(&pdev->dev, "ioremap(0x%04x, 0x%04x) failed: 0x%x\n",

On Fri, 2015-03-06 at 00:16 +0000, Ben Hutchings wrote:
> On Thu, 2015-03-05 at 08:46 -0800, Jeff Kirsher wrote:
> [...]
> > --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> > +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> > @@ -9459,6 +9459,7 @@ static int i40e_probe(struct pci_dev *pdev,
> const struct pci_device_id *ent)
> >       struct i40e_pf *pf;
> >       struct i40e_hw *hw;
> >       static u16 pfs_found;
> > +     u32 ioremap_len;
> >       u16 link_status;
> >       int err = 0;
> >       u32 len;
> > @@ -9507,8 +9508,11 @@ static int i40e_probe(struct pci_dev *pdev,
> const struct pci_device_id *ent)
> >  
> >       hw = &pf->hw;
> >       hw->back = pf;
> > -     hw->hw_addr = ioremap(pci_resource_start(pdev, 0),
> > -                           pci_resource_len(pdev, 0));
> > +
> > +     ioremap_len = min_t(int, pci_resource_len(pdev, 0),
> > +                         I40E_MAX_CSR_SPACE);
> 
> What type do you really want ioremap_len to be, u32 or int?  (I think
> the correct answer is unsigned long as that's the ioremap() parameter
> type.)

Yeah, I agree.  Once Dave updates his net-next tree with the patches he
has accepted, I will send out a fix.

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 05 Mar 2015 17:55:43 -0800

> Yeah, I agree.  Once Dave updates his net-next tree with the patches he
> has accepted, I will send out a fix.

Just push it out now, sorry about that.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

On Thu, 2015-03-05 at 21:15 -0500, David Miller wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu, 05 Mar 2015 17:55:43 -0800
> 
> > Yeah, I agree.  Once Dave updates his net-next tree with the patches he
> > has accepted, I will send out a fix.
> 
> Just push it out now, sorry about that.

Ok, working on it now and will have it sent here soon.