| Message ID | 20230509201103.538-1-michal.wajdeczko@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/guc: Drop legacy CTB definitions | expand |
Michal Wajdeczko <michal.wajdeczko@intel.com> wrote on wto [2023-maj-09 22:11:03 +0200]: > We've already switched to new HXG definitions some time ago, > drop legacy CTB definitions to avoid mistakes. > > Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> > Cc: Piotr Piórkowski <piotr.piorkowski@intel.com> > Cc: John Harrison <John.C.Harrison@Intel.com> > --- > .../gt/uc/abi/guc_communication_ctb_abi.h | 21 ------------------- > drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 2 +- > 2 files changed, 1 insertion(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h b/drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h > index 28b8387f97b7..f7d70db16d76 100644 > --- a/drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h > +++ b/drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h > @@ -167,25 +167,4 @@ static_assert(sizeof(struct guc_ct_buffer_desc) == 64); > * - **flags**, holds various bits to control message handling > */ > > -/* > - * Definition of the command transport message header (DW0) > - * > - * bit[4..0] message len (in dwords) > - * bit[7..5] reserved > - * bit[8] response (G2H only) > - * bit[8] write fence to desc (H2G only) > - * bit[9] write status to H2G buff (H2G only) > - * bit[10] send status back via G2H (H2G only) > - * bit[15..11] reserved > - * bit[31..16] action code > - */ > -#define GUC_CT_MSG_LEN_SHIFT 0 > -#define GUC_CT_MSG_LEN_MASK 0x1F > -#define GUC_CT_MSG_IS_RESPONSE (1 << 8) > -#define GUC_CT_MSG_WRITE_FENCE_TO_DESC (1 << 8) > -#define GUC_CT_MSG_WRITE_STATUS_TO_BUFF (1 << 9) > -#define GUC_CT_MSG_SEND_STATUS (1 << 10) > -#define GUC_CT_MSG_ACTION_SHIFT 16 > -#define GUC_CT_MSG_ACTION_MASK 0xFFFF > - > #endif /* _ABI_GUC_COMMUNICATION_CTB_ABI_H */ > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > index 99a0a89091e7..fe355f316d37 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > @@ -640,7 +640,7 @@ static int ct_send(struct intel_guc_ct *ct, > > GEM_BUG_ON(!ct->enabled); > GEM_BUG_ON(!len); > - GEM_BUG_ON(len & ~GUC_CT_MSG_LEN_MASK); > + GEM_BUG_ON(len > GUC_CTB_HXG_MSG_MAX_LEN - GUC_CTB_HDR_LEN); > GEM_BUG_ON(!response_buf && response_buf_size); > might_sleep(); > It seems that these legacy definitions, after the update of this GEM_BUG_ON, are no longer actually needed anywhere. It is time to remove them. As for me, this patch looks fine. Reviewed-by: Piotr Piórkowski <piotr.piorkowski@intel.com> > -- > 2.25.1 > --
diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h b/drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h index 28b8387f97b7..f7d70db16d76 100644 --- a/drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h +++ b/drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h @@ -167,25 +167,4 @@ static_assert(sizeof(struct guc_ct_buffer_desc) == 64); * - **flags**, holds various bits to control message handling */ -/* - * Definition of the command transport message header (DW0) - * - * bit[4..0] message len (in dwords) - * bit[7..5] reserved - * bit[8] response (G2H only) - * bit[8] write fence to desc (H2G only) - * bit[9] write status to H2G buff (H2G only) - * bit[10] send status back via G2H (H2G only) - * bit[15..11] reserved - * bit[31..16] action code - */ -#define GUC_CT_MSG_LEN_SHIFT 0 -#define GUC_CT_MSG_LEN_MASK 0x1F -#define GUC_CT_MSG_IS_RESPONSE (1 << 8) -#define GUC_CT_MSG_WRITE_FENCE_TO_DESC (1 << 8) -#define GUC_CT_MSG_WRITE_STATUS_TO_BUFF (1 << 9) -#define GUC_CT_MSG_SEND_STATUS (1 << 10) -#define GUC_CT_MSG_ACTION_SHIFT 16 -#define GUC_CT_MSG_ACTION_MASK 0xFFFF - #endif /* _ABI_GUC_COMMUNICATION_CTB_ABI_H */ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c index 99a0a89091e7..fe355f316d37 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c @@ -640,7 +640,7 @@ static int ct_send(struct intel_guc_ct *ct, GEM_BUG_ON(!ct->enabled); GEM_BUG_ON(!len); - GEM_BUG_ON(len & ~GUC_CT_MSG_LEN_MASK); + GEM_BUG_ON(len > GUC_CTB_HXG_MSG_MAX_LEN - GUC_CTB_HDR_LEN); GEM_BUG_ON(!response_buf && response_buf_size); might_sleep();
We've already switched to new HXG definitions some time ago, drop legacy CTB definitions to avoid mistakes. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Piotr Piórkowski <piotr.piorkowski@intel.com> Cc: John Harrison <John.C.Harrison@Intel.com> --- .../gt/uc/abi/guc_communication_ctb_abi.h | 21 ------------------- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-)