igt/intel_iosf: rename IOSF sideband opcodes according to the spec
PATCH 1/2 igt/intel_iosf: rename IOSF sideband opcodes according to the spec
These opcodes are not specific for an endpoint, but are the same for all endpoints. So rename them accordingly, using the name the VLV2 sideband HAS uses. Also move the macros to the .c file, since they aren't used anywhere else.
--- lib/intel_iosf.c | 24 ++++++++++++++++-------- lib/intel_reg.h | 5 ----- 2 files changed, 16 insertions(+), 13 deletions(-)
lib/intel_iosf.c +16 -8
@@ -8,13 +8,21 @@#define TIMEOUT_US 500000 +/* Standard MMIO read, non-posted */ +#define SB_MRD_NP 0x00 +/* Standard MMIO write, non-posted */ +#define SB_MWR_NP 0x01 +/* Private register read, double-word addressing, non-posted */ +#define SB_CRRDDA_NP 0x06 +/* Private register write, double-word addressing, non-posted */ +#define SB_CRWRDA_NP 0x07 +static int vlv_sideband_rw (uint32_t port,uint8_t opcode,uint32_t addr,uint32_t *val) {int timeout =0 ;uint32_t cmd, devfn, be, bar; -int is_read = (opcode ==PUNIT_OPCODE_REG_READ || - opcode ==DPIO_OPCODE_REG_READ ); +int is_read = (opcode ==SB_CRRDDA_NP || opcode ==SB_MRD_NP ); bar =0 ; be =0xf ;
@@ -67,7 +75,7 @@ static int vlv_sideband_rw(uint32_t port, uint8_t opcode, uint32_t addr,*/ int intel_punit_read (uint8_t addr,uint32_t *val) { -return vlv_sideband_rw (IOSF_PORT_PUNIT ,PUNIT_OPCODE_REG_READ , addr, val); +return vlv_sideband_rw (IOSF_PORT_PUNIT ,SB_CRRDDA_NP , addr, val); }/**
@@ -82,7 +90,7 @@ int intel_punit_read(uint8_t addr, uint32_t *val)*/ int intel_punit_write (uint8_t addr,uint32_t val) { -return vlv_sideband_rw (IOSF_PORT_PUNIT ,PUNIT_OPCODE_REG_WRITE , addr, &val); +return vlv_sideband_rw (IOSF_PORT_PUNIT ,SB_CRWRDA_NP , addr, &val); }/**
@@ -97,7 +105,7 @@ int intel_punit_write(uint8_t addr, uint32_t val)*/ int intel_nc_read (uint8_t addr,uint32_t *val) { -return vlv_sideband_rw (IOSF_PORT_NC ,PUNIT_OPCODE_REG_READ , addr, val); +return vlv_sideband_rw (IOSF_PORT_NC ,SB_CRRDDA_NP , addr, val); }/**
@@ -112,7 +120,7 @@ int intel_nc_read(uint8_t addr, uint32_t *val)*/ int intel_nc_write (uint8_t addr,uint32_t val) { -return vlv_sideband_rw (IOSF_PORT_NC ,PUNIT_OPCODE_REG_WRITE , addr, &val); +return vlv_sideband_rw (IOSF_PORT_NC ,SB_CRWRDA_NP , addr, &val); }/**
@@ -129,7 +137,7 @@ uint32_t intel_dpio_reg_read(uint32_t reg, int phy) {uint32_t val; -vlv_sideband_rw (IOSF_PORT_DPIO ,DPIO_OPCODE_REG_READ , reg, &val); +vlv_sideband_rw (IOSF_PORT_DPIO ,SB_MRD_NP , reg, &val);return val; }
@@ -143,5 +151,5 @@ uint32_t intel_dpio_reg_read(uint32_t reg, int phy)*/ void intel_dpio_reg_write (uint32_t reg,uint32_t val,int phy) { -vlv_sideband_rw (IOSF_PORT_DPIO ,DPIO_OPCODE_REG_WRITE , reg, &val); +vlv_sideband_rw (IOSF_PORT_DPIO ,SB_MWR_NP , reg, &val); }
lib/intel_reg.h +0 -5
@@ -3576,9 +3576,4 @@ typedef enum {#define VLV_IOSF_DATA (VLV_DISPLAY_BASE + 0x2104)#define VLV_IOSF_ADDR (VLV_DISPLAY_BASE + 0x2108) -#define DPIO_OPCODE_REG_READ 0 -#define DPIO_OPCODE_REG_WRITE 1 -#define PUNIT_OPCODE_REG_READ 6 -#define PUNIT_OPCODE_REG_WRITE 7 -#endif /* _I810_REG_H */
Signature · 1 line
1.8.4
PATCH 2/2 igt/quickdump: vlv: dump FLISDSI regs too
--- lib/intel_io.h | 2 ++ lib/intel_iosf.c | 14 ++++++++++++++ tools/quick_dump/chipset.i | 2 ++ tools/quick_dump/quick_dump.py | 2 ++ tools/quick_dump/reg_access.py | 6 ++++++ tools/quick_dump/valleyview | 1 + tools/quick_dump/vlv_flisdsi.txt | 39 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 66 insertions(+) create mode 100644 tools/quick_dump/vlv_flisdsi.txt
lib/intel_io.h +2 -0
@@ -48,6 +48,8 @@ void OUTREG(uint32_t reg, uint32_t val);/* sideband access functions from intel_iosf.c */ uint32_t intel_dpio_reg_read (uint32_t reg,int phy);void intel_dpio_reg_write (uint32_t reg,uint32_t val,int phy); +uint32_t intel_flisdsi_reg_read (uint32_t reg); +void intel_flisdsi_reg_write (uint32_t reg,uint32_t val);int intel_punit_read (uint8_t addr,uint32_t *val);int intel_punit_write (uint8_t addr,uint32_t val);
lib/intel_iosf.c +14 -0
@@ -153,3 +153,17 @@ void intel_dpio_reg_write(uint32_t reg, uint32_t val, int phy) {vlv_sideband_rw (IOSF_PORT_DPIO ,SB_MWR_NP , reg, &val); } + +uint32_t intel_flisdsi_reg_read (uint32_t reg) +{ +uint32_t val =0 ; + +vlv_sideband_rw (IOSF_PORT_FLISDSI ,SB_CRRDDA_NP , reg, &val); + +return val; +} + +void intel_flisdsi_reg_write (uint32_t reg,uint32_t val) +{ +vlv_sideband_rw (IOSF_PORT_FLISDSI ,SB_CRWRDA_NP , reg, &val); +}
tools/quick_dump/chipset.i +2 -0
@@ -18,6 +18,7 @@ extern void intel_register_access_fini(); extern int intel_register_access_needs_fakewake(); extern unsigned short pcidev_to_devid(struct pci_device *pci_dev); extern uint32_t intel_dpio_reg_read(uint32_t reg, int phy); +extern uint32_t intel_flisdsi_reg_read(uint32_t reg); %} extern int is_sandybridge(unsigned short pciid);
@@ -33,3 +34,4 @@ extern void intel_register_access_fini(); extern int intel_register_access_needs_fakewake(); extern unsigned short pcidev_to_devid(struct pci_device *pci_dev); extern uint32_t intel_dpio_reg_read(uint32_t reg, int phy); +extern uint32_t intel_flisdsi_reg_read(uint32_t reg);
tools/quick_dump/quick_dump.py +2 -0
@@ -38,6 +38,8 @@ def parse_file(file): register = ast.literal_eval(line) if register[2] == 'DPIO': val = reg.dpio_read(register[1], 0) + if register[2] == 'FLISDSI': + val = reg.flisdsi_read(register[1]) else: val = reg.read(register[1]) intreg = int(register[1], 16)
tools/quick_dump/reg_access.py +6 -0
@@ -35,6 +35,12 @@ def dpio_read(reg, phy): val = chipset.intel_dpio_reg_read(reg, phy) return val +def flisdsi_read(reg): + reg = int(reg, 16) + + val = chipset.intel_flisdsi_reg_read(reg) + return val + def init(): pci_dev = chipset.intel_get_pci_device()
tools/quick_dump/valleyview +1 -0
@@ -6,3 +6,4 @@ base_power.txt base_rings.txt gen7_other.txt vlv_dpio.txt +vlv_flisdsi.txt
tools/quick_dump/vlv_flisdsi.txt new file +39 -0
@@ -0,0 +1,39 @@ +('MIPI4DPHY_RCOMP_IOSFSB_REG0', '0x0000', 'FLISDSI') +('MIPI4DPHY_RCOMP_IOSFSB_REG1', '0x0001', 'FLISDSI') +('MIPI4DPHY_RCOMP_IOSFSB_REG2', '0x0002', 'FLISDSI') +('MIPI4DPHY_RCOMP_IOSFSB_REG3', '0x0003', 'FLISDSI') +('MIPI4DPHY_RCOMP_IOSFSB_REG4', '0x0004', 'FLISDSI') +('MIPI4DPHY_RCOMP_IOSFSB_REG5', '0x0005', 'FLISDSI') +('MIPI4DPHY_RCOMP_IOSFSB_REG6', '0x0006', 'FLISDSI') +('MIPI4DPHY_RCOMP_IOSFSB_REG7', '0x0007', 'FLISDSI') +('DSI_CFG', '0x0008', 'FLISDSI') +('DSI_DLLCOUNTCD_STATUS', '0x0009', 'FLISDSI') +('DSI_RXCDCNTRL', '0x000a', 'FLISDSI') +('DSI_HSRCOMP_STAT', '0x000b', 'FLISDSI') +('DSI_LPRCOMP_STAT', '0x000c', 'FLISDSI') +('DSI_LPRCOMP2', '0x000d', 'FLISDSI') +('DSI_LPRCOMP1', '0x000e', 'FLISDSI') +('DSI_BGCTL', '0x000f', 'FLISDSI') +('DSI_RCCCFG', '0x0010', 'FLISDSI') +('DSI_MISRDOUTLP', '0x0011', 'FLISDSI') +('DSI_RCCRCOMP', '0x0012', 'FLISDSI') +('DSI_BSCOMPARE', '0x0013', 'FLISDSI') +('DSI_RCOMPCTL1', '0x0014', 'FLISDSI') +('DSI_TXCNTRL', '0x0015', 'FLISDSI') +('DSI_MISRDOUT1', '0x0016', 'FLISDSI') +('DSI_DLLCTL2', '0x0017', 'FLISDSI') +('DSI_DLLCTL1', '0x0018', 'FLISDSI') +('DSI_ACIOCFG2', '0x0019', 'FLISDSI') +('DSI_ACIOCFG1', '0x001a', 'FLISDSI') +('DSI_ACIOSS', '0x001b', 'FLISDSI') +('DSI_ACIOERR1', '0x001c', 'FLISDSI') +('DSI_ACIOERR2', '0x001d', 'FLISDSI') +('DSI_MISRDOUT2', '0x001e', 'FLISDSI') +('DSI_RCOMPCTL2', '0x001f', 'FLISDSI') +('DSI_ALL01', '0x0020', 'FLISDSI') +('DSI_DLLCTL3', '0x0021', 'FLISDSI') +('DSI_DATAEYE1', '0x0022', 'FLISDSI') +('DSI_DATAEYE2', '0x0023', 'FLISDSI') +('DSI_DATAEYE3', '0x0024', 'FLISDSI') +('DSI_DATAEYE4', '0x0025', 'FLISDSI') +('DSI_DATAEYE5', '0x0026', 'FLISDSI')
Signature · 1 line
1.8.4
Quoted 96 lines · On Mon, 19 May 2014 16:48:31 +0300 Imre Deak <[email protected]> wrote:
These opcodes are not specific for an endpoint, but are the same for all endpoints. So rename them accordingly, using the name the VLV2 sideband HAS uses. Also move the macros to the .c file, since they aren't used anywhere else.
Signed-off-by Imre Deak <[email protected]>--- lib/intel_iosf.c | 24 ++++++++++++++++-------- lib/intel_reg.h | 5 ----- 2 files changed, 16 insertions(+), 13 deletions(-)lib/intel_iosf.c +16
-8@@ -8,13 +8,21 @@#define TIMEOUT_US 500000 +/* Standard MMIO read, non-posted */ +#define SB_MRD_NP 0x00 +/* Standard MMIO write, non-posted */ +#define SB_MWR_NP 0x01 +/* Private register read, double-word addressing, non-posted */ +#define SB_CRRDDA_NP 0x06 +/* Private register write, double-word addressing, non-posted */ +#define SB_CRWRDA_NP 0x07 +static int vlv_sideband_rw (uint32_t port,uint8_t opcode,uint32_t addr,uint32_t *val) {int timeout =0 ;uint32_t cmd, devfn, be, bar; -int is_read = (opcode ==PUNIT_OPCODE_REG_READ || - opcode ==DPIO_OPCODE_REG_READ ); +int is_read = (opcode ==SB_CRRDDA_NP || opcode ==SB_MRD_NP ); bar =0 ; be =0xf ;@@ -67,7 +75,7 @@ static int vlv_sideband_rw(uint32_t port, uint8_t opcode, uint32_t addr,*/ int intel_punit_read (uint8_t addr,uint32_t *val) { -return vlv_sideband_rw (IOSF_PORT_PUNIT ,PUNIT_OPCODE_REG_READ , addr, val); +return vlv_sideband_rw (IOSF_PORT_PUNIT ,SB_CRRDDA_NP , addr, val); }/** @@ -82,7 +90,7 @@ int intel_punit_read(uint8_t addr, uint32_t *val)*/ int intel_punit_write (uint8_t addr,uint32_t val) { -return vlv_sideband_rw (IOSF_PORT_PUNIT ,PUNIT_OPCODE_REG_WRITE , addr, &val); +return vlv_sideband_rw (IOSF_PORT_PUNIT ,SB_CRWRDA_NP , addr, &val); }/** @@ -97,7 +105,7 @@ int intel_punit_write(uint8_t addr, uint32_t val)*/ int intel_nc_read (uint8_t addr,uint32_t *val) { -return vlv_sideband_rw (IOSF_PORT_NC ,PUNIT_OPCODE_REG_READ , addr, val); +return vlv_sideband_rw (IOSF_PORT_NC ,SB_CRRDDA_NP , addr, val); }/** @@ -112,7 +120,7 @@ int intel_nc_read(uint8_t addr, uint32_t *val)*/ int intel_nc_write (uint8_t addr,uint32_t val) { -return vlv_sideband_rw (IOSF_PORT_NC ,PUNIT_OPCODE_REG_WRITE , addr, &val); +return vlv_sideband_rw (IOSF_PORT_NC ,SB_CRWRDA_NP , addr, &val); }/** @@ -129,7 +137,7 @@ uint32_t intel_dpio_reg_read(uint32_t reg, int phy) {uint32_t val; -vlv_sideband_rw (IOSF_PORT_DPIO ,DPIO_OPCODE_REG_READ , reg, &val); +vlv_sideband_rw (IOSF_PORT_DPIO ,SB_MRD_NP , reg, &val);return val; }@@ -143,5 +151,5 @@ uint32_t intel_dpio_reg_read(uint32_t reg, int phy)*/ void intel_dpio_reg_write (uint32_t reg,uint32_t val,int phy) { -vlv_sideband_rw (IOSF_PORT_DPIO ,DPIO_OPCODE_REG_WRITE , reg, &val); +vlv_sideband_rw (IOSF_PORT_DPIO ,SB_MWR_NP , reg, &val); }lib/intel_reg.h +0
-0
lib/intel_reg.h typedef enum { · line 3579
Quoted 9 lines
lib/intel_reg.h +0
-5@@ -3576,9 +3576,4 @@ typedef enum {#define VLV_IOSF_DATA (VLV_DISPLAY_BASE + 0x2104)#define VLV_IOSF_ADDR (VLV_DISPLAY_BASE + 0x2108) -#define DPIO_OPCODE_REG_READ 0 -#define DPIO_OPCODE_REG_WRITE 1 -#define PUNIT_OPCODE_REG_READ 6 -#define PUNIT_OPCODE_REG_WRITE 7 -#endif /* _I810_REG_H */
Looks fine to me... you have commit access right?
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Quoted 102 lines · Jesse Barnes
Quoted 99 lines · On Mon, 19 May 2014 16:48:31 +0300 Imre Deak <[email protected]> wrote:
These opcodes are not specific for an endpoint, but are the same for all endpoints. So rename them accordingly, using the name the VLV2 sideband HAS uses. Also move the macros to the .c file, since they aren't used anywhere else.
Signed-off-by Imre Deak <[email protected]>--- lib/intel_iosf.c | 24 ++++++++++++++++-------- lib/intel_reg.h | 5 ----- 2 files changed, 16 insertions(+), 13 deletions(-)lib/intel_iosf.c +16
-8@@ -8,13 +8,21 @@#define TIMEOUT_US 500000 +/* Standard MMIO read, non-posted */ +#define SB_MRD_NP 0x00 +/* Standard MMIO write, non-posted */ +#define SB_MWR_NP 0x01 +/* Private register read, double-word addressing, non-posted */ +#define SB_CRRDDA_NP 0x06 +/* Private register write, double-word addressing, non-posted */ +#define SB_CRWRDA_NP 0x07 +static int vlv_sideband_rw (uint32_t port,uint8_t opcode,uint32_t addr,uint32_t *val) {int timeout =0 ;uint32_t cmd, devfn, be, bar; -int is_read = (opcode ==PUNIT_OPCODE_REG_READ || - opcode ==DPIO_OPCODE_REG_READ ); +int is_read = (opcode ==SB_CRRDDA_NP || opcode ==SB_MRD_NP ); bar =0 ; be =0xf ;@@ -67,7 +75,7 @@ static int vlv_sideband_rw(uint32_t port, uint8_t opcode, uint32_t addr,*/ int intel_punit_read (uint8_t addr,uint32_t *val) { -return vlv_sideband_rw (IOSF_PORT_PUNIT ,PUNIT_OPCODE_REG_READ , addr, val); +return vlv_sideband_rw (IOSF_PORT_PUNIT ,SB_CRRDDA_NP , addr, val); }/** @@ -82,7 +90,7 @@ int intel_punit_read(uint8_t addr, uint32_t *val)*/ int intel_punit_write (uint8_t addr,uint32_t val) { -return vlv_sideband_rw (IOSF_PORT_PUNIT ,PUNIT_OPCODE_REG_WRITE , addr, &val); +return vlv_sideband_rw (IOSF_PORT_PUNIT ,SB_CRWRDA_NP , addr, &val); }/** @@ -97,7 +105,7 @@ int intel_punit_write(uint8_t addr, uint32_t val)*/ int intel_nc_read (uint8_t addr,uint32_t *val) { -return vlv_sideband_rw (IOSF_PORT_NC ,PUNIT_OPCODE_REG_READ , addr, val); +return vlv_sideband_rw (IOSF_PORT_NC ,SB_CRRDDA_NP , addr, val); }/** @@ -112,7 +120,7 @@ int intel_nc_read(uint8_t addr, uint32_t *val)*/ int intel_nc_write (uint8_t addr,uint32_t val) { -return vlv_sideband_rw (IOSF_PORT_NC ,PUNIT_OPCODE_REG_WRITE , addr, &val); +return vlv_sideband_rw (IOSF_PORT_NC ,SB_CRWRDA_NP , addr, &val); }/** @@ -129,7 +137,7 @@ uint32_t intel_dpio_reg_read(uint32_t reg, int phy) {uint32_t val; -vlv_sideband_rw (IOSF_PORT_DPIO ,DPIO_OPCODE_REG_READ , reg, &val); +vlv_sideband_rw (IOSF_PORT_DPIO ,SB_MRD_NP , reg, &val);return val; }@@ -143,5 +151,5 @@ uint32_t intel_dpio_reg_read(uint32_t reg, int phy)*/ void intel_dpio_reg_write (uint32_t reg,uint32_t val,int phy) { -vlv_sideband_rw (IOSF_PORT_DPIO ,DPIO_OPCODE_REG_WRITE , reg, &val); +vlv_sideband_rw (IOSF_PORT_DPIO ,SB_MWR_NP , reg, &val); }lib/intel_reg.h +0
-0@@ -3576,9 +3576,4 @@ typedef enum {#define VLV_IOSF_DATA (VLV_DISPLAY_BASE + 0x2104)#define VLV_IOSF_ADDR (VLV_DISPLAY_BASE + 0x2108)
Quoted 8 lines
lib/intel_reg.h typedef enum { · line 3579
Quoted 6 lines
lib/intel_reg.h +0
-5-#define DPIO_OPCODE_REG_READ 0 -#define DPIO_OPCODE_REG_WRITE 1 -#define PUNIT_OPCODE_REG_READ 6 -#define PUNIT_OPCODE_REG_WRITE 7 -#endif /* _I810_REG_H */ Looks fine to me... you have commit access right?
Yea, I can push it.
--Imre
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx