X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fpart.h;h=807370d9429b2530caa73b213f5b3cdd1b8ed14c;hb=c56289ddafce3d1ec442fb18064f136c2c47d0bb;hp=419c85970886041bf5b5b31947c69cec627ce2a0;hpb=4dda435131251a94b29afd52f010cf1ec5a7ceb2;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/part.h b/include/part.h index 419c859..807370d 100644 --- a/include/part.h +++ b/include/part.h @@ -10,6 +10,7 @@ #include #include #include +#include #include struct block_drvr { @@ -50,7 +51,7 @@ struct block_drvr { #define PART_NAME_LEN 32 #define PART_TYPE_LEN 32 -#define MAX_SEARCH_PARTITIONS 64 +#define MAX_SEARCH_PARTITIONS 128 #define PART_BOOTABLE ((int)BIT(0)) #define PART_EFI_SYSTEM_PARTITION ((int)BIT(1)) @@ -75,7 +76,7 @@ struct disk_partition { char type_guid[UUID_STR_LEN + 1]; /* type GUID as string, if exists */ #endif #ifdef CONFIG_DOS_PARTITION - uchar sys_ind; /* partition type */ + uchar sys_ind; /* partition type */ #endif }; @@ -86,7 +87,7 @@ struct disk_part { }; /* Misc _get_dev functions */ -#ifdef CONFIG_PARTITIONS +#if CONFIG_IS_ENABLED(PARTITIONS) /** * blk_get_dev() - get a pointer to a block device given its type and number * @@ -97,13 +98,12 @@ struct disk_part { * @ifname: Interface name (e.g. "ide", "scsi") * @dev: Device number (0 for first device on that interface, 1 for * second, etc. - * @return pointer to the block device, or NULL if not available, or an + * Return: pointer to the block device, or NULL if not available, or an * error occurred. */ struct blk_desc *blk_get_dev(const char *ifname, int dev); struct blk_desc *mg_disk_get_dev(int dev); -int host_get_dev_err(int dev, struct blk_desc **blk_devp); /* disk/part.c */ int part_get_info(struct blk_desc *dev_desc, int part, @@ -142,7 +142,7 @@ void dev_print(struct blk_desc *dev_desc); * and hardware partition number (e.g. "2.4") for devices that * support it (currently only MMC). * @dev_desc: Returns a pointer to the block device on success - * @return block device number (local to the interface), or -1 on error + * Return: block device number (local to the interface), or -1 on error */ int blk_get_device_by_str(const char *ifname, const char *dev_str, struct blk_desc **dev_desc); @@ -177,7 +177,7 @@ int blk_get_device_by_str(const char *ifname, const char *dev_str, * @allow_whole_dev: true to allow the user to select partition 0 * (which means the whole device), false to require a valid * partition number >= 1 - * @return partition number, or -1 on error + * Return: partition number, or -1 on error * */ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, @@ -193,7 +193,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, * @param info - returns the disk partition info * @param part_type - only search in partitions of this type * - * @return - the partition number on match (starting on 1), -1 on no match, + * Return: - the partition number on match (starting on 1), -1 on no match, * otherwise error */ int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name, @@ -207,7 +207,7 @@ int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name, * @param gpt_name - the specified table entry name * @param info - returns the disk partition info * - * @return - the partition number on match (starting on 1), -1 on no match, + * Return: - the partition number on match (starting on 1), -1 on no match, * otherwise error */ int part_get_info_by_name(struct blk_desc *dev_desc, @@ -230,7 +230,7 @@ int part_get_info_by_name(struct blk_desc *dev_desc, * @param[in] allow_whole_dev true to allow the user to select partition 0 * (which means the whole device), false to require a valid * partition number >= 1 - * @return the partition number on success, or negative errno on error + * Return: the partition number on success, or negative errno on error */ int part_get_info_by_dev_and_name_or_num(const char *dev_iface, const char *dev_part_str, @@ -275,6 +275,22 @@ static inline int blk_get_device_part_str(const char *ifname, struct disk_partition *info, int allow_whole_dev) { *dev_desc = NULL; return -1; } + +static inline int part_get_info_by_name_type(struct blk_desc *dev_desc, + const char *name, + struct disk_partition *info, + int part_type) +{ + return -ENOENT; +} + +static inline int part_get_info_by_name(struct blk_desc *dev_desc, + const char *name, + struct disk_partition *info) +{ + return -ENOENT; +} + static inline int part_get_info_by_dev_and_name_or_num(const char *dev_iface, const char *dev_part_str, @@ -287,6 +303,53 @@ part_get_info_by_dev_and_name_or_num(const char *dev_iface, } #endif +struct udevice; +/** + * part_create_block_devices - Create block devices for disk partitions + * + * Create UCLASS_PARTITION udevices for each of disk partitions in @parent + * + * @blk_dev: Whole disk device + */ +int part_create_block_devices(struct udevice *blk_dev); + +/** + * disk_blk_read() - read blocks from a disk partition + * + * @dev: Device to read from (UCLASS_PARTITION) + * @start: Start block number to read in the partition (0=first) + * @blkcnt: Number of blocks to read + * @buffer: Destination buffer for data read + * Returns: number of blocks read, or -ve error number (see the + * IS_ERR_VALUE() macro + */ +ulong disk_blk_read(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, + void *buffer); + +/** + * disk_blk_write() - write to a disk partition + * + * @dev: Device to write to (UCLASS_PARTITION) + * @start: Start block number to write in the partition (0=first) + * @blkcnt: Number of blocks to write + * @buffer: Source buffer for data to write + * Returns: number of blocks written, or -ve error number (see the + * IS_ERR_VALUE() macro + */ +ulong disk_blk_write(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, + const void *buffer); + +/** + * disk_blk_erase() - erase a section of a disk partition + * + * @dev: Device to (partially) erase (UCLASS_PARTITION) + * @start: Start block number to erase in the partition (0=first) + * @blkcnt: Number of blocks to erase + * Returns: number of blocks erased, or -ve error number (see the + * IS_ERR_VALUE() macro + */ +ulong disk_blk_erase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt); + /* * We don't support printing partition information in SPL and only support * getting partition information in a few cases. @@ -352,7 +415,7 @@ struct part_driver { * @param gpt_h - pointer to GPT header representation * @param gpt_e - pointer to GPT partition table entries * - * @return - zero on success, otherwise error + * Return: - zero on success, otherwise error */ int write_gpt_table(struct blk_desc *dev_desc, gpt_header *gpt_h, gpt_entry *gpt_e); @@ -366,7 +429,7 @@ int write_gpt_table(struct blk_desc *dev_desc, * @param partitions - list of partitions * @param parts - number of partitions * - * @return zero on success + * Return: zero on success */ int gpt_fill_pte(struct blk_desc *dev_desc, gpt_header *gpt_h, gpt_entry *gpt_e, @@ -380,7 +443,7 @@ int gpt_fill_pte(struct blk_desc *dev_desc, * @param str_guid - disk guid string representation * @param parts_count - number of partitions * - * @return - error on str_guid conversion error + * Return: - error on str_guid conversion error */ int gpt_fill_header(struct blk_desc *dev_desc, gpt_header *gpt_h, char *str_guid, int parts_count); @@ -393,7 +456,7 @@ int gpt_fill_header(struct blk_desc *dev_desc, gpt_header *gpt_h, * @param partitions - list of partitions * @param parts - number of partitions * - * @return zero on success + * Return: zero on success */ int gpt_restore(struct blk_desc *dev_desc, char *str_disk_guid, struct disk_partition *partitions, const int parts_count); @@ -404,7 +467,7 @@ int gpt_restore(struct blk_desc *dev_desc, char *str_disk_guid, * @param dev_desc - block device descriptor * @param buf - buffer which contains the MBR and Primary GPT info * - * @return - '0' on success, otherwise error + * Return: - '0' on success, otherwise error */ int is_valid_gpt_buf(struct blk_desc *dev_desc, void *buf); @@ -414,7 +477,7 @@ int is_valid_gpt_buf(struct blk_desc *dev_desc, void *buf); * @param dev_desc - block device descriptor * @param buf - buffer which contains the MBR and Primary GPT info * - * @return - '0' on success, otherwise error + * Return: - '0' on success, otherwise error */ int write_mbr_and_gpt_partitions(struct blk_desc *dev_desc, void *buf); @@ -428,12 +491,22 @@ int write_mbr_and_gpt_partitions(struct blk_desc *dev_desc, void *buf); * @param gpt_head - pointer to GPT header data read from medium * @param gpt_pte - pointer to GPT partition table enties read from medium * - * @return - '0' on success, otherwise error + * Return: - '0' on success, otherwise error */ int gpt_verify_headers(struct blk_desc *dev_desc, gpt_header *gpt_head, gpt_entry **gpt_pte); /** + * gpt_repair_headers() - Function to repair the GPT's header + * and partition table entries (PTE) + * + * @param dev_desc - block device descriptor + * + * Return: - '0' on success, otherwise error + */ +int gpt_repair_headers(struct blk_desc *dev_desc); + +/** * gpt_verify_partitions() - Function to check if partitions' name, start and * size correspond to '$partitions' env variable * @@ -447,7 +520,7 @@ int gpt_verify_headers(struct blk_desc *dev_desc, gpt_header *gpt_head, * @param gpt_head - pointer to GPT header data read from medium * @param gpt_pte - pointer to GPT partition table enties read from medium * - * @return - '0' on success, otherwise error + * Return: - '0' on success, otherwise error */ int gpt_verify_partitions(struct blk_desc *dev_desc, struct disk_partition *partitions, int parts, @@ -463,7 +536,7 @@ int gpt_verify_partitions(struct blk_desc *dev_desc, * @param dev_desc - block device descriptor * @param guid - pre-allocated string in which to return the GUID * - * @return - '0' on success, otherwise error + * Return: - '0' on success, otherwise error */ int get_disk_guid(struct blk_desc *dev_desc, char *guid); @@ -475,7 +548,7 @@ int get_disk_guid(struct blk_desc *dev_desc, char *guid); * * @param buf - buffer which contains the MBR * - * @return - '0' on success, otherwise error + * Return: - '0' on success, otherwise error */ int is_valid_dos_buf(void *buf); @@ -485,7 +558,7 @@ int is_valid_dos_buf(void *buf); * @param dev_desc - block device descriptor * @param buf - buffer which contains the MBR * - * @return - '0' on success, otherwise error + * Return: - '0' on success, otherwise error */ int write_mbr_sector(struct blk_desc *dev_desc, void *buf); @@ -496,11 +569,11 @@ int layout_mbr_partitions(struct disk_partition *p, int count, #endif -#ifdef CONFIG_PARTITIONS +#if CONFIG_IS_ENABLED(PARTITIONS) /** * part_driver_get_count() - get partition driver count * - * @return - number of partition drivers + * Return: - number of partition drivers */ static inline int part_driver_get_count(void) { @@ -510,7 +583,7 @@ static inline int part_driver_get_count(void) /** * part_driver_get_first() - get first partition driver * - * @return - pointer to first partition driver on success, otherwise NULL + * Return: - pointer to first partition driver on success, otherwise NULL */ static inline struct part_driver *part_driver_get_first(void) {