Hi Andrey,
a similiar patch was posted some days ago to support two MAC addresses for the
i.MX6 UltraLite. See
http://lists.infradead.org/pipermail/barebox/2016-November/028628.html
Your approach uses an extra device attribute 'mac_idx' to select the meaning
of the device attribute 'mac_addr': Whether it points to the MAC0 or MAC1.
I find it less error prone and confusing to use two seperate device attributes
'mac_addr' and 'mac_addr1' for MAC0 and MAC1. So you don't have to check the
value of 'mac_idx before reading or writing the MAC addresses.
Both approaches are backwards compatible since the name of 'mac_addr' for the
first MAC address is not changed.
Mit freundlichen Grüßen / Kind regards,
Stefan Lengfeld
On Mon, Dec 05, 2016 at 06:54:30AM -0800, Andrey Smirnov wrote:
> i.MX SoC variants like Vybrid have more than one built-in Ethernet
> interface and as a consequence support storing more than one MAC address
> in OCOTP module. Add 'mac_idx' variable to allow to select which mac
> address is being referred to by 'mac_addr' variable and the code to
> handle it appropriately.
>
> Signed-off-by: Andrey Smirnov <andrew.smirnov@xxxxxxxxx>
> ---
> arch/arm/mach-imx/ocotp.c | 50 +++++++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 46 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-imx/ocotp.c b/arch/arm/mach-imx/ocotp.c
> index 68ff0ce..9a07922 100644
> --- a/arch/arm/mach-imx/ocotp.c
> +++ b/arch/arm/mach-imx/ocotp.c
> @@ -69,12 +69,16 @@
> /* Other definitions */
> #define IMX6_OTP_DATA_ERROR_VAL 0xBADABADA
> #define DEF_RELAX 20
> -#define MAC_OFFSET (0x22 * 4)
> +#define MAC_OFFSET_0 (0x22 * 4)
> +#define MAC_OFFSET_1 (0x24 * 4)
> +#define MAX_MAC_OFFSETS 2
> #define MAC_BYTES 8
>
> struct imx_ocotp_data {
> int num_regs;
> u32 (*addr_to_offset)(u32 addr);
> + u8 mac_offsets[MAX_MAC_OFFSETS];
> + u8 mac_offsets_num;
> };
>
> struct ocotp_priv {
> @@ -87,6 +91,7 @@ struct ocotp_priv {
> char ethaddr[6];
> struct regmap_config map_config;
> const struct imx_ocotp_data *data;
> + int mac_offset_idx;
> };
>
> static struct ocotp_priv *imx_ocotp;
> @@ -402,8 +407,10 @@ static int imx_ocotp_get_mac(struct param_d *param, void *priv)
> struct ocotp_priv *ocotp_priv = priv;
> char buf[8];
> int i, ret;
> + u8 mac_offset;
>
> - ret = regmap_bulk_read(ocotp_priv->map, MAC_OFFSET, buf, MAC_BYTES);
> + mac_offset = ocotp_priv->data->mac_offsets[ocotp_priv->mac_offset_idx];
> + ret = regmap_bulk_read(ocotp_priv->map, mac_offset, buf, MAC_BYTES);
> if (ret < 0)
> return ret;
>
> @@ -418,18 +425,43 @@ static int imx_ocotp_set_mac(struct param_d *param, void *priv)
> struct ocotp_priv *ocotp_priv = priv;
> char buf[8];
> int i, ret;
> + u8 mac_offset;
> +
> + mac_offset = ocotp_priv->data->mac_offsets[ocotp_priv->mac_offset_idx];
>
> for (i = 0; i < 6; i++)
> buf[5 - i] = ocotp_priv->ethaddr[i];
> buf[6] = 0; buf[7] = 0;
>
> - ret = regmap_bulk_write(ocotp_priv->map, MAC_OFFSET, buf, MAC_BYTES);
> + ret = regmap_bulk_write(ocotp_priv->map, mac_offset, buf, MAC_BYTES);
> if (ret < 0)
> return ret;
>
> return 0;
> }
>
> +static int imx_ocotp_set_mac_idx(struct param_d *param, void *priv)
> +{
> + struct ocotp_priv *ocotp_priv = priv;
> + const int min = 0;
> + const int max = ocotp_priv->data->mac_offsets_num - 1;
> + int old, new, ret = 0;
> +
> + old = ocotp_priv->mac_offset_idx;
> + new = clamp(old, min, max);
> +
> + if (old != new) {
> + dev_err(&ocotp_priv->dev,
> + "%d is out of bounds for '%s', clamping to %d\n",
> + old, param->name, new);
> + ret = -EINVAL;
> + }
> +
> + ocotp_priv->mac_offset_idx = new;
> +
> + return ret;
> +}
> +
> static struct regmap_bus imx_ocotp_regmap_bus = {
> .reg_write = imx_ocotp_reg_write,
> .reg_read = imx_ocotp_reg_read,
> @@ -486,9 +518,13 @@ static int imx_ocotp_probe(struct device_d *dev)
> NULL, NULL, &priv->permanent_write_enable, NULL);
> }
>
> - if (IS_ENABLED(CONFIG_NET))
> + if (IS_ENABLED(CONFIG_NET)) {
> + dev_add_param_int(&priv->dev, "mac_idx",
> + imx_ocotp_set_mac_idx, NULL,
> + &priv->mac_offset_idx, "%d", priv);
> dev_add_param_mac(&(priv->dev), "mac_addr", imx_ocotp_set_mac,
> imx_ocotp_get_mac, priv->ethaddr, priv);
> + }
>
> dev_add_param_bool(&(priv->dev), "sense_enable", NULL, NULL, &priv->sense_enable, priv);
>
> @@ -527,16 +563,22 @@ static u32 vf610_addr_to_offset(u32 addr)
> static struct imx_ocotp_data imx6q_ocotp_data = {
> .num_regs = 512,
> .addr_to_offset = imx6q_addr_to_offset,
> + .mac_offsets_num = 1,
> + .mac_offsets = { MAC_OFFSET_0 },
> };
>
> static struct imx_ocotp_data imx6sl_ocotp_data = {
> .num_regs = 256,
> .addr_to_offset = imx6sl_addr_to_offset,
> + .mac_offsets_num = 1,
> + .mac_offsets = { MAC_OFFSET_0 },
> };
>
> static struct imx_ocotp_data vf610_ocotp_data = {
> .num_regs = 512,
> .addr_to_offset = vf610_addr_to_offset,
> + .mac_offsets_num = 2,
> + .mac_offsets = { MAC_OFFSET_0, MAC_OFFSET_1 },
> };
>
> static __maybe_unused struct of_device_id imx_ocotp_dt_ids[] = {
> --
> 2.5.5
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
