Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix QSPIF Bus mode mask and quad enable write SR size #10171

Merged
merged 4 commits into from Apr 1, 2019

Conversation

Projects
None yet
10 participants
@offirko
Copy link
Contributor

commented Mar 20, 2019

Fix Bus mode mask, and fix status register write size in some quad enable modes

Fix: #10165
Fix: #10163

Pull request type

[X] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change
@offirko

This comment has been minimized.

Copy link
Contributor Author

commented Mar 20, 2019

@offirko

This comment has been minimized.

Copy link
Contributor Author

commented Mar 20, 2019

@VairaRamasamy - can you please test the fix on CY8CPROTO_062_4343W

@@ -874,6 +875,7 @@ int QSPIFBlockDevice::_sfdp_set_quad_enabled(uint8_t *basic_param_table_ptr)
status_reg_setup[1] = 0x2; // Bit 1 of status Reg 2
_read_register_inst = 0x35;
sr_read_size = 1;
sr_write_size = 2;

This comment has been minimized.

Copy link
@0xc0170

0xc0170 Mar 20, 2019

Member

seems to be misaligned (astyle should catch these)

This comment has been minimized.

Copy link
@offirko

offirko Mar 20, 2019

Author Contributor

sorry fixing

@@ -1032,7 +1034,7 @@ int QSPIFBlockDevice::_sfdp_detect_best_bus_read_mode(uint8_t *basic_param_table
}
is_qpi_mode = false;
examined_byte = basic_param_table_ptr[QSPIF_BASIC_PARAM_TABLE_FAST_READ_SUPPORT_BYTE];
if (examined_byte & 0x40) {
if (examined_byte & 0x20) {

This comment has been minimized.

Copy link
@0xc0170

0xc0170 Mar 20, 2019

Member

how is this mode fix related to sr_write_size - they are both in the same commit - should they be in separate commits ?

This comment has been minimized.

Copy link
@offirko

offirko Mar 20, 2019

Author Contributor

Its two small changes, both are related to quad enabling process... though they in different areas. I can separate them if required.

This comment has been minimized.

Copy link
@0xc0170

0xc0170 Mar 20, 2019

Member

Could be fine, what about commit message (issues have details for these fixes to be tter understand them) ?

@vi

This comment has been minimized.

Copy link

commented Mar 20, 2019

@vi ... - please review

Maybe meant "@vimalrajr"?

Fixed Bus Mode bit mask to select best mode.
When setting Quad Enable, either SR1, SR2 or CR setup is required.
Either way register size is up to 2 bytes.

@offirko offirko force-pushed the offirko:offir_qspi_bus_mask_fix branch from a88dafe to 1a4c11e Mar 20, 2019

@ciarmcom ciarmcom requested review from ARMmbed/mbed-os-maintainers Mar 20, 2019

@ciarmcom

This comment has been minimized.

Copy link
Member

commented Mar 20, 2019

@offirko, thank you for your changes.
@ARMmbed/mbed-os-storage @ARMmbed/mbed-os-maintainers please review.

@VairaRamasamy
Copy link

left a comment

@VairaRamasamy - can you please test the fix on CY8CPROTO_062_4343W

@offirko I've tested this on CY8CPROTO_062_4343W and it works! Thanks for the fix.

@yossi2le
Copy link
Contributor

left a comment

I would consider adding a return in the default section of the case.
Other than that, it looks good to me.

@cmonr cmonr added needs: work and removed needs: review labels Mar 27, 2019

@offirko

This comment has been minimized.

Copy link
Contributor Author

commented Mar 28, 2019

@yossi2le - thanks, I fixed default "Unsupported" behavior to do nothing but log warning and return.

@cmonr

cmonr approved these changes Mar 28, 2019

@cmonr

This comment has been minimized.

Copy link
Contributor

commented Mar 28, 2019

CI started

@mbed-ci

This comment has been minimized.

Copy link

commented Mar 29, 2019

Test run: FAILED

Summary: 2 of 9 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_build-ARMC6
  • jenkins-ci/mbed-os-ci_build-GCC_ARM
@adbridge

This comment has been minimized.

Copy link
Contributor

commented Mar 29, 2019

@offirko please take a look at the failures

@adbridge adbridge added needs: work and removed needs: CI labels Mar 29, 2019

@cmonr cmonr added needs: CI and removed needs: work labels Mar 29, 2019

@cmonr

This comment has been minimized.

Copy link
Contributor

commented Mar 29, 2019

CI started

@mbed-ci

This comment has been minimized.

Copy link

commented Mar 29, 2019

Test run: FAILED

Summary: 1 of 13 test jobs failed
Build number : 2
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_greentea-test
@offirko

This comment has been minimized.

Copy link
Contributor Author

commented Mar 31, 2019

@NirSonnenschein - failures are on K66F that wasnt available: "[1553892247.32][CONN][ERR] Failed to connect to resource" , can you please rerun CI

@NirSonnenschein

This comment has been minimized.

Copy link
Contributor

commented Mar 31, 2019

restarted CI

@mbed-ci

This comment has been minimized.

Copy link

commented Mar 31, 2019

Test run: FAILED

Summary: 1 of 13 test jobs failed
Build number : 3
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_greentea-test
@offirko

This comment has been minimized.

Copy link
Contributor Author

commented Mar 31, 2019

@NirSonnenschein - hmm same K66F availability issue..
[1554020328.12][GLRM][ERR] Flash response(request_id: 9bc74b62-538d-11e9-8bc0-0242ac110008) failed with message: Resource is not connected

@mbed-ci

This comment has been minimized.

Copy link

commented Apr 1, 2019

Test run: SUCCESS

Summary: 13 of 13 test jobs passed
Build number : 4
Build artifacts

@0xc0170

This comment has been minimized.

Copy link
Member

commented Apr 1, 2019

@NirSonnenschein - hmm same K66F availability issue..

Few targets went offline, fixed today

@0xc0170

0xc0170 approved these changes Apr 1, 2019

@0xc0170 0xc0170 added ready for merge and removed needs: CI labels Apr 1, 2019

@0xc0170 0xc0170 merged commit 0403883 into ARMmbed:master Apr 1, 2019

28 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jenkins-ci/build-ARMC5 Success
Details
jenkins-ci/build-ARMC6 Success
Details
jenkins-ci/build-GCC_ARM Success
Details
jenkins-ci/build-IAR8 Success
Details
jenkins-ci/cloud-client-test Success
Details
jenkins-ci/dynamic-memory-usage RTOS ROM(+0 bytes) RAM(+0 bytes)
Details
jenkins-ci/exporter Success
Details
jenkins-ci/greentea-test Success
Details
jenkins-ci/mbed2-build-ARMC5 Success
Details
jenkins-ci/mbed2-build-ARMC6 Success
Details
jenkins-ci/mbed2-build-GCC_ARM Success
Details
jenkins-ci/mbed2-build-IAR8 Success
Details
jenkins-ci/unittests Success
Details
travis-ci/astyle Local astyle testing has passed
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/doxy-spellcheck Local doxy-spellcheck testing has passed
Details
travis-ci/events Passed, runtime is 9957 cycles (+753 cycles)
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/include_check Local include_check testing has passed
Details
travis-ci/licence_check Local licence_check testing has passed
Details
travis-ci/littlefs Passed, code size is 8408B (+0.00%)
Details
travis-ci/psa-autogen Local psa-autogen testing has passed
Details
travis-ci/tools-py2.7 Local tools-py2.7 testing has passed
Details
travis-ci/tools-py3.5 Local tools-py3.5 testing has passed
Details
travis-ci/tools-py3.6 Local tools-py3.6 testing has passed
Details
travis-ci/tools-py3.7 Local tools-py3.7 testing has passed
Details

@0xc0170 0xc0170 removed the ready for merge label Apr 1, 2019

lrusinowicz added a commit to lrusinowicz/mbed-os that referenced this pull request Apr 2, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.