svn commit: r354206 - head/sys/arm/allwinner

[Emmanuel Vadot]

On Wed, 30 Oct 2019 20:43:27 +0000 (UTC)
Ilya Bakulin <kibab at FreeBSD.org> wrote:

> Author: kibab
> Date: Wed Oct 30 20:43:27 2019
> New Revision: 354206
> URL: https://svnweb.freebsd.org/changeset/base/354206
> 
> Log:
>   Use the new cam_sim_alloc_dev function to properly initialize SIM
>   
>   Using cam_sim_alloc_dev() allows to properly set sim_dev field so that
>   sdiob(4) can attach to the CAM device that represents SDIO card.
>   The same change for SDHCI driver happened in r348800.
>   
>   Approved by:		imp (mentor)
>   Differential Revision:	https://reviews.freebsd.org/D22192
> 
> Modified:
>   head/sys/arm/allwinner/aw_mmc.c
> 
> Modified: head/sys/arm/allwinner/aw_mmc.c
> ==============================================================================
> --- head/sys/arm/allwinner/aw_mmc.c	Wed Oct 30 20:08:10 2019	(r354205)
> +++ head/sys/arm/allwinner/aw_mmc.c	Wed Oct 30 20:43:27 2019	(r354206)
> @@ -526,8 +526,8 @@ aw_mmc_attach(device_t dev)
>  	}
>  
>  	mtx_init(&sc->sim_mtx, "awmmcsim", NULL, MTX_DEF);
> -	sc->sim = cam_sim_alloc(aw_mmc_cam_action, aw_mmc_cam_poll,
> -	    "aw_mmc_sim", sc, device_get_unit(dev),
> +	sc->sim = cam_sim_alloc_dev(aw_mmc_cam_action, aw_mmc_cam_poll,
> +	    "aw_mmc_sim", sc, dev,
>  	    &sc->sim_mtx, 1, 1, sc->devq);
>  
>  	if (sc->sim == NULL) {
> @@ -1514,6 +1514,7 @@ static device_method_t aw_mmc_methods[] = {
>  	/* Bus interface */
>  	DEVMETHOD(bus_read_ivar,	aw_mmc_read_ivar),
>  	DEVMETHOD(bus_write_ivar,	aw_mmc_write_ivar),
> +	DEVMETHOD(bus_add_child,        bus_generic_add_child),

 Why is this change needed ?

>  
>  	/* MMC bridge interface */
>  	DEVMETHOD(mmcbr_update_ios,	aw_mmc_update_ios),


-- 
Emmanuel Vadot <manu at bidouilliste.com>