Re: [PATCH 1/3] sh_eth: rename EESIPR bits
From: Sergei Shtylyov <hidden>
Date: 2017-01-24 15:47:41
Also in:
linux-renesas-soc
Hello! On 01/23/2017 10:39 AM, Geert Uytterhoeven wrote:
quoted
Since the commit b0ca2a21f769 ("sh_eth: Add support of SH7763 to sh_eth") the *enum* declaring the EESIPR bits (interrupt mask) went out of sync with the *enum* declaring the EESR bits (interrupt status) WRT bit naming and formatting. I'd like to restore the consistency by using EESIPR as the bit name prefix, renaming the *enum* to EESIPR_BIT, and (finally) renaming the bits according to the available Renesas SH77{34|63} manuals...Which versions of the SH77{34|63} manuals did you use? Several registers are called slightly different in mine, and also in my r8a7740 manual.
SH7734 User's Manual: Hardware, Rev.1.00 Jun 2012.
SH7763 User’s Manual: Hardware, Rev.3.00 Mar 2012
quoted
--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.h +++ net-next/drivers/net/ethernet/renesas/sh_eth.h@@ -268,19 +268,29 @@ enum EESR_BIT { EESR_TFE | EESR_TDE) /* EESIPR */ -enum DMAC_IM_BIT { - DMAC_M_TWB = 0x40000000, DMAC_M_TABT = 0x04000000, - DMAC_M_RABT = 0x02000000, - DMAC_M_RFRMER = 0x01000000, DMAC_M_ADF = 0x00800000, - DMAC_M_ECI = 0x00400000, DMAC_M_FTC = 0x00200000, - DMAC_M_TDE = 0x00100000, DMAC_M_TFE = 0x00080000, - DMAC_M_FRC = 0x00040000, DMAC_M_RDE = 0x00020000, - DMAC_M_RFE = 0x00010000, DMAC_M_TINT4 = 0x00000800, - DMAC_M_TINT3 = 0x00000400, DMAC_M_TINT2 = 0x00000200, - DMAC_M_TINT1 = 0x00000100, DMAC_M_RINT8 = 0x00000080, - DMAC_M_RINT5 = 0x00000010, DMAC_M_RINT4 = 0x00000008, - DMAC_M_RINT3 = 0x00000004, DMAC_M_RINT2 = 0x00000002, - DMAC_M_RINT1 = 0x00000001, +enum EESIPR_BIT { + EESIPR_TWBIP = 0x40000000,TWBIP is actually two bits in my manual: TWB1IP and TWB0IP
Yes. I'm adding TWB1 in the next patch.
quoted
+ EESIPR_ADEIP = 0x00800000,Nonexistent bit in my manual.
In mine as well. I used EESR *enum* as a source of info in this case.
Note that this bit is documented for R-Car gen2 (but called differently).
quoted
+ EESIPR_CNDIP = 0x00000800,Nonexistent bit in my manual.
I used the EESR *enum* again.
Gr{oetje,eeting}s,
GeertMBR, Sergei