From nobody Wed May 14 13:50:12 2025 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 4ZyF8h5CDTz5wk8H; Wed, 14 May 2025 13:50:12 +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 4ZyF8h4HFMz3s01; Wed, 14 May 2025 13:50:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747230612; 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=5DQRIUEUL74z5GKYzNGi1OGy3G01Hzzbla43rjZGG1g=; b=ZGZ7FeNZo9wTBvAVcl2CY9B37StQcJvhMp2uhKx6cNRixjnKUNuJHTNEQL573y4sOcj1Tf wMnC9WUGq2FS4z4acqxrv3yNo9pthWDq9nU1OtHtohZxNe7sI6h0QU1j2gdlTOgW60lfg0 AMiTX1MN2qe1i0dayL79nKBrl/Z/xWj47niyevR/jZR8MA4aNy/kSPDM2ASjNYqgGRS/45 tWv0Z/QhTKAQk7bP5FPGvncXzzZoaDNOpZm9R2GsKrhIi2VB4pMt7mbv35bJtzIgP+qzwV bpsUKSCVd6tA/cWAhuQm+A7d6ErLGJ9RypNLQbnCJVD1f5XmhXAoYLnNa2gS/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747230612; 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=5DQRIUEUL74z5GKYzNGi1OGy3G01Hzzbla43rjZGG1g=; b=Q2hcMwkHR/Px0Kk26ERnjPMdwEKPC7UWrUyQpdSv+l5iaLjJPA3/29z2z8tAG0xXU7ZGx1 eNvJecfcXnhUQMV4VWP8fNPhvI+EACgxhlciV9oYE4WfzenEhCHg7SGw+cLcPe2XW3n/tI 22KgIU8YpVfvarGF9L6fwtZ8t2F0Zebs3XWO/6o/PYwcrMTXBLCJ3HqQTN2v/qlamWYr+q fmdFDx/sr+6da4PuiFPHdF7IRFo9qQ3bxNqmyDynGI6UwFuGTRUE647pg0KnO7jVlb5NUe aooT3kSIygRpj12F1utHMmIyqhx1T5MiJiO/cr/h3UTnG85Uend/mU13VDasrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747230612; a=rsa-sha256; cv=none; b=cP1B6jq1a0jC81015ZfQZQEe9csRQGCc6xyfFuog5YoFaTms5IYceSg3aAwzS9lN/0tAeT /6ukowHF7Vd5OXl3q8ZVJjWVwYKKfdxuYxGXW6SckGZGZmedTEOdgHxtH/I7bRKVjrwWkz FueiQjmdAf5ZPfxpv67XqxNCa0WqhDvlTsXIIeCTWUDYyJL7NpGtYGwzpT7XpB1CzSWjsY G6RwT3izE5JCdfvlpn/lkSTtz0kuMGgH6GDbi1p7S6WOynBPRDmSHYhSdsrwT+uVkquO5E n8YRAmybArY6y2oStQ1Z6vCK/6hbrGk2Weh40zRxz6A7jGtBWaXFTpaUXkDypw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZyF8h3ppkzbCs; Wed, 14 May 2025 13:50:12 +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 54EDoCIw092203; Wed, 14 May 2025 13:50:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54EDoCfX092192; Wed, 14 May 2025 13:50:12 GMT (envelope-from git) Date: Wed, 14 May 2025 13:50:12 GMT Message-Id: <202505141350.54EDoCfX092192@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: bf2166bd72ad - main - Revert "powernv: Add RF_BIGENDIAN resource flag" 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf2166bd72ad691765ff5e081f00cbba6b12da61 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=bf2166bd72ad691765ff5e081f00cbba6b12da61 commit bf2166bd72ad691765ff5e081f00cbba6b12da61 Author: Justin Hibbits AuthorDate: 2025-05-14 13:48:07 +0000 Commit: Justin Hibbits CommitDate: 2025-05-14 13:50:12 +0000 Revert "powernv: Add RF_BIGENDIAN resource flag" After further thinking, the nexus bus mappings are for the immediate peripherals, not downstream. Given this, and that historically PowerPC platforms have been big-endian by default, it makes sense to default mappings to BE always. If this changes in the future, the platform devices can explicitly mark their mappings with the RF_LITTLEENDIAN flag instead. This reverts commit 86d20eaadfd1a03e19d8bc8333c689b820299d52. --- sys/powerpc/include/resource.h | 1 - sys/powerpc/powernv/opal_pci.c | 2 +- sys/powerpc/powernv/xive.c | 2 +- sys/powerpc/powerpc/nexus.c | 4 +--- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/powerpc/include/resource.h b/sys/powerpc/include/resource.h index 6726104403d0..e7e9493569cc 100644 --- a/sys/powerpc/include/resource.h +++ b/sys/powerpc/include/resource.h @@ -47,6 +47,5 @@ */ #define RF_LITTLEENDIAN RF_SPARE1 -#define RF_BIGENDIAN RF_SPARE2 #endif /* !_MACHINE_RESOURCE_H_ */ diff --git a/sys/powerpc/powernv/opal_pci.c b/sys/powerpc/powernv/opal_pci.c index 622c8c2cc09b..8dee2c45c089 100644 --- a/sys/powerpc/powernv/opal_pci.c +++ b/sys/powerpc/powernv/opal_pci.c @@ -270,7 +270,7 @@ opalpci_attach(device_t dev) rid = 0; sc->r_reg = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &rid, RF_ACTIVE | RF_SHAREABLE | RF_BIGENDIAN); + &rid, RF_ACTIVE | RF_SHAREABLE); if (sc->r_reg == NULL) { device_printf(dev, "Failed to allocate PHB[%jd] registers\n", (uintmax_t)sc->phb_id); diff --git a/sys/powerpc/powernv/xive.c b/sys/powerpc/powernv/xive.c index aaf4953ba8a5..384ff4ef20d2 100644 --- a/sys/powerpc/powernv/xive.c +++ b/sys/powerpc/powernv/xive.c @@ -327,7 +327,7 @@ xive_attach(device_t dev) rid = 1; /* Get the Hypervisor-level register set. */ sc->sc_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &rid, RF_ACTIVE | RF_BIGENDIAN); + &rid, RF_ACTIVE); sc->sc_offset = XIVE_TM_QW3_HV; mtx_init(&sc->sc_mtx, "XIVE", NULL, MTX_DEF); diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c index 1dac56a84cf9..029b6ef8a479 100644 --- a/sys/powerpc/powerpc/nexus.c +++ b/sys/powerpc/powerpc/nexus.c @@ -287,10 +287,8 @@ nexus_map_resource(device_t bus, device_t child, struct resource *r, map->r_vaddr = pmap_mapdev_attr(start, length, args.memattr); if ((rman_get_flags(r) & RF_LITTLEENDIAN) != 0) map->r_bustag = &bs_le_tag; - else if ((rman_get_flags(r) & RF_BIGENDIAN) != 0) - map->r_bustag = &bs_be_tag; else - map->r_bustag = nexus_get_bus_tag(NULL, NULL); + map->r_bustag = &bs_be_tag; map->r_size = length; map->r_bushandle = (bus_space_handle_t)map->r_vaddr; break;