From nobody Mon Jul 4 14:27:18 2022 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 6144C831238; Mon, 4 Jul 2022 14:27:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lc7Rr0Wf3z3N4V; Mon, 4 Jul 2022 14:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656944840; 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=/AI/iptwSe8KioqaXDwwxfkR6SINsnjApyjZU7Tp5kQ=; b=sUuL3OQwzskKh09ERd26yfBVCoDiX21D1yBq/pIm1zvjnhvc5kPrcoE7ESUcX1GC5qZWQr d/VXaIsJyE7M4GvkhgmOIME27Y3UjltHxOG7kO0Lm0FjZbJjBHjhUiNXN0VdNgJa9RR/a5 vHP9a9hA9q3HbrRZ7x6ZaCr8Oiq+wdS/FCa8x0gA2INnUZaL/QKWTCshDtHk2wPi+QlVpp uAKGKqtZoS7kP7JAj+0lvNFD77os8fyU4Fdq4t27qAIpM4uvBAQLaZHGe+ijlCv6pYFgfZ 69c/W77vkHm4ncApsLpk7diaU+yUN+to4/yoaiapWnEQge0xhMFlufI/0qo3LQ== 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 70B17126DF; Mon, 4 Jul 2022 14:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 264ERI58064416; Mon, 4 Jul 2022 14:27:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264ERI2N064415; Mon, 4 Jul 2022 14:27:18 GMT (envelope-from git) Date: Mon, 4 Jul 2022 14:27:18 GMT Message-Id: <202207041427.264ERI2N064415@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 1c799a6f29ca - main - Support decoding mem32 memory in the rk pcie driver 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c799a6f29cadc7616362941c279dd0693c24645 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656944840; 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=/AI/iptwSe8KioqaXDwwxfkR6SINsnjApyjZU7Tp5kQ=; b=WZOosf7lnVpM5WzInI5vdM5kDTYbXhpYMTQR5YWZKmn5DnxXJa4Kdzp+Y44Ukz9G831ifw HzMLGoVP/raDi3qDcMI/Kv+MmGQ8Vc7hBx5wMHRGJmQ+WsFGJKhyCX7GtizznjeGSUv3pA 3z/9gsuBiUSYQqiuh2SQoOjzYkupVMHp1rk6asIVt4n3W0S+4t4D4yu3dZ1uucdv5DoJkB 823fd58S7QyQJ3hMq3UjRG449dgkC2+gfh7aMrDuCH8DG1oePwnF7OS5NJnWhvF+bmzazp G+XG0xKFGcGaT4wZWCmoi61C9oV1LLexvYdj8z+FBj2k+3Ohi6YfOPesjHxHzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656944840; a=rsa-sha256; cv=none; b=QIFRIJxihgoDmWGRAV5lUOQSU2BF5/5mszRquW9K5Tpp6Cn434EzqZsUubfARb+CQaeHCw GkScWtCZu46kzqRf0v7DM0dPuNKmSF9OydEb/78vDv2UdmGFxVJmuU3Nv7rFbHKCLVF5vt pW2BfTi7rdnj6yw/irKyDxrEW2KiQMi9VCd9FQSzHc5M6dOI0A0Z63SDNBpfHco5AydE2z ibHm912/hlKyIUzg7Eo+jBgu4ln4cKBjuEOpz1otjDFvuSaB+zfsrVmMndcDWX7+Lnlefm O4+l1TEjzQJ1vM9tRVa+UlcyZfMRGZRWIsEwn6U3rf75HzU5wozGmrR6fRKbdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1c799a6f29cadc7616362941c279dd0693c24645 commit 1c799a6f29cadc7616362941c279dd0693c24645 Author: Andrew Turner AuthorDate: 2022-06-30 18:08:32 +0000 Commit: Andrew Turner CommitDate: 2022-07-04 14:27:00 +0000 Support decoding mem32 memory in the rk pcie driver This is needed with some dtb files. While here use a switch statement as the two options are mutually exclusive in any iteration of the loop. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35680 --- sys/arm64/rockchip/rk_pcie.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arm64/rockchip/rk_pcie.c b/sys/arm64/rockchip/rk_pcie.c index 8d07cad84e6d..1711d52d2b3e 100644 --- a/sys/arm64/rockchip/rk_pcie.c +++ b/sys/arm64/rockchip/rk_pcie.c @@ -405,17 +405,17 @@ rk_pcie_decode_ranges(struct rk_pcie_softc *sc, struct ofw_pci_range *ranges, int i; for (i = 0; i < nranges; i++) { - if ((ranges[i].pci_hi & OFW_PCI_PHYS_HI_SPACEMASK) == - OFW_PCI_PHYS_HI_SPACE_IO) { + switch(ranges[i].pci_hi & OFW_PCI_PHYS_HI_SPACEMASK) { + case OFW_PCI_PHYS_HI_SPACE_IO: if (sc->io_range.size != 0) { device_printf(sc->dev, "Duplicated IO range found in DT\n"); return (ENXIO); } sc->io_range = ranges[i]; - } - if (((ranges[i].pci_hi & OFW_PCI_PHYS_HI_SPACEMASK) == - OFW_PCI_PHYS_HI_SPACE_MEM64)) { + break; + case OFW_PCI_PHYS_HI_SPACE_MEM32: + case OFW_PCI_PHYS_HI_SPACE_MEM64: if (ranges[i].pci_hi & OFW_PCI_PHYS_HI_PREFETCHABLE) { if (sc->pref_mem_range.size != 0) { device_printf(sc->dev,