From nobody Thu Feb 27 14:16:46 2025 X-Original-To: dev-commits-src-branches@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 4Z3YLR0lYsz5qGFP; Thu, 27 Feb 2025 14:16:47 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z3YLR0K5Hz3x9S; Thu, 27 Feb 2025 14:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665807; 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=6kVxoiZm87AuwS/ECDPSViv6BJoRpv2a8miKqtUq6mI=; b=PVOn4DBaSDuFDU3nU+d81Jlhf2xC1xP8aZXgSSXxZIIng5iemqGFXPC/62wZOzHkgFVas3 inghoVjUAWUk40yBf92wX0RknleP23AEkJRmh68cdh4Y45beMz1gVWjX6K96S9I0h9CHfB h4aAL0/rixqKIDd9K2iGv4KcJhf/1lOBq22uE5QZhN6y+QA8cW4CmO8zn8CRbetXbb+Nm9 kGY/0ubhaJNliliUhBLtxzwpPR4s4vHMSjs259oJgPrx01Hc0ROKHlALBgN0/k5cS87DOq 8EXV25ao8XDks5TDc9CEmn+GRG3BTqwiH4/tKr1KhoQrDZHUeEGL0VodZ9oIoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665807; a=rsa-sha256; cv=none; b=GBlFHiHR2GTMuyY+2mKRJDpAma3Pm7IMkoL24Ts8261jrno768WfeZNiW2EE84FKcT4LB4 vuJE5ov/atMpBNvVMo7g4+mThahzYTalfjBYQKAhsUdDvrtYNRt0cG+7w0KQZPVQUqn2OH ExfB2pJXZ7r5Q6Mr6LrCmX5l5FYL37yqJt5enrfgmmwhzcptVlanZCOw/7BOI1TganrKVo i1z4FsywE8TYHe6zToqzP5mB40EhzzfAKndkQXJzLiYuLREixYegNfRDvXGz9Yk3tn4YfG 8MlS3Y+TAtkEB2Oa5Pmx9tL9UIau4UAJMtFIIfIDn4U6sXu9z+gM02OMVG/clQ== 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=1740665807; 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=6kVxoiZm87AuwS/ECDPSViv6BJoRpv2a8miKqtUq6mI=; b=rzVU5V89BD3bktLNPnwXtvGMMaPT255fyxFBBNzolWtggE1LMk4yAPjik4E6Bqb131OaGi AGvZ13lvG+Hkp9ZtW1s5iYHdERA58xXiCpRuMVgIhlG9Ar/ko/JSQigQfyces5cqal4zrA 8YLeBtBK9lmahV+lJ2FYdOyLEqKK50Gs22igxhqG9KHKwwunuUg3ABnfDLCA3QpfNichpN YX4XRvcAfLj5a4243QZObJVT0p/p80SfiFnema1p7LYgZgN9F3fNFyavke+RbP295ArTB9 VdZkxSQfDsoyqJKWzkN/qJ1WBXYNvmm18vQSlj9Dnu0CspY9eDWEYRKGLRBr+w== 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 4Z3YLQ70Jczmdt; Thu, 27 Feb 2025 14:16:46 +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 51REGkoX016127; Thu, 27 Feb 2025 14:16:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REGkM7016124; Thu, 27 Feb 2025 14:16:46 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:16:46 GMT Message-Id: <202502271416.51REGkM7016124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 57720609f705 - stable/14 - powerpc: Add RF_LITTLEENDIAN resource flag List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 57720609f705edaea4afc245d6f877530b741f69 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=57720609f705edaea4afc245d6f877530b741f69 commit 57720609f705edaea4afc245d6f877530b741f69 Author: John Baldwin AuthorDate: 2024-01-23 17:38:36 +0000 Commit: John Baldwin CommitDate: 2025-02-27 13:09:21 +0000 powerpc: Add RF_LITTLEENDIAN resource flag If this powerpc-specific flag is set on a resource, then the little-endian bus tag is always used when mapping that resource. Make use of this flag in the mpc85xx/fsl_sata driver to avoid setting the SATA BAR's bus tag after bus_alloc_resource. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D43553 (cherry picked from commit a82470212b7659afb7d3287e2ccae72d5e496b71) --- sys/powerpc/include/resource.h | 7 +++++++ sys/powerpc/mpc85xx/fsl_sata.c | 3 +-- sys/powerpc/powerpc/nexus.c | 10 ++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/sys/powerpc/include/resource.h b/sys/powerpc/include/resource.h index 9477572176e0..e7e9493569cc 100644 --- a/sys/powerpc/include/resource.h +++ b/sys/powerpc/include/resource.h @@ -41,4 +41,11 @@ #define SYS_RES_IOPORT 4 /* i/o ports */ #define PCI_RES_BUS 5 /* PCI bus numbers */ +/* + * A powerpc-specific resource flag to request little-endian bus tags + * for a resource. + */ + +#define RF_LITTLEENDIAN RF_SPARE1 + #endif /* !_MACHINE_RESOURCE_H_ */ diff --git a/sys/powerpc/mpc85xx/fsl_sata.c b/sys/powerpc/mpc85xx/fsl_sata.c index 9279a8d43810..5fdd05282676 100644 --- a/sys/powerpc/mpc85xx/fsl_sata.c +++ b/sys/powerpc/mpc85xx/fsl_sata.c @@ -353,9 +353,8 @@ fsl_sata_attach(device_t dev) } ch->r_mid = 0; if (!(ch->r_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &ch->r_mid, RF_ACTIVE))) + &ch->r_mid, RF_ACTIVE | RF_LITTLEENDIAN))) return (ENXIO); - rman_set_bustag(ch->r_mem, &bs_le_tag); fsl_sata_dmainit(dev); fsl_sata_slotsalloc(dev); fsl_sata_init(dev); diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c index a2043c3cfdf9..826e75daa374 100644 --- a/sys/powerpc/powerpc/nexus.c +++ b/sys/powerpc/powerpc/nexus.c @@ -276,14 +276,20 @@ nexus_map_resource(device_t bus, device_t child, int type, struct resource *r, panic("%s:%d SYS_RES_IOPORT handling not implemented", __func__, __LINE__); /* XXX: untested map->r_bushandle = start; - map->r_bustag = nexus_get_bus_tag(NULL, NULL); + if ((rman_get_flags(r) & RF_LITTLEENDIAN) != 0) + map->r_bustag = &bs_le_tag; + else + map->r_bustag = nexus_get_bus_tag(NULL, NULL); map->r_size = length; map->r_vaddr = NULL; */ break; case SYS_RES_MEMORY: map->r_vaddr = pmap_mapdev_attr(start, length, args.memattr); - map->r_bustag = nexus_get_bus_tag(NULL, NULL); + if ((rman_get_flags(r) & RF_LITTLEENDIAN) != 0) + map->r_bustag = &bs_le_tag; + else + map->r_bustag = nexus_get_bus_tag(NULL, NULL); map->r_size = length; map->r_bushandle = (bus_space_handle_t)map->r_vaddr; break;