From owner-svn-src-head@freebsd.org Mon Jul 9 09:00:17 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6ED791032773; Mon, 9 Jul 2018 09:00:17 +0000 (UTC) (envelope-from wma@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 180568C4EC; Mon, 9 Jul 2018 09:00:17 +0000 (UTC) (envelope-from wma@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC1E212DE5; Mon, 9 Jul 2018 09:00:16 +0000 (UTC) (envelope-from wma@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6990Ghq081982; Mon, 9 Jul 2018 09:00:16 GMT (envelope-from wma@FreeBSD.org) Received: (from wma@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6990GCZ081981; Mon, 9 Jul 2018 09:00:16 GMT (envelope-from wma@FreeBSD.org) Message-Id: <201807090900.w6990GCZ081981@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wma set sender to wma@FreeBSD.org using -f From: Wojciech Macek Date: Mon, 9 Jul 2018 09:00:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336130 - head/sys/dev/pci X-SVN-Group: head X-SVN-Commit-Author: wma X-SVN-Commit-Paths: head/sys/dev/pci X-SVN-Commit-Revision: 336130 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2018 09:00:17 -0000 Author: wma Date: Mon Jul 9 09:00:16 2018 New Revision: 336130 URL: https://svnweb.freebsd.org/changeset/base/336130 Log: ARM64: Add quirk mechanism to pci_host_generic_acpi Add few quirks which are necessary to use AHCI on ThX2 Submitted by: Patryk Duda Obtained from: Semihalf Sponsored by: Cavium Differential revision: https://reviews.freebsd.org/D15929 Modified: head/sys/dev/pci/pci_host_generic.c Modified: head/sys/dev/pci/pci_host_generic.c ============================================================================== --- head/sys/dev/pci/pci_host_generic.c Mon Jul 9 08:55:07 2018 (r336129) +++ head/sys/dev/pci/pci_host_generic.c Mon Jul 9 09:00:16 2018 (r336130) @@ -69,6 +69,25 @@ __FBSDID("$FreeBSD$"); (((func) & PCIE_FUNC_MASK) << PCIE_FUNC_SHIFT) | \ ((reg) & PCIE_REG_MASK)) +typedef void (*pci_host_generic_quirk_function)(device_t); + +struct pci_host_generic_quirk_entry { + int impl; + int part; + int var; + int rev; + pci_host_generic_quirk_function func; +}; + +struct pci_host_generic_block_entry { + int impl; + int part; + int var; + int rev; + int bus; + int slot; +}; + /* Forward prototypes */ static uint32_t generic_pcie_read_config(device_t dev, u_int bus, u_int slot, @@ -80,7 +99,22 @@ static int generic_pcie_read_ivar(device_t dev, device uintptr_t *result); static int generic_pcie_write_ivar(device_t dev, device_t child, int index, uintptr_t value); +static void pci_host_generic_apply_quirks(device_t); +static void thunderx2_ahci_bar_quirk(device_t); +struct pci_host_generic_quirk_entry pci_host_generic_quirks[] = +{ + {CPU_IMPL_CAVIUM, CPU_PART_THUNDERX2, 0, 0, thunderx2_ahci_bar_quirk}, + {0, 0, 0, 0, NULL} +}; + +struct pci_host_generic_block_entry pci_host_generic_blocked[] = +{ + /* ThunderX2 AHCI on second socket */ + {CPU_IMPL_CAVIUM, CPU_PART_THUNDERX2, 0, 0, 0x80, 0x10}, + {0, 0, 0, 0, 0, 0} +}; + int pci_host_generic_core_attach(device_t dev) { @@ -134,9 +168,30 @@ pci_host_generic_core_attach(device_t dev) return (error); } + pci_host_generic_apply_quirks(dev); + return (0); } +static void +pci_host_generic_apply_quirks(device_t dev) +{ + struct pci_host_generic_quirk_entry *quirk; + + quirk = pci_host_generic_quirks; + while (1) { + if (quirk->impl == 0) + break; + + if (CPU_MATCH(CPU_IMPL_MASK | CPU_PART_MASK, + quirk->impl, quirk->part, quirk->var, quirk->rev) && + quirk->func != NULL) + quirk->func(dev); + + quirk++; + } +} + static uint32_t generic_pcie_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, int bytes) @@ -146,11 +201,25 @@ generic_pcie_read_config(device_t dev, u_int bus, u_in bus_space_tag_t t; uint64_t offset; uint32_t data; + struct pci_host_generic_block_entry *block; if ((bus > PCI_BUSMAX) || (slot > PCI_SLOTMAX) || (func > PCI_FUNCMAX) || (reg > PCIE_REGMAX)) return (~0U); + block = pci_host_generic_blocked; + while (1) { + if (block->impl == 0) + break; + + if (CPU_MATCH(CPU_IMPL_MASK | CPU_PART_MASK, + block->impl, block->part, block->var, block->rev) && + block->bus == bus && block->slot == slot) + return (~0); + + block++; + } + sc = device_get_softc(dev); offset = PCIE_ADDR_OFFSET(bus, slot, func, reg); @@ -392,3 +461,20 @@ static device_method_t generic_pcie_methods[] = { DEFINE_CLASS_0(pcib, generic_pcie_core_driver, generic_pcie_methods, sizeof(struct generic_pcie_core_softc)); + +static void thunderx2_ahci_bar_quirk(device_t dev) +{ + + /* + * XXX: + * On ThunderX2, AHCI BAR2 address is wrong. It needs to precisely + * match the one described in datasheet. Fixup it unconditionally. + */ + if (device_get_unit(dev) == 0) { + device_printf(dev, "running AHCI BAR fixup\n"); + PCIB_WRITE_CONFIG(dev, 0, 16, 0, 0x18, 0x01440000, 4); + PCIB_WRITE_CONFIG(dev, 0, 16, 0, 0x1c, 0x40, 4); + PCIB_WRITE_CONFIG(dev, 0, 16, 1, 0x18, 0x01450000, 4); + PCIB_WRITE_CONFIG(dev, 0, 16, 1, 0x1c, 0x40, 4); + } +}