| Message ID | 20151101162439.GB26373@oracle.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
> -----Original Message----- > From: Sowmini Varadhan [mailto:sowmini.varadhan@oracle.com] > Sent: Sunday, November 01, 2015 8:25 AM > > This is the i40e equivalent of commit c762dff24c06 ("ixgbe: Look up MAC > address in Open Firmware or IDPROM"). > > As with that fix, attempt to look up the MAC address in Open Firmware > on systems that support it, and use IDPROM on SPARC if no OF address > is found. > > In the case of the i40e there is an assumption that the default mac > address has already been set up as the primary mac filter on probe, > so if this filter is obtained from the Open Firmware or IDPROM, an > explicit write is needed via i40e_aq_mac_address_write() and > i40e_aq_add_macvlan() invocation. > > Reviewers: please check if invoking i40e_macaddr_init() on > platforms that use the default mac address (i.e., when it is not from > OF or idprom) will cause harm, and if it is necessary/possible to > move this invocation to an earlier point in i40e_probe(). > > Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> > Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> > --- > v2, v3: Andy Shevchenko comments > v4: Thanks, Sowmini, this looks reasonable to me, aside from a few simple stylistic comments below. sln > > drivers/net/ethernet/intel/i40e/i40e_main.c | 53 > ++++++++++++++++++++++++++- > 1 files changed, 52 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c > b/drivers/net/ethernet/intel/i40e/i40e_main.c > index b825f97..3c81c0c 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_main.c > +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c > @@ -24,6 +24,15 @@ > * > > ************************************************************************** > ****/ > > +#include <linux/etherdevice.h> > +#include <linux/of_net.h> > +#include <linux/pci.h> > + > +#ifdef CONFIG_SPARC > +#include <asm/idprom.h> > +#include <asm/prom.h> > +#endif > + > /* Local includes */ > #include "i40e.h" > #include "i40e_diag.h" > @@ -9212,6 +9221,25 @@ static struct i40e_vsi > *i40e_vsi_reinit_setup(struct i40e_vsi *vsi) > return NULL; > } > Please add a function comment in the style of the rest of the code. > +static int i40e_macaddr_init( struct i40e_vsi *vsi, u8 *macaddr) No space between '(' and 'struct' > +{ > + int ret; > + struct i40e_aqc_add_macvlan_element_data element; > + > + ret = i40e_aq_mac_address_write(&vsi->back->hw, > + I40E_AQC_WRITE_TYPE_LAA_WOL, > + macaddr, NULL); > + if (ret) > + return -EADDRNOTAVAIL; Please report the AQ error here as we do elsewhere in the code > + > + memset(&element, 0, sizeof(element)); > + ether_addr_copy(element.mac_addr, macaddr); > + element.flags = cpu_to_le16(I40E_AQC_MACVLAN_ADD_PERFECT_MATCH); > + i40e_aq_add_macvlan(&vsi->back->hw, vsi->seid, &element, 1, NULL); Please check for and report any AQ error returned from this call as we do elsewhere in the code. > + > + return ret; > +} > + > /** > * i40e_vsi_setup - Set up a VSI by a given type > * @pf: board private structure > @@ -9341,6 +9369,9 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, > u8 type, > ret = i40e_config_netdev(vsi); > if (ret) > goto err_netdev; > + ret = i40e_macaddr_init(vsi, pf->hw.mac.addr); > + if (ret) > + goto err_netdev; > ret = register_netdev(vsi->netdev); > if (ret) > goto err_netdev; > @@ -10162,6 +10193,24 @@ static void i40e_print_features(struct i40e_pf > *pf) > kfree(string); > } > Function comment needed > +static int i40e_get_platform_mac_addr(struct pci_dev *pdev, u8 *mac_addr) > +{ > + struct device_node *dp = pci_device_to_OF_node(pdev); > + const unsigned char *addr; > + > + addr = of_get_mac_address(dp); > + if (addr) { > + ether_addr_copy(mac_addr, addr); > + return 0; > + } > +#ifdef CONFIG_SPARC > + ether_addr_copy(mac_addr, idprom->id_ethaddr); > + return 0; > +#else > + return -EINVAL; > +#endif /* CONFIG_SPARC */ > +} > + > /** > * i40e_probe - Device initialization routine > * @pdev: PCI device information struct > @@ -10360,7 +10409,9 @@ static int i40e_probe(struct pci_dev *pdev, const > struct pci_device_id *ent) > i40e_aq_stop_lldp(hw, true, NULL); > } > > - i40e_get_mac_addr(hw, hw->mac.addr); > + err = i40e_get_platform_mac_addr(pdev, hw->mac.addr); > + if (err) > + i40e_get_mac_addr(hw, hw->mac.addr); > if (!is_valid_ether_addr(hw->mac.addr)) { > dev_info(&pdev->dev, "invalid MAC address %pM\n", hw- > >mac.addr); > err = -EIO; > -- > 1.7.1 -- 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
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index b825f97..3c81c0c 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -24,6 +24,15 @@ * ******************************************************************************/ +#include <linux/etherdevice.h> +#include <linux/of_net.h> +#include <linux/pci.h> + +#ifdef CONFIG_SPARC +#include <asm/idprom.h> +#include <asm/prom.h> +#endif + /* Local includes */ #include "i40e.h" #include "i40e_diag.h" @@ -9212,6 +9221,25 @@ static struct i40e_vsi *i40e_vsi_reinit_setup(struct i40e_vsi *vsi) return NULL; } +static int i40e_macaddr_init( struct i40e_vsi *vsi, u8 *macaddr) +{ + int ret; + struct i40e_aqc_add_macvlan_element_data element; + + ret = i40e_aq_mac_address_write(&vsi->back->hw, + I40E_AQC_WRITE_TYPE_LAA_WOL, + macaddr, NULL); + if (ret) + return -EADDRNOTAVAIL; + + memset(&element, 0, sizeof(element)); + ether_addr_copy(element.mac_addr, macaddr); + element.flags = cpu_to_le16(I40E_AQC_MACVLAN_ADD_PERFECT_MATCH); + i40e_aq_add_macvlan(&vsi->back->hw, vsi->seid, &element, 1, NULL); + + return ret; +} + /** * i40e_vsi_setup - Set up a VSI by a given type * @pf: board private structure @@ -9341,6 +9369,9 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type, ret = i40e_config_netdev(vsi); if (ret) goto err_netdev; + ret = i40e_macaddr_init(vsi, pf->hw.mac.addr); + if (ret) + goto err_netdev; ret = register_netdev(vsi->netdev); if (ret) goto err_netdev; @@ -10162,6 +10193,24 @@ static void i40e_print_features(struct i40e_pf *pf) kfree(string); } +static int i40e_get_platform_mac_addr(struct pci_dev *pdev, u8 *mac_addr) +{ + struct device_node *dp = pci_device_to_OF_node(pdev); + const unsigned char *addr; + + addr = of_get_mac_address(dp); + if (addr) { + ether_addr_copy(mac_addr, addr); + return 0; + } +#ifdef CONFIG_SPARC + ether_addr_copy(mac_addr, idprom->id_ethaddr); + return 0; +#else + return -EINVAL; +#endif /* CONFIG_SPARC */ +} + /** * i40e_probe - Device initialization routine * @pdev: PCI device information struct @@ -10360,7 +10409,9 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) i40e_aq_stop_lldp(hw, true, NULL); } - i40e_get_mac_addr(hw, hw->mac.addr); + err = i40e_get_platform_mac_addr(pdev, hw->mac.addr); + if (err) + i40e_get_mac_addr(hw, hw->mac.addr); if (!is_valid_ether_addr(hw->mac.addr)) { dev_info(&pdev->dev, "invalid MAC address %pM\n", hw->mac.addr); err = -EIO;
This is the i40e equivalent of commit c762dff24c06 ("ixgbe: Look up MAC address in Open Firmware or IDPROM"). As with that fix, attempt to look up the MAC address in Open Firmware on systems that support it, and use IDPROM on SPARC if no OF address is found. In the case of the i40e there is an assumption that the default mac address has already been set up as the primary mac filter on probe, so if this filter is obtained from the Open Firmware or IDPROM, an explicit write is needed via i40e_aq_mac_address_write() and i40e_aq_add_macvlan() invocation. Reviewers: please check if invoking i40e_macaddr_init() on platforms that use the default mac address (i.e., when it is not from OF or idprom) will cause harm, and if it is necessary/possible to move this invocation to an earlier point in i40e_probe(). Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> --- v2, v3: Andy Shevchenko comments v4: drivers/net/ethernet/intel/i40e/i40e_main.c | 53 ++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-)