From: Gilad Ben-Yossef <gilad@benyossef.com> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Ofir Drang <ofir.drang@arm.com>, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org Subject: [PATCH 06/12] staging: ccree: move request_mgr to generic bitfield ops Date: Sun, 28 May 2017 17:40:31 +0300 [thread overview] Message-ID: <1495982440-10047-7-git-send-email-gilad@benyossef.com> (raw) In-Reply-To: <1495982440-10047-1-git-send-email-gilad@benyossef.com> request_mgr was using custom bit field macros. move over to standard kernel bitfield ops. Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com> --- drivers/staging/ccree/cc_regs.h | 5 +++++ drivers/staging/ccree/ssi_request_mgr.c | 19 +++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/staging/ccree/cc_regs.h b/drivers/staging/ccree/cc_regs.h index 8b89f06..244bbae 100644 --- a/drivers/staging/ccree/cc_regs.h +++ b/drivers/staging/ccree/cc_regs.h @@ -25,6 +25,11 @@ #include "cc_bitops.h" +#define AXIM_MON_BASE_OFFSET CC_REG_OFFSET(CRY_KERNEL, AXIM_MON_COMP) +#define AXIM_MON_COMP_VALUE GENMASK(DX_AXIM_MON_COMP_VALUE_BIT_SIZE + \ + DX_AXIM_MON_COMP_VALUE_BIT_SHIFT, \ + DX_AXIM_MON_COMP_VALUE_BIT_SHIFT) + /* Register Offset macro */ #define CC_REG_OFFSET(unit_name, reg_name) \ (DX_BASE_ ## unit_name + DX_ ## reg_name ## _REG_OFFSET) diff --git a/drivers/staging/ccree/ssi_request_mgr.c b/drivers/staging/ccree/ssi_request_mgr.c index 683140a..453d731 100644 --- a/drivers/staging/ccree/ssi_request_mgr.c +++ b/drivers/staging/ccree/ssi_request_mgr.c @@ -35,8 +35,6 @@ #define SSI_MAX_POLL_ITER 10 -#define AXIM_MON_BASE_OFFSET CC_REG_OFFSET(CRY_KERNEL, AXIM_MON_COMP) - struct ssi_request_mgr_handle { /* Request manager resources */ unsigned int hw_queue_size; /* HW capability */ @@ -516,24 +514,25 @@ static void comp_handler(unsigned long devarg) CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_ICR), SSI_COMP_IRQ_MASK); /* Avoid race with above clear: Test completion counter once more */ - request_mgr_handle->axi_completed += CC_REG_FLD_GET(CRY_KERNEL, AXIM_MON_COMP, VALUE, - CC_HAL_READ_REGISTER(AXIM_MON_BASE_OFFSET)); + request_mgr_handle->axi_completed += + FIELD_GET(AXIM_MON_COMP_VALUE, + CC_HAL_READ_REGISTER(AXIM_MON_BASE_OFFSET)); while (request_mgr_handle->axi_completed) { do { proc_completions(drvdata); - /* At this point (after proc_completions()), request_mgr_handle->axi_completed is always 0. - The following assignment was changed to = (previously was +=) to conform KW restrictions. */ - request_mgr_handle->axi_completed = CC_REG_FLD_GET(CRY_KERNEL, AXIM_MON_COMP, VALUE, - CC_HAL_READ_REGISTER(AXIM_MON_BASE_OFFSET)); + request_mgr_handle->axi_completed = + FIELD_GET(AXIM_MON_COMP_VALUE, + CC_HAL_READ_REGISTER(AXIM_MON_BASE_OFFSET)); } while (request_mgr_handle->axi_completed > 0); /* To avoid the interrupt from firing as we unmask it, we clear it now */ CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_ICR), SSI_COMP_IRQ_MASK); /* Avoid race with above clear: Test completion counter once more */ - request_mgr_handle->axi_completed += CC_REG_FLD_GET(CRY_KERNEL, AXIM_MON_COMP, VALUE, - CC_HAL_READ_REGISTER(AXIM_MON_BASE_OFFSET)); + request_mgr_handle->axi_completed += + FIELD_GET(AXIM_MON_COMP_VALUE, + CC_HAL_READ_REGISTER(AXIM_MON_BASE_OFFSET)); } } -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Gilad Ben-Yossef <gilad@benyossef.com> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-crypto@vger.kernel.org, devel@driverdev.osuosl.org, driverdev-devel@linuxdriverproject.org, linux-kernel@vger.kernel.org, Ofir Drang <ofir.drang@arm.com> Subject: [PATCH 06/12] staging: ccree: move request_mgr to generic bitfield ops Date: Sun, 28 May 2017 17:40:31 +0300 [thread overview] Message-ID: <1495982440-10047-7-git-send-email-gilad@benyossef.com> (raw) In-Reply-To: <1495982440-10047-1-git-send-email-gilad@benyossef.com> request_mgr was using custom bit field macros. move over to standard kernel bitfield ops. Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com> --- drivers/staging/ccree/cc_regs.h | 5 +++++ drivers/staging/ccree/ssi_request_mgr.c | 19 +++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/staging/ccree/cc_regs.h b/drivers/staging/ccree/cc_regs.h index 8b89f06..244bbae 100644 --- a/drivers/staging/ccree/cc_regs.h +++ b/drivers/staging/ccree/cc_regs.h @@ -25,6 +25,11 @@ #include "cc_bitops.h" +#define AXIM_MON_BASE_OFFSET CC_REG_OFFSET(CRY_KERNEL, AXIM_MON_COMP) +#define AXIM_MON_COMP_VALUE GENMASK(DX_AXIM_MON_COMP_VALUE_BIT_SIZE + \ + DX_AXIM_MON_COMP_VALUE_BIT_SHIFT, \ + DX_AXIM_MON_COMP_VALUE_BIT_SHIFT) + /* Register Offset macro */ #define CC_REG_OFFSET(unit_name, reg_name) \ (DX_BASE_ ## unit_name + DX_ ## reg_name ## _REG_OFFSET) diff --git a/drivers/staging/ccree/ssi_request_mgr.c b/drivers/staging/ccree/ssi_request_mgr.c index 683140a..453d731 100644 --- a/drivers/staging/ccree/ssi_request_mgr.c +++ b/drivers/staging/ccree/ssi_request_mgr.c @@ -35,8 +35,6 @@ #define SSI_MAX_POLL_ITER 10 -#define AXIM_MON_BASE_OFFSET CC_REG_OFFSET(CRY_KERNEL, AXIM_MON_COMP) - struct ssi_request_mgr_handle { /* Request manager resources */ unsigned int hw_queue_size; /* HW capability */ @@ -516,24 +514,25 @@ static void comp_handler(unsigned long devarg) CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_ICR), SSI_COMP_IRQ_MASK); /* Avoid race with above clear: Test completion counter once more */ - request_mgr_handle->axi_completed += CC_REG_FLD_GET(CRY_KERNEL, AXIM_MON_COMP, VALUE, - CC_HAL_READ_REGISTER(AXIM_MON_BASE_OFFSET)); + request_mgr_handle->axi_completed += + FIELD_GET(AXIM_MON_COMP_VALUE, + CC_HAL_READ_REGISTER(AXIM_MON_BASE_OFFSET)); while (request_mgr_handle->axi_completed) { do { proc_completions(drvdata); - /* At this point (after proc_completions()), request_mgr_handle->axi_completed is always 0. - The following assignment was changed to = (previously was +=) to conform KW restrictions. */ - request_mgr_handle->axi_completed = CC_REG_FLD_GET(CRY_KERNEL, AXIM_MON_COMP, VALUE, - CC_HAL_READ_REGISTER(AXIM_MON_BASE_OFFSET)); + request_mgr_handle->axi_completed = + FIELD_GET(AXIM_MON_COMP_VALUE, + CC_HAL_READ_REGISTER(AXIM_MON_BASE_OFFSET)); } while (request_mgr_handle->axi_completed > 0); /* To avoid the interrupt from firing as we unmask it, we clear it now */ CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_ICR), SSI_COMP_IRQ_MASK); /* Avoid race with above clear: Test completion counter once more */ - request_mgr_handle->axi_completed += CC_REG_FLD_GET(CRY_KERNEL, AXIM_MON_COMP, VALUE, - CC_HAL_READ_REGISTER(AXIM_MON_BASE_OFFSET)); + request_mgr_handle->axi_completed += + FIELD_GET(AXIM_MON_COMP_VALUE, + CC_HAL_READ_REGISTER(AXIM_MON_BASE_OFFSET)); } } -- 2.1.4 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
next prev parent reply other threads:[~2017-05-28 14:40 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-05-28 14:40 [PATCH 00/12] staging: ccree: addtional driver cleanups Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef 2017-05-28 14:40 ` [PATCH 01/12] staging: ccree: correct coding style violations Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef 2017-05-29 14:37 ` Greg Kroah-Hartman 2017-05-29 14:37 ` Greg Kroah-Hartman 2017-05-29 14:37 ` Greg Kroah-Hartman 2017-05-29 16:57 ` Joe Perches 2017-05-29 17:11 ` Gilad Ben-Yossef 2017-05-29 17:11 ` Gilad Ben-Yossef 2017-05-29 17:36 ` Joe Perches 2017-05-29 17:36 ` Joe Perches 2017-05-29 17:51 ` Gilad Ben-Yossef 2017-05-29 17:51 ` Gilad Ben-Yossef 2017-05-28 14:40 ` [PATCH 02/12] staging: ccree: move to kernel bitfields/bitops Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef 2017-05-29 14:38 ` Greg Kroah-Hartman 2017-05-29 14:38 ` Greg Kroah-Hartman 2017-05-29 14:38 ` Greg Kroah-Hartman 2017-05-29 17:23 ` Gilad Ben-Yossef 2017-05-28 14:40 ` [PATCH 03/12] staging: ccree: remove 48 bit dma addr sim Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef 2017-05-28 14:40 ` [PATCH 04/12] staging: ccree: cleanup lli access macro Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef 2017-05-29 14:41 ` Greg Kroah-Hartman 2017-05-29 14:41 ` Greg Kroah-Hartman 2017-05-29 14:41 ` Greg Kroah-Hartman 2017-05-29 17:32 ` Gilad Ben-Yossef 2017-05-29 17:32 ` Gilad Ben-Yossef 2017-05-28 14:40 ` [PATCH 05/12] staging: ccree: remove cycle count debug support Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef [this message] 2017-05-28 14:40 ` [PATCH 06/12] staging: ccree: move request_mgr to generic bitfield ops Gilad Ben-Yossef 2017-05-28 14:40 ` [PATCH 07/12] staging: ccree remove custom bitfield macros Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef 2017-05-28 14:40 ` [PATCH 08/12] staging: ccree: remove unused struct Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef 2017-05-28 14:40 ` [PATCH 09/12] staging: ccree: use snake_case for hash enums Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef 2017-05-28 14:40 ` [PATCH 10/12] staging: ccree: drop no longer used macro Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef 2017-05-28 14:40 ` [PATCH 11/12] staging: ccree: remove dead code Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef 2017-05-28 14:40 ` [PATCH 12/12] staging: ccree: whitespace fixes Gilad Ben-Yossef 2017-05-28 14:40 ` Gilad Ben-Yossef
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1495982440-10047-7-git-send-email-gilad@benyossef.com \ --to=gilad@benyossef.com \ --cc=devel@driverdev.osuosl.org \ --cc=driverdev-devel@linuxdriverproject.org \ --cc=gregkh@linuxfoundation.org \ --cc=linux-crypto@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=ofir.drang@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.