From: Andy Green <andy@warmcat.com> To: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Cc: patches@linaro.org, nicolas.pitre@linaro.org, arnd@arndb.de, x0132446@ti.com, s-jan@ti.com, tony@atomide.com, Andy Green <andy.green@linaro.org> Subject: [RFC PATCH 1/2] OMAP2+: add cpu id register to MAC address helper Date: Thu, 24 Mar 2011 21:27:29 +0000 [thread overview] Message-ID: <20110324212729.14936.98130.stgit@otae.warmcat.com> (raw) In-Reply-To: <20110324211451.14936.39750.stgit@otae.warmcat.com> Introduce a generic helper function that can set a MAC address using data from the OMAP unique CPU ID register. For comparison purposes this produces a MAC address of 2e:40:70:f0:12:06 for the ethernet device on my Panda. Note that this patch requires the fix patch for CPU ID register indexes previously posted to linux-omap, otherwise the CPU ID is misread on Panda by the existing function to do it. This patch is already on linux-omap. "OMAP2+:Common CPU DIE ID reading code reads wrong registers for OMAP4430" http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=b235e007831dbf57710e59cd4a120e2f374eecb9 Signed-off-by: Andy Green <andy.green@linaro.org> --- arch/arm/mach-omap2/id.c | 39 +++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/include/mach/id.h | 1 + 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 2537090..e46b430 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -557,3 +557,42 @@ void __init omap2_set_globals_tap(struct omap_globals *omap2_globals) else tap_prod_id = 0x0208; } + +/* + * this uses the unique per-cpu info from the cpu fuses set at factory to + * generate a 6-byte MAC address. Two bits in the generated code are used + * to elaborate the generated address into four, so it can be used on multiple + * network interfaces. + */ + +void omap2_die_id_to_ethernet_mac(u8 *mac, int subtype) +{ + struct omap_die_id odi; + u32 tap = read_tap_reg(OMAP_TAP_IDCODE); + + omap_get_die_id(&odi); + + mac[0] = odi.id_2; + mac[1] = odi.id_2 >> 8; + mac[2] = odi.id_1; + mac[3] = odi.id_1 >> 8; + mac[4] = odi.id_1 >> 16; + mac[5] = odi.id_1 >> 24; + + /* XOR other chip-specific data with ID */ + + tap ^= odi.id_3; + + mac[0] ^= tap; + mac[1] ^= tap >> 8; + mac[2] ^= tap >> 16; + mac[3] ^= tap >> 24; + + /* allow four MACs from this same basic data */ + + mac[1] = (mac[1] & ~0xc0) | ((subtype & 3) << 6); + + /* mark it as not multicast and outside official 80211 MAC namespace */ + + mac[0] = (mac[0] & ~1) | 2; +} diff --git a/arch/arm/mach-omap2/include/mach/id.h b/arch/arm/mach-omap2/include/mach/id.h index 02ed3aa..373313a 100644 --- a/arch/arm/mach-omap2/include/mach/id.h +++ b/arch/arm/mach-omap2/include/mach/id.h @@ -18,5 +18,6 @@ struct omap_die_id { }; void omap_get_die_id(struct omap_die_id *odi); +void omap2_die_id_to_ethernet_mac(u8 *mac, int subtype); #endif
WARNING: multiple messages have this Message-ID (diff)
From: andy@warmcat.com (Andy Green) To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 1/2] OMAP2+: add cpu id register to MAC address helper Date: Thu, 24 Mar 2011 21:27:29 +0000 [thread overview] Message-ID: <20110324212729.14936.98130.stgit@otae.warmcat.com> (raw) In-Reply-To: <20110324211451.14936.39750.stgit@otae.warmcat.com> Introduce a generic helper function that can set a MAC address using data from the OMAP unique CPU ID register. For comparison purposes this produces a MAC address of 2e:40:70:f0:12:06 for the ethernet device on my Panda. Note that this patch requires the fix patch for CPU ID register indexes previously posted to linux-omap, otherwise the CPU ID is misread on Panda by the existing function to do it. This patch is already on linux-omap. "OMAP2+:Common CPU DIE ID reading code reads wrong registers for OMAP4430" http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=b235e007831dbf57710e59cd4a120e2f374eecb9 Signed-off-by: Andy Green <andy.green@linaro.org> --- arch/arm/mach-omap2/id.c | 39 +++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/include/mach/id.h | 1 + 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 2537090..e46b430 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -557,3 +557,42 @@ void __init omap2_set_globals_tap(struct omap_globals *omap2_globals) else tap_prod_id = 0x0208; } + +/* + * this uses the unique per-cpu info from the cpu fuses set at factory to + * generate a 6-byte MAC address. Two bits in the generated code are used + * to elaborate the generated address into four, so it can be used on multiple + * network interfaces. + */ + +void omap2_die_id_to_ethernet_mac(u8 *mac, int subtype) +{ + struct omap_die_id odi; + u32 tap = read_tap_reg(OMAP_TAP_IDCODE); + + omap_get_die_id(&odi); + + mac[0] = odi.id_2; + mac[1] = odi.id_2 >> 8; + mac[2] = odi.id_1; + mac[3] = odi.id_1 >> 8; + mac[4] = odi.id_1 >> 16; + mac[5] = odi.id_1 >> 24; + + /* XOR other chip-specific data with ID */ + + tap ^= odi.id_3; + + mac[0] ^= tap; + mac[1] ^= tap >> 8; + mac[2] ^= tap >> 16; + mac[3] ^= tap >> 24; + + /* allow four MACs from this same basic data */ + + mac[1] = (mac[1] & ~0xc0) | ((subtype & 3) << 6); + + /* mark it as not multicast and outside official 80211 MAC namespace */ + + mac[0] = (mac[0] & ~1) | 2; +} diff --git a/arch/arm/mach-omap2/include/mach/id.h b/arch/arm/mach-omap2/include/mach/id.h index 02ed3aa..373313a 100644 --- a/arch/arm/mach-omap2/include/mach/id.h +++ b/arch/arm/mach-omap2/include/mach/id.h @@ -18,5 +18,6 @@ struct omap_die_id { }; void omap_get_die_id(struct omap_die_id *odi); +void omap2_die_id_to_ethernet_mac(u8 *mac, int subtype); #endif
next prev parent reply other threads:[~2011-03-24 21:27 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-03-24 21:27 [RFC PATCH 0/2] OMAP2+: PANDA: Provide unique-ish MAC addresses for Ethernet and WLAN interfaces Andy Green 2011-03-24 21:27 ` Andy Green 2011-03-24 21:27 ` Andy Green [this message] 2011-03-24 21:27 ` [RFC PATCH 1/2] OMAP2+: add cpu id register to MAC address helper Andy Green 2011-03-25 11:49 ` Arnd Bergmann 2011-03-25 11:49 ` Arnd Bergmann 2011-03-25 12:08 ` Andy Green 2011-03-25 12:08 ` Andy Green 2011-03-25 13:24 ` Arnd Bergmann 2011-03-25 13:24 ` Arnd Bergmann 2011-03-25 13:34 ` Andy Green 2011-03-25 13:34 ` Andy Green 2011-03-25 14:50 ` Arnd Bergmann 2011-03-25 14:50 ` Arnd Bergmann 2011-03-25 15:00 ` Andy Green 2011-03-25 15:00 ` Andy Green 2011-03-24 21:27 ` [RFC PATCH 2/2] OMAP2+: PANDA: Fix up random or missing MAC addresses for eth0 and wlan0 Andy Green 2011-03-24 21:27 ` Andy Green 2011-03-25 7:39 ` Hema Kalliguddi 2011-03-25 7:39 ` Hema Kalliguddi 2011-03-25 20:13 ` Jason Kridner 2011-03-25 20:13 ` Jason Kridner 2011-03-25 20:20 ` Arnd Bergmann 2011-03-25 20:20 ` Arnd Bergmann 2011-03-25 20:23 ` Nicolas Pitre 2011-03-25 20:23 ` Nicolas Pitre 2011-03-28 12:54 ` Jason Kridner 2011-03-28 12:54 ` Jason Kridner 2011-03-25 20:30 ` Andy Green 2011-03-25 20:30 ` Andy Green 2011-03-25 11:39 ` Arnd Bergmann 2011-03-25 11:39 ` Arnd Bergmann 2012-06-28 14:18 ` [RFC PATCH 0/2] OMAP2+: PANDA: Provide unique-ish MAC addresses for Ethernet and WLAN interfaces Arnd Bergmann 2012-06-28 14:18 ` Arnd Bergmann 2012-06-28 14:45 ` Steven Rostedt 2012-06-28 14:45 ` Steven Rostedt 2012-06-28 14:49 ` "Andy Green (林安廸)" 2012-06-28 14:49 ` "Andy Green (林安廸)"
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20110324212729.14936.98130.stgit@otae.warmcat.com \ --to=andy@warmcat.com \ --cc=andy.green@linaro.org \ --cc=arnd@arndb.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=nicolas.pitre@linaro.org \ --cc=patches@linaro.org \ --cc=s-jan@ti.com \ --cc=tony@atomide.com \ --cc=x0132446@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.