ppc/pnv: Add a HIOMAP erase command
PATCH 1/1 ppc/pnv: Add a HIOMAP erase command
The OPAL test suite runs a read-erase-write test on the PNOR :
https://github.com/open-power/op-test/blob/master/testcases/OpTestPNOR.py
which revealed that the IPMI HIOMAP handlers didn't support HIOMAP_C_ERASE. Implement the sector erase command by writing 0xFF in the PNOR memory region.
--- hw/ppc/pnv_bmc.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)
hw/ppc/pnv_bmc.c +30 -1
@@ -140,6 +140,29 @@ static uint16_t bytes_to_blocks(uint32_t bytes)return bytes >>BLOCK_SHIFT ; } +static uint32_t blocks_to_bytes (uint16_t blocks) +{ +return blocks <<BLOCK_SHIFT ; +} + +#define IPMI_ERR_UNSPECIFIED 0xff + +static int hiomap_erase (PnvPnor *pnor,uint32_t offset,uint32_t size) +{ +MemTxResult result; +int i; + +for (i =0 ; i < size /4 ; i++) { + result =memory_region_dispatch_write (&pnor->mmio, offset + i *4 , +0xFFFFFFFF ,MO_32 , +MEMTXATTRS_UNSPECIFIED ); +if (result !=MEMTX_OK ) { +return -1 ; + } + } +return 0 ; +} +static void hiomap_cmd (IPMIBmcSim *ibs,uint8_t *cmd,unsigned int cmd_len,RspBuffer *rsp) {
@@ -155,10 +178,16 @@ static void hiomap_cmd(IPMIBmcSim *ibs, uint8_t *cmd, unsigned int cmd_len,switch (cmd[2 ]) {case HIOMAP_C_MARK_DIRTY :case HIOMAP_C_FLUSH : -case HIOMAP_C_ERASE :case HIOMAP_C_ACK :break ; +case HIOMAP_C_ERASE : +if (hiomap_erase (pnor,blocks_to_bytes (cmd[5 ] <<8 | cmd[4 ]), +blocks_to_bytes (cmd[7 ] <<8 | cmd[6 ]))) { +rsp_buffer_set_error (rsp,IPMI_ERR_UNSPECIFIED ); + } +break ; +case HIOMAP_C_GET_INFO :rsp_buffer_push (rsp,2 );/* Version 2 */ rsp_buffer_push (rsp,BLOCK_SHIFT );/* block size */
Signature · 1 line
2.25.4
David Gibson
AppliedQuoted 10 lines · Cédric Le Goater
The OPAL test suite runs a read-erase-write test on the PNOR :
https://github.com/open-power/op-test/blob/master/testcases/OpTestPNOR.py
which revealed that the IPMI HIOMAP handlers didn't support
HIOMAP_C_ERASE. Implement the sector erase command by writing0xFFin the PNOR memory region.Reported-by Klaus Heinrich Kiwi <[email protected]>Signed-off-by Cédric Le Goater <[email protected]>
Applied to ppc-for-5.2.
Quoted 56 lines
--- hw/ppc/pnv_bmc.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)hw/ppc/pnv_bmc.c +30
-1@@ -140,6 +140,29 @@ static uint16_t bytes_to_blocks(uint32_t bytes)return bytes >>BLOCK_SHIFT ; } +static uint32_t blocks_to_bytes (uint16_t blocks) +{ +return blocks <<BLOCK_SHIFT ; +} + +#define IPMI_ERR_UNSPECIFIED 0xff + +static int hiomap_erase (PnvPnor *pnor,uint32_t offset,uint32_t size) +{ +MemTxResult result; +int i; + +for (i =0 ; i < size /4 ; i++) { + result =memory_region_dispatch_write (&pnor->mmio, offset + i *4 , +0xFFFFFFFF ,MO_32 , +MEMTXATTRS_UNSPECIFIED ); +if (result !=MEMTX_OK ) { +return -1 ; + } + } +return 0 ; +} +static void hiomap_cmd (IPMIBmcSim *ibs,uint8_t *cmd,unsigned int cmd_len,RspBuffer *rsp) {@@ -155,10 +178,16 @@ static void hiomap_cmd(IPMIBmcSim *ibs, uint8_t *cmd, unsigned int cmd_len,switch (cmd[2 ]) {case HIOMAP_C_MARK_DIRTY :case HIOMAP_C_FLUSH : -case HIOMAP_C_ERASE :case HIOMAP_C_ACK :break ; +case HIOMAP_C_ERASE : +if (hiomap_erase (pnor,blocks_to_bytes (cmd[5 ] <<8 | cmd[4 ]), +blocks_to_bytes (cmd[7 ] <<8 | cmd[6 ]))) { +rsp_buffer_set_error (rsp,IPMI_ERR_UNSPECIFIED ); + } +break ; +case HIOMAP_C_GET_INFO :rsp_buffer_push (rsp,2 );/* Version 2 */ rsp_buffer_push (rsp,BLOCK_SHIFT );/* block size */
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Quoted 19 lines · Cédric Le Goater
The OPAL test suite runs a read-erase-write test on the PNOR :
https://github.com/open-power/op-test/blob/master/testcases/OpTestPNOR.py
which revealed that the IPMI HIOMAP handlers didn't support
HIOMAP_C_ERASE. Implement the sector erase command by writing0xFFin the PNOR memory region.Reported-by Klaus Heinrich Kiwi <[email protected]>Signed-off-by Cédric Le Goater <[email protected]>--- hw/ppc/pnv_bmc.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)hw/ppc/pnv_bmc.c +0
-0
hw/ppc/pnv_bmc.c static uint16_t bytes_to_blocks(uint32_t bytes) · line 148
Quoted 9 lines
hw/ppc/pnv_bmc.c +6
-0@@ -140,6 +140,29 @@ static uint16_t bytes_to_blocks(uint32_t bytes)return bytes >>BLOCK_SHIFT ; } +static uint32_t blocks_to_bytes (uint16_t blocks) +{ +return blocks <<BLOCK_SHIFT ; +} + +#define IPMI_ERR_UNSPECIFIED 0xff
Wouldn't it be better for this to be in include/hw/ipmi/ipmi.h and be named IPMI_CC_UNSPECIFIED to match the other completion codes?
-corey
Quoted 42 lines
hw/ppc/pnv_bmc.c +24
-1+ +static int hiomap_erase (PnvPnor *pnor,uint32_t offset,uint32_t size) +{ +MemTxResult result; +int i; + +for (i =0 ; i < size /4 ; i++) { + result =memory_region_dispatch_write (&pnor->mmio, offset + i *4 , +0xFFFFFFFF ,MO_32 , +MEMTXATTRS_UNSPECIFIED ); +if (result !=MEMTX_OK ) { +return -1 ; + } + } +return 0 ; +} +static void hiomap_cmd (IPMIBmcSim *ibs,uint8_t *cmd,unsigned int cmd_len,RspBuffer *rsp) {@@ -155,10 +178,16 @@ static void hiomap_cmd(IPMIBmcSim *ibs, uint8_t *cmd, unsigned int cmd_len,switch (cmd[2 ]) {case HIOMAP_C_MARK_DIRTY :case HIOMAP_C_FLUSH : -case HIOMAP_C_ERASE :case HIOMAP_C_ACK :break ; +case HIOMAP_C_ERASE : +if (hiomap_erase (pnor,blocks_to_bytes (cmd[5 ] <<8 | cmd[4 ]), +blocks_to_bytes (cmd[7 ] <<8 | cmd[6 ]))) { +rsp_buffer_set_error (rsp,IPMI_ERR_UNSPECIFIED ); + } +break ; +case HIOMAP_C_GET_INFO :rsp_buffer_push (rsp,2 );/* Version 2 */ rsp_buffer_push (rsp,BLOCK_SHIFT );/* block size */ Signature · 1 line
2.25.4
Quoted 23 lines · Corey Minyard
Quoted 22 lines · Cédric Le Goater
The OPAL test suite runs a read-erase-write test on the PNOR :
https://github.com/open-power/op-test/blob/master/testcases/OpTestPNOR.py
which revealed that the IPMI HIOMAP handlers didn't support
HIOMAP_C_ERASE. Implement the sector erase command by writing0xFFin the PNOR memory region.Reported-by Klaus Heinrich Kiwi <[email protected]>Signed-off-by Cédric Le Goater <[email protected]>--- hw/ppc/pnv_bmc.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)hw/ppc/pnv_bmc.c +0
-0@@ -140,6 +140,29 @@ static uint16_t bytes_to_blocks(uint32_t bytes)return bytes >>BLOCK_SHIFT ; }
Quoted 9 lines
hw/ppc/pnv_bmc.c static uint16_t bytes_to_blocks(uint32_t bytes) · line 148
Quoted 6 lines
hw/ppc/pnv_bmc.c +6
-0+static uint32_t blocks_to_bytes (uint16_t blocks) +{ +return blocks <<BLOCK_SHIFT ; +} + +#define IPMI_ERR_UNSPECIFIED 0xffWouldn't it be better for this to be in
include/hw/ipmi/ipmi.hand be namedIPMI_CC_UNSPECIFIEDto match the other completion codes?
Yes. This is cleaner. Sending a v2 for a replacement.
Thanks,
C.
Quoted 44 lines
-corey
Quoted 42 lines
hw/ppc/pnv_bmc.c +24
-1+ +static int hiomap_erase (PnvPnor *pnor,uint32_t offset,uint32_t size) +{ +MemTxResult result; +int i; + +for (i =0 ; i < size /4 ; i++) { + result =memory_region_dispatch_write (&pnor->mmio, offset + i *4 , +0xFFFFFFFF ,MO_32 , +MEMTXATTRS_UNSPECIFIED ); +if (result !=MEMTX_OK ) { +return -1 ; + } + } +return 0 ; +} +static void hiomap_cmd (IPMIBmcSim *ibs,uint8_t *cmd,unsigned int cmd_len,RspBuffer *rsp) {@@ -155,10 +178,16 @@ static void hiomap_cmd(IPMIBmcSim *ibs, uint8_t *cmd, unsigned int cmd_len,switch (cmd[2 ]) {case HIOMAP_C_MARK_DIRTY :case HIOMAP_C_FLUSH : -case HIOMAP_C_ERASE :case HIOMAP_C_ACK :break ; +case HIOMAP_C_ERASE : +if (hiomap_erase (pnor,blocks_to_bytes (cmd[5 ] <<8 | cmd[4 ]), +blocks_to_bytes (cmd[7 ] <<8 | cmd[6 ]))) { +rsp_buffer_set_error (rsp,IPMI_ERR_UNSPECIFIED ); + } +break ; +case HIOMAP_C_GET_INFO :rsp_buffer_push (rsp,2 );/* Version 2 */ rsp_buffer_push (rsp,BLOCK_SHIFT );/* block size */ Signature · 1 line
2.25.4