Skip to content

Commit 37c8ceb

Browse files
avri-altman-sndkstorulf
authored andcommitted
mmc: core: Remove packed command leftovers
Packed commands support was removed long time ago, but some bits got left behind. Remove them. Signed-off-by: Avri Altman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]>
1 parent 33cc938 commit 37c8ceb

File tree

4 files changed

+0
-19
lines changed

4 files changed

+0
-19
lines changed

drivers/mmc/core/mmc.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -613,11 +613,6 @@ static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd)
613613
} else {
614614
card->ext_csd.data_tag_unit_size = 0;
615615
}
616-
617-
card->ext_csd.max_packed_writes =
618-
ext_csd[EXT_CSD_MAX_PACKED_WRITES];
619-
card->ext_csd.max_packed_reads =
620-
ext_csd[EXT_CSD_MAX_PACKED_READS];
621616
} else {
622617
card->ext_csd.data_sector_size = 512;
623618
}

include/linux/mmc/card.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ struct mmc_ext_csd {
5252
u8 part_config;
5353
u8 cache_ctrl;
5454
u8 rst_n_function;
55-
u8 max_packed_writes;
56-
u8 max_packed_reads;
57-
u8 packed_event_en;
5855
unsigned int part_time; /* Units: ms */
5956
unsigned int sa_timeout; /* Units: 100ns */
6057
unsigned int generic_cmd6_time; /* Units: 10ms */

include/linux/mmc/core.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ struct mmc_command {
2727
u32 opcode;
2828
u32 arg;
2929
#define MMC_CMD23_ARG_REL_WR (1 << 31)
30-
#define MMC_CMD23_ARG_PACKED ((0 << 31) | (1 << 30))
3130
#define MMC_CMD23_ARG_TAG_REQ (1 << 29)
3231
u32 resp[4];
3332
unsigned int flags; /* expected response type */

include/linux/mmc/mmc.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,6 @@ static inline bool mmc_ready_for_data(u32 status)
257257
#define EXT_CSD_FLUSH_CACHE 32 /* W */
258258
#define EXT_CSD_CACHE_CTRL 33 /* R/W */
259259
#define EXT_CSD_POWER_OFF_NOTIFICATION 34 /* R/W */
260-
#define EXT_CSD_PACKED_FAILURE_INDEX 35 /* RO */
261-
#define EXT_CSD_PACKED_CMD_STATUS 36 /* RO */
262260
#define EXT_CSD_EXP_EVENTS_STATUS 54 /* RO, 2 bytes */
263261
#define EXT_CSD_EXP_EVENTS_CTRL 56 /* R/W, 2 bytes */
264262
#define EXT_CSD_DATA_SECTOR_SIZE 61 /* R */
@@ -321,8 +319,6 @@ static inline bool mmc_ready_for_data(u32 status)
321319
#define EXT_CSD_SUPPORTED_MODE 493 /* RO */
322320
#define EXT_CSD_TAG_UNIT_SIZE 498 /* RO */
323321
#define EXT_CSD_DATA_TAG_SUPPORT 499 /* RO */
324-
#define EXT_CSD_MAX_PACKED_WRITES 500 /* RO */
325-
#define EXT_CSD_MAX_PACKED_READS 501 /* RO */
326322
#define EXT_CSD_BKOPS_SUPPORT 502 /* RO */
327323
#define EXT_CSD_HPI_FEATURES 503 /* RO */
328324

@@ -402,18 +398,12 @@ static inline bool mmc_ready_for_data(u32 status)
402398
#define EXT_CSD_PWR_CL_8BIT_SHIFT 4
403399
#define EXT_CSD_PWR_CL_4BIT_SHIFT 0
404400

405-
#define EXT_CSD_PACKED_EVENT_EN BIT(3)
406-
407401
/*
408402
* EXCEPTION_EVENT_STATUS field
409403
*/
410404
#define EXT_CSD_URGENT_BKOPS BIT(0)
411405
#define EXT_CSD_DYNCAP_NEEDED BIT(1)
412406
#define EXT_CSD_SYSPOOL_EXHAUSTED BIT(2)
413-
#define EXT_CSD_PACKED_FAILURE BIT(3)
414-
415-
#define EXT_CSD_PACKED_GENERIC_ERROR BIT(0)
416-
#define EXT_CSD_PACKED_INDEXED_ERROR BIT(1)
417407

418408
/*
419409
* BKOPS status level

0 commit comments

Comments
 (0)