Message ID | 20231030062226.1895692-1-avri.altman@wdc.com |
---|---|
State | New |
Headers | show |
Series | mmc: core: Remove packed command leftovers | expand |
On Mon, 30 Oct 2023 at 07:22, Avri Altman <avri.altman@wdc.com> wrote: > > Packed commands support was removed long time ago, but some bits got > left behind. Remove them. > > Fixes: 03d640ae1f9b (mmc: block: delete packed command support) > Signed-off-by: Avri Altman <avri.altman@wdc.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/core/mmc.c | 5 ----- > include/linux/mmc/card.h | 3 --- > include/linux/mmc/core.h | 1 - > include/linux/mmc/mmc.h | 10 ---------- > 4 files changed, 19 deletions(-) > > diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c > index 8180983bd402..5e577aa31bf2 100644 > --- a/drivers/mmc/core/mmc.c > +++ b/drivers/mmc/core/mmc.c > @@ -613,11 +613,6 @@ static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd) > } else { > card->ext_csd.data_tag_unit_size = 0; > } > - > - card->ext_csd.max_packed_writes = > - ext_csd[EXT_CSD_MAX_PACKED_WRITES]; > - card->ext_csd.max_packed_reads = > - ext_csd[EXT_CSD_MAX_PACKED_READS]; > } else { > card->ext_csd.data_sector_size = 512; > } > diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h > index daa2f40d9ce6..24aaa819f9f0 100644 > --- a/include/linux/mmc/card.h > +++ b/include/linux/mmc/card.h > @@ -52,9 +52,6 @@ struct mmc_ext_csd { > u8 part_config; > u8 cache_ctrl; > u8 rst_n_function; > - u8 max_packed_writes; > - u8 max_packed_reads; > - u8 packed_event_en; > unsigned int part_time; /* Units: ms */ > unsigned int sa_timeout; /* Units: 100ns */ > unsigned int generic_cmd6_time; /* Units: 10ms */ > diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h > index 6efec0b9820c..2c7928a50907 100644 > --- a/include/linux/mmc/core.h > +++ b/include/linux/mmc/core.h > @@ -27,7 +27,6 @@ struct mmc_command { > u32 opcode; > u32 arg; > #define MMC_CMD23_ARG_REL_WR (1 << 31) > -#define MMC_CMD23_ARG_PACKED ((0 << 31) | (1 << 30)) > #define MMC_CMD23_ARG_TAG_REQ (1 << 29) > u32 resp[4]; > unsigned int flags; /* expected response type */ > diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h > index 6f7993803ee7..cf2bcb5da30d 100644 > --- a/include/linux/mmc/mmc.h > +++ b/include/linux/mmc/mmc.h > @@ -257,8 +257,6 @@ static inline bool mmc_ready_for_data(u32 status) > #define EXT_CSD_FLUSH_CACHE 32 /* W */ > #define EXT_CSD_CACHE_CTRL 33 /* R/W */ > #define EXT_CSD_POWER_OFF_NOTIFICATION 34 /* R/W */ > -#define EXT_CSD_PACKED_FAILURE_INDEX 35 /* RO */ > -#define EXT_CSD_PACKED_CMD_STATUS 36 /* RO */ > #define EXT_CSD_EXP_EVENTS_STATUS 54 /* RO, 2 bytes */ > #define EXT_CSD_EXP_EVENTS_CTRL 56 /* R/W, 2 bytes */ > #define EXT_CSD_DATA_SECTOR_SIZE 61 /* R */ > @@ -321,8 +319,6 @@ static inline bool mmc_ready_for_data(u32 status) > #define EXT_CSD_SUPPORTED_MODE 493 /* RO */ > #define EXT_CSD_TAG_UNIT_SIZE 498 /* RO */ > #define EXT_CSD_DATA_TAG_SUPPORT 499 /* RO */ > -#define EXT_CSD_MAX_PACKED_WRITES 500 /* RO */ > -#define EXT_CSD_MAX_PACKED_READS 501 /* RO */ > #define EXT_CSD_BKOPS_SUPPORT 502 /* RO */ > #define EXT_CSD_HPI_FEATURES 503 /* RO */ > > @@ -402,18 +398,12 @@ static inline bool mmc_ready_for_data(u32 status) > #define EXT_CSD_PWR_CL_8BIT_SHIFT 4 > #define EXT_CSD_PWR_CL_4BIT_SHIFT 0 > > -#define EXT_CSD_PACKED_EVENT_EN BIT(3) > - > /* > * EXCEPTION_EVENT_STATUS field > */ > #define EXT_CSD_URGENT_BKOPS BIT(0) > #define EXT_CSD_DYNCAP_NEEDED BIT(1) > #define EXT_CSD_SYSPOOL_EXHAUSTED BIT(2) > -#define EXT_CSD_PACKED_FAILURE BIT(3) > - > -#define EXT_CSD_PACKED_GENERIC_ERROR BIT(0) > -#define EXT_CSD_PACKED_INDEXED_ERROR BIT(1) > > /* > * BKOPS status level > -- > 2.42.0 >
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 8180983bd402..5e577aa31bf2 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -613,11 +613,6 @@ static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd) } else { card->ext_csd.data_tag_unit_size = 0; } - - card->ext_csd.max_packed_writes = - ext_csd[EXT_CSD_MAX_PACKED_WRITES]; - card->ext_csd.max_packed_reads = - ext_csd[EXT_CSD_MAX_PACKED_READS]; } else { card->ext_csd.data_sector_size = 512; } diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index daa2f40d9ce6..24aaa819f9f0 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -52,9 +52,6 @@ struct mmc_ext_csd { u8 part_config; u8 cache_ctrl; u8 rst_n_function; - u8 max_packed_writes; - u8 max_packed_reads; - u8 packed_event_en; unsigned int part_time; /* Units: ms */ unsigned int sa_timeout; /* Units: 100ns */ unsigned int generic_cmd6_time; /* Units: 10ms */ diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h index 6efec0b9820c..2c7928a50907 100644 --- a/include/linux/mmc/core.h +++ b/include/linux/mmc/core.h @@ -27,7 +27,6 @@ struct mmc_command { u32 opcode; u32 arg; #define MMC_CMD23_ARG_REL_WR (1 << 31) -#define MMC_CMD23_ARG_PACKED ((0 << 31) | (1 << 30)) #define MMC_CMD23_ARG_TAG_REQ (1 << 29) u32 resp[4]; unsigned int flags; /* expected response type */ diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index 6f7993803ee7..cf2bcb5da30d 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h @@ -257,8 +257,6 @@ static inline bool mmc_ready_for_data(u32 status) #define EXT_CSD_FLUSH_CACHE 32 /* W */ #define EXT_CSD_CACHE_CTRL 33 /* R/W */ #define EXT_CSD_POWER_OFF_NOTIFICATION 34 /* R/W */ -#define EXT_CSD_PACKED_FAILURE_INDEX 35 /* RO */ -#define EXT_CSD_PACKED_CMD_STATUS 36 /* RO */ #define EXT_CSD_EXP_EVENTS_STATUS 54 /* RO, 2 bytes */ #define EXT_CSD_EXP_EVENTS_CTRL 56 /* R/W, 2 bytes */ #define EXT_CSD_DATA_SECTOR_SIZE 61 /* R */ @@ -321,8 +319,6 @@ static inline bool mmc_ready_for_data(u32 status) #define EXT_CSD_SUPPORTED_MODE 493 /* RO */ #define EXT_CSD_TAG_UNIT_SIZE 498 /* RO */ #define EXT_CSD_DATA_TAG_SUPPORT 499 /* RO */ -#define EXT_CSD_MAX_PACKED_WRITES 500 /* RO */ -#define EXT_CSD_MAX_PACKED_READS 501 /* RO */ #define EXT_CSD_BKOPS_SUPPORT 502 /* RO */ #define EXT_CSD_HPI_FEATURES 503 /* RO */ @@ -402,18 +398,12 @@ static inline bool mmc_ready_for_data(u32 status) #define EXT_CSD_PWR_CL_8BIT_SHIFT 4 #define EXT_CSD_PWR_CL_4BIT_SHIFT 0 -#define EXT_CSD_PACKED_EVENT_EN BIT(3) - /* * EXCEPTION_EVENT_STATUS field */ #define EXT_CSD_URGENT_BKOPS BIT(0) #define EXT_CSD_DYNCAP_NEEDED BIT(1) #define EXT_CSD_SYSPOOL_EXHAUSTED BIT(2) -#define EXT_CSD_PACKED_FAILURE BIT(3) - -#define EXT_CSD_PACKED_GENERIC_ERROR BIT(0) -#define EXT_CSD_PACKED_INDEXED_ERROR BIT(1) /* * BKOPS status level
Packed commands support was removed long time ago, but some bits got left behind. Remove them. Fixes: 03d640ae1f9b (mmc: block: delete packed command support) Signed-off-by: Avri Altman <avri.altman@wdc.com> --- drivers/mmc/core/mmc.c | 5 ----- include/linux/mmc/card.h | 3 --- include/linux/mmc/core.h | 1 - include/linux/mmc/mmc.h | 10 ---------- 4 files changed, 19 deletions(-)