d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmccam: Add a generic mmccam_start_discovery function

Browse Source 
This is a generic function start a scan request for the given
cam_sim.
Other driver can now just use this function to request a new rescan.

Submitted by:	kibab
This commit is contained in:
Emmanuel Vadot 2020-07-22 18:30:17 +00:00
parent d5bfd287c2
commit c7a4994853
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=363425
3 changed files with 27 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/cam/mmc/mmc_all.h
View File

@ -64,6 +64,7 @@
#ifndef CAM_MMC_ALL_H
#define CAM_MMC_ALL_H
#include <cam/cam_sim.h>
#include <cam/mmc/mmc.h>
#include <dev/mmc/mmcreg.h>
@ -72,5 +73,6 @@ struct ccb_pathinq;
struct cam_sim;
void mmc_path_inq(struct ccb_pathinq *cpi, const char *hba,
const struct cam_sim *sim, size_t maxio);
void mmccam_start_discovery(struct cam_sim *sim);
#endif

23
sys/cam/mmc/mmc_xpt.c
View File

@ -404,6 +404,29 @@ mmc_announce_periph(struct cam_periph *periph)
printf("XPT info: CLK %04X, ...\n", cts.proto_specific.mmc.ios.clock);
}
void
mmccam_start_discovery(struct cam_sim *sim) {
union ccb *ccb;
uint32_t pathid;
pathid = cam_sim_path(sim);
ccb = xpt_alloc_ccb_nowait();
if (ccb == NULL) {
return;
}
/*
* We create a rescan request for BUS:0:0, since the card
* will be at lun 0.
*/
if (xpt_create_path(&ccb->ccb_h.path, NULL, pathid,
/* target */ 0, /* lun */ 0) != CAM_REQ_CMP) {
xpt_free_ccb(ccb);
return;
}
xpt_rescan(ccb);
}
/* This func is called per attached device :-( */
void
mmc_print_ident(struct mmc_params *ident_data)

46
sys/dev/sdhci/sdhci.c
View File

@ -626,29 +626,8 @@ sdhci_card_task(void *arg, int pending __unused)
slot_printf(slot, "Card inserted\n");
#ifdef MMCCAM
slot->card_present = 1;
union ccb *ccb;
uint32_t pathid;
pathid = cam_sim_path(slot->sim);
ccb = xpt_alloc_ccb_nowait();
if (ccb == NULL) {
slot_printf(slot, "Unable to alloc CCB for rescan\n");
SDHCI_UNLOCK(slot);
return;
}
/*
* We create a rescan request for BUS:0:0, since the card
* will be at lun 0.
*/
if (xpt_create_path(&ccb->ccb_h.path, NULL, pathid,
/* target */ 0, /* lun */ 0) != CAM_REQ_CMP) {
slot_printf(slot, "Unable to create path for rescan\n");
SDHCI_UNLOCK(slot);
xpt_free_ccb(ccb);
return;
}
mmccam_start_discovery(slot->sim);
SDHCI_UNLOCK(slot);
xpt_rescan(ccb);
#else
d = slot->dev = device_add_child(slot->bus, "mmc", -1);
SDHCI_UNLOCK(slot);
@ -672,29 +651,8 @@ sdhci_card_task(void *arg, int pending __unused)
slot->dev = NULL;
#ifdef MMCCAM
slot->card_present = 0;
union ccb *ccb;
uint32_t pathid;
pathid = cam_sim_path(slot->sim);
ccb = xpt_alloc_ccb_nowait();
if (ccb == NULL) {
slot_printf(slot, "Unable to alloc CCB for rescan\n");
SDHCI_UNLOCK(slot);
return;
}
/*
* We create a rescan request for BUS:0:0, since the card
* will be at lun 0.
*/
if (xpt_create_path(&ccb->ccb_h.path, NULL, pathid,
/* target */ 0, /* lun */ 0) != CAM_REQ_CMP) {
slot_printf(slot, "Unable to create path for rescan\n");
SDHCI_UNLOCK(slot);
xpt_free_ccb(ccb);
return;
}
mmccam_start_discovery(slot->sim);
SDHCI_UNLOCK(slot);
xpt_rescan(ccb);
#else
slot->intmask &= ~sdhci_tuning_intmask(slot);
WR4(slot, SDHCI_INT_ENABLE, slot->intmask);