Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ddb2526 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'soc-fsl-next-v5.4' of... 

Merge tag 'soc-fsl-next-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/drivers

NXP/FSL SoC driver updates for v5.4

DPAA2 DPIO/MC driver
- Remove explicit device_link_remove() and device_link_del() calls due to
framework change

DPAA QBman driver
- Various changes to make it working with kexec
- Remove dev_err() usage after platform_get_irq()

GUTS driver
- Add LS1028 SoC support

* tag 'soc-fsl-next-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux:
  bus: fsl-mc: remove explicit device_link_del
  soc: fsl: dpio: remove explicit device_link_remove
  soc: fsl: guts: Add definition for LS1028A
  soc/fsl/qbman: Update device tree with reserved memory
  soc/fsl/qbman: Fixup qman_shutdown_fq()
  soc/fsl/qbman: Disable interrupts during portal recovery
  soc/fsl/qbman: Fix drain_mr_fqni()
  soc/fsl/qbman: Cleanup QMan queues if device was already initialized
  soc/fsl/qbman: Cleanup buffer pools if BMan was initialized prior to bootup
  soc/fsl/qbman: Rework QBMan private memory setup
  soc: fsl: qbman: Remove dev_err() usage after platform_get_irq()

Link: https://lore.kernel.org/r/20190816195301.26660-1-leoyang.li@nxp.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 32879061 eadf0b17

drivers/bus/fsl-mc/fsl-mc-allocator.c

+0 −1
Original line number Diff line number Diff line
@@ -330,7 +330,6 @@ void fsl_mc_object_free(struct fsl_mc_device *mc_adev) 


	fsl_mc_resource_free(resource);



	device_link_del(mc_adev->consumer_link);

	mc_adev->consumer_link = NULL;

}

EXPORT_SYMBOL_GPL(fsl_mc_object_free);

drivers/bus/fsl-mc/mc-io.c

+0 −1
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ void fsl_mc_portal_free(struct fsl_mc_io *mc_io) 
	fsl_destroy_mc_io(mc_io);

	fsl_mc_resource_free(resource);



	device_link_del(dpmcp_dev->consumer_link);

	dpmcp_dev->consumer_link = NULL;

}

EXPORT_SYMBOL_GPL(fsl_mc_portal_free);

drivers/soc/fsl/dpio/dpio-service.c

+0 −2
Original line number Diff line number Diff line
@@ -305,8 +305,6 @@ void dpaa2_io_service_deregister(struct dpaa2_io *service, 
	list_del(&ctx->node);

	spin_unlock_irqrestore(&d->lock_notifications, irqflags);



	if (dev)

		device_link_remove(dev, d->dev);

}

EXPORT_SYMBOL_GPL(dpaa2_io_service_deregister);

drivers/soc/fsl/guts.c

+6 −0
Original line number Diff line number Diff line
@@ -102,6 +102,11 @@ static const struct fsl_soc_die_attr fsl_soc_die[] = { 
	  .svr          = 0x87360000,

	  .mask         = 0xff3f0000,

	},

	/* Die: LS1028A, SoC: LS1028A */

	{ .die          = "LS1028A",

	  .svr          = 0x870b0000,

	  .mask         = 0xff3f0000,

	},

	{ },

};
@@ -224,6 +229,7 @@ static const struct of_device_id fsl_guts_of_match[] = { 
	{ .compatible = "fsl,ls1012a-dcfg", },

	{ .compatible = "fsl,ls1046a-dcfg", },

	{ .compatible = "fsl,lx2160a-dcfg", },

	{ .compatible = "fsl,ls1028a-dcfg", },

	{}

};

MODULE_DEVICE_TABLE(of, fsl_guts_of_match);

drivers/soc/fsl/qbman/bman.c

+9 −8
Original line number Diff line number Diff line
@@ -635,30 +635,31 @@ int bman_p_irqsource_add(struct bman_portal *p, u32 bits) 
	return 0;

}



static int bm_shutdown_pool(u32 bpid)

int bm_shutdown_pool(u32 bpid)

{

	int err = 0;

	struct bm_mc_command *bm_cmd;

	union bm_mc_result *bm_res;



	while (1) {



	struct bman_portal *p = get_affine_portal();

	while (1) {

		/* Acquire buffers until empty */

		bm_cmd = bm_mc_start(&p->p);

		bm_cmd->bpid = bpid;

		bm_mc_commit(&p->p, BM_MCC_VERB_CMD_ACQUIRE | 1);

		if (!bm_mc_result_timeout(&p->p, &bm_res)) {

			put_affine_portal();

			pr_crit("BMan Acquire Command timedout\n");

			return -ETIMEDOUT;

			err = -ETIMEDOUT;

			goto done;

		}

		if (!(bm_res->verb & BM_MCR_VERB_ACQUIRE_BUFCOUNT)) {

			put_affine_portal();

			/* Pool is empty */

			return 0;

			goto done;

		}

		put_affine_portal();

	}



done:

	put_affine_portal();

	return 0;

}