Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1201005

Re: [PATCH] sky2: Add module parameter for passing the MAC address

Show all headers | View raw

On Wed, Aug 05, 2015 at 06:15:37PM +0100, Ryan Harkin wrote:
>    On 5 August 2015 at 16:50, Liviu Dudau <[1]Liviu.Dudau@arm.com> wrote:
> 
>      For designs where EEPROMs are not connected to PCI Yukon2
>      chips we need to get the MAC address from the firmware.
>      Add a module parameter called 'mac_address' for this. It
>      will be used if no DT node can be found and the B2_MAC
>      register holds an invalid value.
> 
>      Signed-off-by: Liviu Dudau <[2]Liviu.Dudau@arm.com>
> 
>    Looks good to me.  FWIW, you can have a tested or reviewed-by at your preference:
>    Tested-by: Ryan Harkin <[3]ryan.harkin@linaro.org>
>    Reviewed-by: Ryan Harkin <[4]ryan.harkin@linaro.org>
> 

Thanks Ryan, I think one can provide both tags, so I will use them together.

Best regards,
Liviu

>     
> 
>      ---
>       drivers/net/ethernet/marvell/sky2.c | 14 +++++++++++++-
>       1 file changed, 13 insertions(+), 1 deletion(-)
> 
>      diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
>      index d9f4498..a977d95 100644
>      --- a/drivers/net/ethernet/marvell/sky2.c
>      +++ b/drivers/net/ethernet/marvell/sky2.c
>      @@ -101,6 +101,10 @@ static int legacy_pme = 0;
>       module_param(legacy_pme, int, 0);
>       MODULE_PARM_DESC(legacy_pme, "Legacy power management");
> 
>      +/* Ugh!  Let the firmware tell us the hardware address */
>      +static int mac_address[ETH_ALEN] = { 0, };
>      +module_param_array(mac_address, int, NULL, 0);
>      +
>       static const struct pci_device_id sky2_id_table[] = {
>              { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, /* SK-9Sxx */
>              { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, /* SK-9Exx */
>      @@ -4811,13 +4815,21 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port,
>              /* try to get mac address in the following order:
>               * 1) from device tree data
>               * 2) from internal registers set by bootloader
>      +        * 3) from the command line parameter
>               */
>              iap = of_get_mac_address(hw->pdev->dev.of_node);
>              if (iap)
>                      memcpy(dev->dev_addr, iap, ETH_ALEN);
>      -       else
>      +       else {
>                      memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8,
>                                    ETH_ALEN);
>      +               if (!is_valid_ether_addr(&dev->dev_addr[0])) {
>      +                       int i;
>      +
>      +                       for (i = 0; i < ETH_ALEN; i++)
>      +                               dev->dev_addr[i] = mac_address[i];
>      +               }
>      +       }
> 
>              return dev;
>       }
>      --
>      2.4.6
> 
> References
> 
>    Visible links
>    1. mailto:Liviu.Dudau@arm.com
>    2. mailto:Liviu.Dudau@arm.com
>    3. mailto:ryan.harkin@linaro.org
>    4. mailto:ryan.harkin@linaro.org

-- 
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] sky2: Add module parameter for passing the MAC address Liviu Dudau <Liviu.Dudau@arm.com> - 2015-08-05 18:00 +0200
  Re: [PATCH] sky2: Add module parameter for passing the MAC address Stephen Hemminger <stephen@networkplumber.org> - 2015-08-05 18:50 +0200
    Re: [PATCH] sky2: Add module parameter for passing the MAC address Liviu Dudau <Liviu.Dudau@arm.com> - 2015-08-05 19:20 +0200
      Re: [PATCH] sky2: Add module parameter for passing the MAC address Francois Romieu <romieu@fr.zoreil.com> - 2015-08-05 22:40 +0200
        Re: [PATCH] sky2: Add module parameter for passing the MAC address Stephen Hemminger <stephen@networkplumber.org> - 2015-08-06 01:20 +0200
          Re: [PATCH] sky2: Add module parameter for passing the MAC address Florian Fainelli <f.fainelli@gmail.com> - 2015-08-06 02:40 +0200
            [PATCH v2 net-next] sky2: use random address if EEPROM is bad Liviu Dudau <Liviu.Dudau@arm.com> - 2015-08-11 16:40 +0200
              Re: [PATCH v2 net-next] sky2: use random address if EEPROM is bad Stephen Hemminger <stephen@networkplumber.org> - 2015-08-11 19:10 +0200
                Re: [PATCH v2 net-next] sky2: use random address if EEPROM is bad Liviu Dudau <Liviu.Dudau@arm.com> - 2015-08-12 11:40 +0200
                Re: [PATCH v2 net-next] sky2: use random address if EEPROM is bad Stephen Hemminger <stephen@networkplumber.org> - 2015-08-12 17:30 +0200
                Re: [PATCH v2 net-next] sky2: use random address if EEPROM is bad Liviu Dudau <Liviu.Dudau@arm.com> - 2015-08-12 18:10 +0200
              Re: [PATCH v2 net-next] sky2: use random address if EEPROM is bad Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-08-11 21:00 +0200
                Re: [PATCH v2 net-next] sky2: use random address if EEPROM is bad Liviu Dudau <Liviu.Dudau@arm.com> - 2015-08-12 11:20 +0200
  Re: [PATCH] sky2: Add module parameter for passing the MAC address Liviu Dudau <Liviu.Dudau@arm.com> - 2015-08-05 19:20 +0200
  Re: [PATCH] sky2: Add module parameter for passing the MAC address David Miller <davem@davemloft.net> - 2015-08-06 02:20 +0200
    Re: [PATCH] sky2: Add module parameter for passing the MAC address Liviu Dudau <Liviu.Dudau@arm.com> - 2015-08-06 12:40 +0200

csiph-web