ibm-emac: changes of emac_regs structure accordingly within driver emac_regs structure
Subsystems (2)
PATCH 1/2 ibm-emac: changes of emac_regs structure accordingly within driver emac_regs structure
In ibm_emac.c in ethtool size of emac structure which passing through to driver is nailed down and not correlating with current emac_regs structure.
Signed-off-by Ivan Mikhaylov <[email protected]>
--- ibm_emac.c | 139 ++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 103 insertions(+), 36 deletions(-)
ibm_emac.c +103 -36
@@ -32,35 +32,78 @@ struct emac_ethtool_regs_subhdr { };struct emac_regs { -u32 mr0; -u32 mr1; -u32 tmr0; -u32 tmr1; -u32 rmr; -u32 isr; -u32 iser; -u32 iahr; -u32 ialr; -u32 vtpid; -u32 vtci; -u32 ptr; -u32 iaht1; -u32 iaht2; -u32 iaht3; -u32 iaht4; -u32 gaht1; -u32 gaht2; -u32 gaht3; -u32 gaht4; +/* Common registers across all EMAC implementations. */ +u32 mr0;/* Special */ +u32 mr1;/* Reset */ +u32 tmr0;/* Special */ +u32 tmr1;/* Special */ +u32 rmr;/* Reset */ +u32 isr;/* Always */ +u32 iser;/* Reset */ +u32 iahr;/* Reset, R, T */ +u32 ialr;/* Reset, R, T */ +u32 vtpid;/* Reset, R, T */ +u32 vtci;/* Reset, R, T */ +u32 ptr;/* Reset, T */ +union { +/* Registers unique to EMAC4 implementations */ +struct { +u32 iaht1;/* Reset, R */ +u32 iaht2;/* Reset, R */ +u32 iaht3;/* Reset, R */ +u32 iaht4;/* Reset, R */ +u32 gaht1;/* Reset, R */ +u32 gaht2;/* Reset, R */ +u32 gaht3;/* Reset, R */ +u32 gaht4;/* Reset, R */ + } emac4; +/* Registers unique to EMAC4SYNC implementations */ +struct { +u32 mahr;/* Reset, R, T */ +u32 malr;/* Reset, R, T */ +u32 mmahr;/* Reset, R, T */ +u32 mmalr;/* Reset, R, T */ +u32 rsvd0[4 ]; + } emac4sync; + } u0; +/* Common registers across all EMAC implementations. */ u32 lsah;u32 lsal; -u32 ipgvr; -u32 stacr; -u32 trtr; -u32 rwmr; +u32 ipgvr;/* Reset, T */ +u32 stacr;/* Special */ +u32 trtr;/* Special */ +u32 rwmr;/* Reset */ u32 octx;u32 ocrx; -u32 ipcr; +union { +/* Registers unique to EMAC4 implementations */ +struct { +u32 ipcr; + } emac4; +/* Registers unique to EMAC4SYNC implementations */ +struct { +u32 rsvd1; +u32 revid; +u32 rsvd2[2 ]; +u32 iaht1;/* Reset, R */ +u32 iaht2;/* Reset, R */ +u32 iaht3;/* Reset, R */ +u32 iaht4;/* Reset, R */ +u32 iaht5;/* Reset, R */ +u32 iaht6;/* Reset, R */ +u32 iaht7;/* Reset, R */ +u32 iaht8;/* Reset, R */ +u32 gaht1;/* Reset, R */ +u32 gaht2;/* Reset, R */ +u32 gaht3;/* Reset, R */ +u32 gaht4;/* Reset, R */ +u32 gaht5;/* Reset, R */ +u32 gaht6;/* Reset, R */ +u32 gaht7;/* Reset, R */ +u32 gaht8;/* Reset, R */ +u32 tpc;/* Reset, T */ + } emac4sync; + } u1; };struct mal_regs {
@@ -121,8 +164,6 @@ static void *print_emac_regs(void *buf)"TRTR = 0x%08x RWMR = 0x%08x\n" "IAR = %04x%08x\n" "LSA = %04x%08x\n" -"IAHT = 0x%04x 0x%04x 0x%04x 0x%04x\n" -"GAHT = 0x%04x 0x%04x 0x%04x 0x%04x\n" "VTPID = 0x%04x VTCI = 0x%04x\n" "IPGVR = 0x%04x STACR = 0x%08x\n" "OCTX = 0x%08x OCRX = 0x%08x\n",
@@ -132,15 +173,41 @@ static void *print_emac_regs(void *buf) p->trtr, p->rwmr, p->iahr, p->ialr, p->lsah, p->lsal, - p->iaht1, p->iaht2, p->iaht3, p->iaht4, - p->gaht1, p->gaht2, p->gaht3, p->gaht4, - p->vtpid, p->vtci, p->ipgvr, p->stacr, p->octx, p->ocrx); - -if (hdr->version) -printf (" IPCR = 0x%08x\n\n" , p->ipcr); -else { -printf ("\n\n" ); - res -=sizeof (u32); + p->vtpid, p->vtci, + p->ipgvr, p->stacr, p->octx, p->ocrx); + +if (hdr->version) { +printf ("MAHR = 0x%08x MALR = 0x%08x MMAHR = 0x%08x\n" +"MMALR = 0x%08x REVID = 0x%08x\n" , + p->u0.emac4sync.mahr, p->u0.emac4sync.malr, + p->u0.emac4sync.mmahr, p->u0.emac4sync.mmalr, + p->u1.emac4sync.revid); + +printf ("IAHT = 0x%04x 0x%04x 0x%04x 0x%04x\n" , + p->u1.emac4sync.iaht1, p->u1.emac4sync.iaht2, + p->u1.emac4sync.iaht3, p->u1.emac4sync.iaht4); +printf (" 0x%04x 0x%04x 0x%04x 0x%04x\n" , + p->u1.emac4sync.iaht5, p->u1.emac4sync.iaht6, + p->u1.emac4sync.iaht7, p->u1.emac4sync.iaht8); + + +printf ("GAHT = 0x%04x 0x%04x 0x%04x 0x%04x\n" , + p->u1.emac4sync.gaht1, p->u1.emac4sync.gaht2, + p->u1.emac4sync.gaht3, p->u1.emac4sync.gaht4); +printf (" 0x%04x 0x%04x 0x%04x 0x%04x\n\n" , + p->u1.emac4sync.gaht5, p->u1.emac4sync.gaht6, + p->u1.emac4sync.gaht7, p->u1.emac4sync.gaht8); + + }else { +printf ("IAHT = 0x%04x 0x%04x 0x%04x 0x%04x\n" , + p->u0.emac4.iaht1, p->u0.emac4.iaht2, + p->u0.emac4.iaht3, p->u0.emac4.iaht4); + +printf ("GAHT = 0x%04x 0x%04x 0x%04x 0x%04x\n" , + p->u0.emac4.gaht1, p->u0.emac4.gaht2, + p->u0.emac4.gaht3, p->u0.emac4.gaht4); + +printf (" IPCR = 0x%08x\n\n" , p->u1.emac4.ipcr); }return res;
David Miller
maintainerFrom: Ivan Mikhaylov <[email protected]>
Date: Tue, 12 May 2015 17:11:44 +0400
Quoted 4 lines
In
ibm_emac.cin ethtool size of emac structure which passing through to driver is nailed down and not correlating with currentemac_regsstructure.Signed-off-by Ivan Mikhaylov <[email protected]>
Please do not submit patches for two different projects as a single patch series.
Thank you.