From nobody Tue Sep 03 21:39:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyzYV3wQzz5MTM1; Tue, 03 Sep 2024 21:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WyzYV3KTKz42lp; Tue, 3 Sep 2024 21:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725399598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TgIxMt9QksmB57pkQxkzlE36/QqAql4Ov9CncPLDCgQ=; b=CpgiH2WXa2vvoaALGmPXiR3KNGWu/ySxrfzOQsZpB7gQ2sjxvtDXIovl1DK356OhVyjILd l+GlcFMljVXIpeJUhFopyS7tMXU47mDnQ4LLe9iEKO+P5vXvzm/X+F5uFjEKFgMtE75mzs edKYGVQsymMwD4iINXAQFv+vvIiywrVEQbeVuKRU533/0lzoXs80FeilDyht4/BmTiE3Lo 2jtykLCVcdZais5jxjgvJDZ+UlOeBJsbmUQyiQFTTXCWFT5RS5LMDAGPWrwEEno9SXo3qF J4FpQ7h69nnPiKRM4owIfHRBPdf/tp44lDGOe15jpIsHEOJIrThg0Al/wmCLEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725399598; a=rsa-sha256; cv=none; b=mobt5tVeIxZ/jIJOL120P+A3e4/3r3D9QVOn92kGMROviKIfeQlPDOTpmWyTcj4LtYVmst 09BnkO3Rp/SHXhk+qk1sFHXQJ8XVxytAhyuCcBrbQNN6bEZFHtKbea4qN5JlbkaVIqjs90 8rDcIguBa25WeI5BLq2pEaMHADnEZGPiCx6iP9HTHRLUuQ7OQrIa7A0m+WOweK02xFV/2c kiAnLivuWqGx74Yv9gEtN7hHm/34G0a0J3mnfkDih09sLO4MFxrO/udh2Z1TgcT2eMh0Gd rJkubU99+Vj853Zje5/npNW5/CnwNqRVXlDq/u6132rg08ZDy/nlu7C7FUyCSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725399598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TgIxMt9QksmB57pkQxkzlE36/QqAql4Ov9CncPLDCgQ=; b=MiU3MzwxMed0Gq3epfo20/v3FP76CVMCgB6nkFVFDAVe0tKIgIthuACkEIiaIfgr73mV/O 8ghzCdDml8ClRfTYoVQMPz0rpwNkUr1F6etzAknV0PZ6RQqo2tLsJzJ4vA+izyN6mfkD75 uqpchzR/QdpjbOlqGLlIzDTVHTlIiVzIQ6snCuysEE7OBYZV8MBWbb873W0wQ/WeZqpta5 rR2xIhIAahuCxeiePX2mmh3+4pQlRARQUtmN4+PG8BWutB/VnFttocl+VmMxsYZzBOzJzJ VSn+RYMrkvJ7ZXTiVDqtQqgqvzkqAPyRRChnod+GbGWpUBj8au846QaupvRJEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WyzYV2lx2zx5B; Tue, 3 Sep 2024 21:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483Ldw93051964; Tue, 3 Sep 2024 21:39:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483LdwRj051961; Tue, 3 Sep 2024 21:39:58 GMT (envelope-from git) Date: Tue, 3 Sep 2024 21:39:58 GMT Message-Id: <202409032139.483LdwRj051961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a84d91d81a6f - main - mmccam: fix mmcsd disk aliases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a84d91d81a6f3eeb4949c4fb3440e0634f2b953a Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a84d91d81a6f3eeb4949c4fb3440e0634f2b953a commit a84d91d81a6f3eeb4949c4fb3440e0634f2b953a Author: Bjoern A. Zeeb AuthorDate: 2024-01-21 19:56:27 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-09-03 21:38:24 +0000 mmccam: fix mmcsd disk aliases For EXT_CSD_PART_CONFIG_ACC_BOOT and possibly others with suffixes we fail to create proper disk aliases (symlinks), which shows up as g_dev_taste: make_dev_alias_p() failed (name=mmcsd0, error=17) In this case we ended up with the followng two: /dev/mmcsd0 -> sdda0 /dev/mmcsd1 -> sdda0boot1 Note that (i) it should be mmcsd0boot1 and not mmcsd1 and that (ii) there is no mmcsd0boot0 (failed above as it tried to create a second mmcsd0). Adjust the code (using a highly simplified version--compared to my original approach--suggested by imp) using an extended format string with (sdda/mmcsd) prefix as first argument to create proper names. MFC after: 3 days Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43538 --- sys/cam/mmc/mmc_da.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c index 597ba0efb47e..fc29a1925c66 100644 --- a/sys/cam/mmc/mmc_da.c +++ b/sys/cam/mmc/mmc_da.c @@ -88,9 +88,11 @@ typedef enum { SDDA_STATE_PART_SWITCH, } sdda_state; -#define SDDA_FMT_BOOT "sdda%dboot" -#define SDDA_FMT_GP "sdda%dgp" -#define SDDA_FMT_RPMB "sdda%drpmb" +/* Purposefully ignore a '%d' argument to snprintf in SDDA_FMT! */ +#define SDDA_FMT "%s" +#define SDDA_FMT_BOOT "%s%dboot" +#define SDDA_FMT_GP "%s%dgp" +#define SDDA_FMT_RPMB "%s%drpmb" #define SDDA_LABEL_ENH "enh" #define SDDA_PART_NAMELEN (16 + 1) @@ -1480,7 +1482,7 @@ finish_hs_tests: sdda_process_mmc_partitions(periph, start_ccb); } else if (mmcp->card_features & CARD_FEATURE_MEMORY) { /* For SD[HC] cards, just add one partition that is the whole card */ - if (sdda_add_part(periph, 0, "sdda", + if (sdda_add_part(periph, 0, SDDA_FMT, periph->unit_number, mmc_get_media_size(periph), sdda_get_read_only(periph, start_ccb)) == false) @@ -1525,7 +1527,7 @@ sdda_add_part(struct cam_periph *periph, u_int type, const char *name, part->type = type; part->ro = ro; part->sc = sc; - snprintf(part->name, sizeof(part->name), name, periph->unit_number); + snprintf(part->name, sizeof(part->name), name, "sdda", periph->unit_number); /* * Due to the nature of RPMB partition it doesn't make much sense @@ -1592,8 +1594,11 @@ sdda_add_part(struct cam_periph *periph, u_int type, const char *name, part->disk->d_fwsectors = 0; part->disk->d_fwheads = 0; - if (sdda_mmcsd_compat) - disk_add_alias(part->disk, "mmcsd"); + if (sdda_mmcsd_compat) { + char cname[SDDA_PART_NAMELEN]; /* This equals the mmcsd namelen. */ + snprintf(cname, sizeof(cname), name, "mmcsd", periph->unit_number); + disk_add_alias(part->disk, cname); + } /* * Acquire a reference to the periph before we register with GEOM. @@ -1682,7 +1687,7 @@ sdda_process_mmc_partitions(struct cam_periph *periph, union ccb *ccb) * data area in case partitions are supported. */ ro = sdda_get_read_only(periph, ccb); - sdda_add_part(periph, EXT_CSD_PART_CONFIG_ACC_DEFAULT, "sdda", + sdda_add_part(periph, EXT_CSD_PART_CONFIG_ACC_DEFAULT, SDDA_FMT, periph->unit_number, mmc_get_media_size(periph), ro); sc->part_curr = EXT_CSD_PART_CONFIG_ACC_DEFAULT;