Commit 782b9d20 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: siano: use GFP_DMA only for smssdio 



Right now, the Siano's core uses GFP_DMA for both USB and
SDIO variants of the driver. There's no reason to use it
for USB. So, pass GFP_DMA as a parameter during sms core
register.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent b2353e1d

drivers/media/common/siano/smscoreapi.c

+12 −10
Original line number Diff line number Diff line
@@ -649,6 +649,7 @@ smscore_buffer_t *smscore_createbuffer(u8 *buffer, void *common_buffer, 
 */

int smscore_register_device(struct smsdevice_params_t *params,

			    struct smscore_device_t **coredev,

			    gfp_t gfp_buf_flags,

			    void *mdev)

{

	struct smscore_device_t *dev;
@@ -661,6 +662,7 @@ int smscore_register_device(struct smsdevice_params_t *params, 
#ifdef CONFIG_MEDIA_CONTROLLER_DVB

	dev->media_dev = mdev;

#endif

	dev->gfp_buf_flags = gfp_buf_flags;



	/* init list entry so it could be safe in smscore_unregister_device */

	INIT_LIST_HEAD(&dev->entry);
@@ -697,7 +699,7 @@ int smscore_register_device(struct smsdevice_params_t *params, 
		buffer = dma_alloc_coherent(params->device,

					    dev->common_buffer_size,

					    &dev->common_buffer_phys,

					    GFP_KERNEL | GFP_DMA);

					    GFP_KERNEL | dev->gfp_buf_flags);

	if (!buffer) {

		smscore_unregister_device(dev);

		return -ENOMEM;
@@ -792,7 +794,7 @@ static int smscore_init_ir(struct smscore_device_t *coredev) 
		else {

			buffer = kmalloc(sizeof(struct sms_msg_data2) +

						SMS_DMA_ALIGNMENT,

						GFP_KERNEL | GFP_DMA);

						GFP_KERNEL | coredev->gfp_buf_flags);

			if (buffer) {

				struct sms_msg_data2 *msg =

				(struct sms_msg_data2 *)
@@ -933,7 +935,7 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev, 
	}



	/* PAGE_SIZE buffer shall be enough and dma aligned */

	msg = kmalloc(PAGE_SIZE, GFP_KERNEL | GFP_DMA);

	msg = kmalloc(PAGE_SIZE, GFP_KERNEL | coredev->gfp_buf_flags);

	if (!msg)

		return -ENOMEM;
@@ -1168,7 +1170,7 @@ static int smscore_load_firmware_from_file(struct smscore_device_t *coredev, 
	}

	pr_debug("read fw %s, buffer size=0x%zx\n", fw_filename, fw->size);

	fw_buf = kmalloc(ALIGN(fw->size + sizeof(struct sms_firmware),

			 SMS_ALLOC_ALIGNMENT), GFP_KERNEL | GFP_DMA);

			 SMS_ALLOC_ALIGNMENT), GFP_KERNEL | coredev->gfp_buf_flags);

	if (!fw_buf) {

		pr_err("failed to allocate firmware buffer\n");

		rc = -ENOMEM;
@@ -1260,7 +1262,7 @@ EXPORT_SYMBOL_GPL(smscore_unregister_device); 
static int smscore_detect_mode(struct smscore_device_t *coredev)

{

	void *buffer = kmalloc(sizeof(struct sms_msg_hdr) + SMS_DMA_ALIGNMENT,

			       GFP_KERNEL | GFP_DMA);

			       GFP_KERNEL | coredev->gfp_buf_flags);

	struct sms_msg_hdr *msg =

		(struct sms_msg_hdr *) SMS_ALIGN_ADDRESS(buffer);

	int rc;
@@ -1309,7 +1311,7 @@ static int smscore_init_device(struct smscore_device_t *coredev, int mode) 
	int rc = 0;



	buffer = kmalloc(sizeof(struct sms_msg_data) +

			SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA);

			SMS_DMA_ALIGNMENT, GFP_KERNEL | coredev->gfp_buf_flags);

	if (!buffer)

		return -ENOMEM;
@@ -1398,7 +1400,7 @@ int smscore_set_device_mode(struct smscore_device_t *coredev, int mode) 
		coredev->device_flags &= ~SMS_DEVICE_NOT_READY;



		buffer = kmalloc(sizeof(struct sms_msg_data) +

				 SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA);

				 SMS_DMA_ALIGNMENT, GFP_KERNEL | coredev->gfp_buf_flags);

		if (buffer) {

			struct sms_msg_data *msg = (struct sms_msg_data *) SMS_ALIGN_ADDRESS(buffer);
@@ -1971,7 +1973,7 @@ int smscore_gpio_configure(struct smscore_device_t *coredev, u8 pin_num, 
	total_len = sizeof(struct sms_msg_hdr) + (sizeof(u32) * 6);



	buffer = kmalloc(total_len + SMS_DMA_ALIGNMENT,

			GFP_KERNEL | GFP_DMA);

			GFP_KERNEL | coredev->gfp_buf_flags);

	if (!buffer)

		return -ENOMEM;
@@ -2043,7 +2045,7 @@ int smscore_gpio_set_level(struct smscore_device_t *coredev, u8 pin_num, 
			(3 * sizeof(u32)); /* keep it 3 ! */



	buffer = kmalloc(total_len + SMS_DMA_ALIGNMENT,

			GFP_KERNEL | GFP_DMA);

			GFP_KERNEL | coredev->gfp_buf_flags);

	if (!buffer)

		return -ENOMEM;
@@ -2091,7 +2093,7 @@ int smscore_gpio_get_level(struct smscore_device_t *coredev, u8 pin_num, 
	total_len = sizeof(struct sms_msg_hdr) + (2 * sizeof(u32));



	buffer = kmalloc(total_len + SMS_DMA_ALIGNMENT,

			GFP_KERNEL | GFP_DMA);

			GFP_KERNEL | coredev->gfp_buf_flags);

	if (!buffer)

		return -ENOMEM;

drivers/media/common/siano/smscoreapi.h

+3 −0
Original line number Diff line number Diff line
@@ -190,6 +190,8 @@ struct smscore_device_t { 


	int mode, modes_supported;



	gfp_t gfp_buf_flags;



	/* host <--> device messages */

	struct completion version_ex_done, data_download_done, trigger_done;

	struct completion data_validity_done, device_ready_done;
@@ -1125,6 +1127,7 @@ extern void smscore_unregister_hotplug(hotplug_t hotplug); 


extern int smscore_register_device(struct smsdevice_params_t *params,

				   struct smscore_device_t **coredev,

				   gfp_t gfp_buf_flags,

				   void *mdev);

extern void smscore_unregister_device(struct smscore_device_t *coredev);

drivers/media/mmc/siano/smssdio.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int smssdio_probe(struct sdio_func *func, 
		goto free;

	}



	ret = smscore_register_device(&params, &smsdev->coredev, NULL);

	ret = smscore_register_device(&params, &smsdev->coredev, GFP_DMA, NULL);

	if (ret < 0)

		goto free;

drivers/media/usb/siano/smsusb.c

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) 
	mdev = siano_media_device_register(dev, board_id);



	/* register in smscore */

	rc = smscore_register_device(&params, &dev->coredev, mdev);

	rc = smscore_register_device(&params, &dev->coredev, 0, mdev);

	if (rc < 0) {

		pr_err("smscore_register_device(...) failed, rc %d\n", rc);

		smsusb_term_device(intf);